ethanaobrien/ew
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some type comparisons

Browse source
This commit is contained in:
Ethan O'Brien 2024-05-24 19:59:24 -05:00
parent ba0d38fb2d
commit 09fbf027b1
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/router/friend.rs
View file

@ -53,7 +53,7 @@ pub fn recommend(req: HttpRequest, body: String) -> Option<JsonValue> {
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"] == "1" || user.is_empty() {
if user["user"]["friend_request_disabled"] == 1 || user.is_empty() {
continue;
}
rv.push(user).unwrap();
@ -103,11 +103,11 @@ pub fn approve(req: HttpRequest, body: String) -> Option<JsonValue> {
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"] == "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"] == "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);
}

2
src/router/home.rs
View file

@ -23,7 +23,7 @@ pub fn preset(req: HttpRequest, body: String) -> Option<JsonValue> {
fn check_gifts(user: &mut JsonValue) {
let mut to_remove = array![];
for (j, data) in user["home"]["gift_list"].members().enumerate() {
if data["is_receive"] == "1" || data["expire_date_time"].as_u64().unwrap() < global::timestamp() {
if data["is_receive"] == 1 || data["expire_date_time"].as_u64().unwrap() < global::timestamp() {
to_remove.push(j).unwrap();
}
}

18
src/router/items.rs
View file

@ -81,19 +81,19 @@ pub fn give_gift(data: &JsonValue, user: &mut JsonValue, missions: &mut JsonValu
if data.is_empty() {
return false;
}
if data["reward_type"] == "1" {
if data["reward_type"] == 1 {
// basically primogems!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
return !give_primogems(data["amount"].as_i64().unwrap(), user);
} else if data["reward_type"] == "2" {
} else if data["reward_type"] == 2 {
//character
give_character(data["value"].to_string(), user, missions, clear_missions);
give_character(data["value"].as_i64().unwrap(), user, missions, clear_missions);
return true;
} else if data["reward_type"] == "3" {
} else if data["reward_type"] == 3 {
return !give_item(data["value"].as_i64().unwrap(), data["amount"].as_i64().unwrap(), user);
} else if data["reward_type"] == "4" {
} else if data["reward_type"] == 4 {
// basically moraa!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
return !give_points(data["value"].as_i64().unwrap(), data["amount"].as_i64().unwrap(), user, missions, clear_missions);
} else if data["reward_type"] == "8" {
} else if data["reward_type"] == 8 {
// title
let title = data["value"].as_i64().unwrap();
if !user["master_title_ids"].contains(title) {
@ -232,7 +232,7 @@ pub fn lp_modification(user: &mut JsonValue, change_amount: u64, remove: bool) {
// true - added
// false - already has
pub fn give_character(id: String, user: &mut JsonValue, missions: &mut JsonValue, clear_missions: &mut JsonValue) -> bool {
pub fn give_character(id: i64, user: &mut JsonValue, missions: &mut JsonValue, clear_missions: &mut JsonValue) -> bool {
for (_i, data) in user["card_list"].members().enumerate() {
if data["master_card_id"] == id || data["id"] == id {
give_item(19100001, 50, user);
@ -247,8 +247,8 @@ pub fn give_character(id: String, user: &mut JsonValue, missions: &mut JsonValue
}
let to_push = object!{
"id": id.parse::<i32>().unwrap(),
"master_card_id": id.parse::<i32>().unwrap(),
"id": id,
"master_card_id": id,
"exp": 0,
"skill_exp": 0,
"evolve": [],

2
src/router/live.rs
View file

@ -103,7 +103,7 @@ pub fn guest(req: HttpRequest, body: String) -> Option<JsonValue> {
for (_i, uid) in random.members().enumerate() {
let guest = global::get_user(uid.as_i64().unwrap(), &friends, false);
if guest["user"]["friend_request_disabled"] == "1" || guest.is_empty() {
if guest["user"]["friend_request_disabled"] == 1 || guest.is_empty() {
continue;
}
guest_list.push(guest).unwrap();

2
src/router/lottery.rs
View file

@ -127,7 +127,7 @@ pub fn lottery_post(req: HttpRequest, body: String) -> Option<JsonValue> {
if lottery_type == 1 {
for (_i, data) in cardstogive.members().enumerate() {
let mut is_new = true;
if !items::give_character(data["master_card_id"].to_string(), &mut user, &mut missions, &mut cleared_missions) {
if !items::give_character(data["master_card_id"].as_i64().unwrap(), &mut user, &mut missions, &mut cleared_missions) {
is_new = false;
}
if is_new {

2
src/router/user.rs
View file

@ -384,7 +384,7 @@ pub fn initialize(req: HttpRequest, body: String) -> Option<JsonValue> {
// User is rewarded with all base cards in the team they chose. This makes up their new deck_list
for (i, data) in cardstoreward.members().enumerate() {
items::give_character(data.to_string(), &mut user, &mut missions, &mut array![]);
items::give_character(data.as_i64().unwrap(), &mut user, &mut missions, &mut array![]);
if i < 10 {
user["deck_list"][0]["main_card_ids"][i] = data.clone();
}

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

@ -436,7 +436,7 @@ pub fn friend_request_disabled(uid: i64) -> bool {
let uid = get_uid(&login_token);
let user = DATABASE.lock_and_select("SELECT userdata FROM userdata WHERE user_id=?1", params!(uid));
let user = json::parse(&user.unwrap()).unwrap();
user["user"]["friend_request_disabled"] == "1"
user["user"]["friend_request_disabled"] == 1
}
pub fn friend_remove(uid: i64, requestor: i64) {