zhushenwudi/ew_author
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew synced 2025-10-08 16:37:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

I DID NOT TEST THIS COMMIT CARGO CLIPPY DID STUFF FOR ME AND I'M TOO LAZY TO TEST SO HOPEFULLY NOTHING BROKE

Browse Source
This commit is contained in:
Ethan O'Brien
2024-05-24 00:56:25 -05:00
parent ea48327e10
commit 7df2f3e277
16 changed files with 188 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/router/friend.rs
View File

@@ -55,15 +55,15 @@ pub fn recommend(req: HttpRequest, body: String) -> HttpResponse {
let friends = userdata::get_acc_friends(&key);
let mut random = userdata::get_random_uids(20);
let index = random.members().into_iter().position(|r| *r.to_string() == user_id.to_string());
if !index.is_none() {
let index = random.members().position(|r| *r.to_string() == user_id.to_string());
if index.is_some() {
random.array_remove(index.unwrap());
}
let mut rv = array![];
for (_i, uid) in random.members().enumerate() {
let user = global::get_user(uid.as_i64().unwrap(), &friends, false);
if user["user"]["friend_request_disabled"].to_string() == "1" || user.is_empty() {
if user["user"]["friend_request_disabled"] == "1" || user.is_empty() {
continue;
}
rv.push(user).unwrap();
@@ -125,14 +125,14 @@ pub fn approve(req: HttpRequest, body: String) -> HttpResponse {
let mut friends = userdata::get_acc_friends(&key);
let uid = body["user_id"].as_i64().unwrap();
let index = friends["pending_user_id_list"].members().into_iter().position(|r| *r.to_string() == uid.to_string());
if !index.is_none() {
let index = friends["pending_user_id_list"].members().position(|r| *r.to_string() == uid.to_string());
if index.is_some() {
friends["pending_user_id_list"].array_remove(index.unwrap());
if body["approve"].to_string() == "1" && ! friends["friend_user_id_list"].contains(uid) && friends["friend_user_id_list"].len() < FRIEND_LIMIT {
if body["approve"] == "1" && ! friends["friend_user_id_list"].contains(uid) && friends["friend_user_id_list"].len() < FRIEND_LIMIT {
friends["friend_user_id_list"].push(uid).unwrap();
}
userdata::friend_request_approve(uid, user_id, body["approve"].to_string() == "1", "request_user_id_list");
userdata::friend_request_approve(uid, user_id, body["approve"] == "1", "request_user_id_list");
userdata::save_acc_friends(&key, friends);
}
@@ -151,8 +151,8 @@ pub fn cancel(req: HttpRequest, body: String) -> HttpResponse {
let mut friends = userdata::get_acc_friends(&key);
let uid = body["user_id"].as_i64().unwrap();
let index = friends["request_user_id_list"].members().into_iter().position(|r| *r.to_string() == uid.to_string());
if !index.is_none() {
let index = friends["request_user_id_list"].members().position(|r| *r.to_string() == uid.to_string());
if index.is_some() {
friends["request_user_id_list"].array_remove(index.unwrap());
}
userdata::friend_request_approve(uid, user_id, false, "pending_user_id_list");
@@ -173,8 +173,8 @@ pub fn delete(req: HttpRequest, body: String) -> HttpResponse {
let mut friends = userdata::get_acc_friends(&key);
let uid = body["user_id"].as_i64().unwrap();
let index = friends["friend_user_id_list"].members().into_iter().position(|r| *r.to_string() == uid.to_string());
if !index.is_none() {
let index = friends["friend_user_id_list"].members().position(|r| *r.to_string() == uid.to_string());
if index.is_some() {
friends["friend_user_id_list"].array_remove(index.unwrap());
}
userdata::friend_remove(uid, user_id);