ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add cleanup_account function

Browse source
This commit is contained in:
Ethan O'Brien 2024-05-03 21:51:43 -05:00
parent c0d1776183
commit b7e3bc68b6
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/router/global.rs
View file

@ -224,11 +224,14 @@ pub fn give_points(master_item_id: i64, amount: i64, user: &mut JsonValue) -> bo
} }
false false
} }
pub fn use_item(master_item_id: i64, amount: i64, user: &mut JsonValue) { pub fn use_item(master_item_id: i64, amount: i64, user: &mut JsonValue) {
for (_j, dataa) in user["item_list"].members_mut().enumerate() { for (_j, dataa) in user["item_list"].members_mut().enumerate() {
if dataa["master_item_id"].as_i64().unwrap() == master_item_id { if dataa["master_item_id"].as_i64().unwrap() == master_item_id {
if dataa["amount"].as_i64().unwrap() >= amount { if dataa["amount"].as_i64().unwrap() >= amount {
dataa["amount"] = (dataa["amount"].as_i64().unwrap() - amount).into(); dataa["amount"] = (dataa["amount"].as_i64().unwrap() - amount).into();
} else {
dataa["amount"] = (0).into();
} }
break; break;
} }

31
src/router/userdata/mod.rs
View file

@ -205,8 +205,7 @@ fn get_data(auth_key: &str, row: &str) -> JsonValue {
json::parse(&result.unwrap()).unwrap() json::parse(&result.unwrap()).unwrap()
} }
pub fn get_acc(auth_key: &str) -> JsonValue { fn cleanup_account(user: &mut JsonValue) {
let mut user = get_data(auth_key, "userdata");
user["gem"]["total"] = (user["gem"]["charge"].as_i64().unwrap() + user["gem"]["free"].as_i64().unwrap()).into(); user["gem"]["total"] = (user["gem"]["charge"].as_i64().unwrap() + user["gem"]["free"].as_i64().unwrap()).into();
if user["master_music_ids"].len() != NEW_USER["master_music_ids"].len() { if user["master_music_ids"].len() != NEW_USER["master_music_ids"].len() {
user["master_music_ids"] = NEW_USER["master_music_ids"].clone(); user["master_music_ids"] = NEW_USER["master_music_ids"].clone();
@ -215,6 +214,34 @@ pub fn get_acc(auth_key: &str) -> JsonValue {
user["master_title_ids"] = NEW_USER["master_title_ids"].clone(); user["master_title_ids"] = NEW_USER["master_title_ids"].clone();
} }
let mut to_remove = array![];
let items = user["item_list"].clone();
for (i, data) in user["item_list"].members_mut().enumerate() {
if to_remove.contains(i) {
continue;
}
if data["master_item_id"].as_i64().unwrap() != data["id"].as_i64().unwrap() {
data["id"] = data["master_item_id"].clone();
}
for (j, data2) in items.members().enumerate() {
if i == j {
continue;
}
if data["master_item_id"].as_i64().unwrap() == data2["master_item_id"].as_i64().unwrap() {
to_remove.push(j).unwrap();
data["amount"] = (data["amount"].as_i64().unwrap() + data2["amount"].as_i64().unwrap()).into();
}
}
}
for (i, data) in to_remove.members().enumerate() {
user["item_list"].array_remove(data.as_usize().unwrap() - i);
}
}
pub fn get_acc(auth_key: &str) -> JsonValue {
let mut user = get_data(auth_key, "userdata");
cleanup_account(&mut user);
global::lp_modification(&mut user, 0, false); global::lp_modification(&mut user, 0, false);
return user; return user;
} }