From 9ba429d0ae57469228c366a193dbc67533f23670 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com> Date: Fri, 26 Apr 2024 20:39:45 -0500 Subject: [PATCH] Implement start_login_bonus --- src/router/global.rs | 13 +++++++++++++ src/router/login.rs | 16 +--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/router/global.rs b/src/router/global.rs index ed5c799..c3bffb5 100644 --- a/src/router/global.rs +++ b/src/router/global.rs @@ -167,6 +167,19 @@ pub fn give_points(master_item_id: i64, amount: i64, user: &mut JsonValue) -> bo false } +pub fn start_login_bonus(id: i64, bonus: &mut JsonValue) { + for (_j, dataa) in bonus["bonus_list"].members().enumerate() { + if dataa["master_login_bonus_id"].as_i64().unwrap() == id { + return; + } + } + bonus["bonus_list"].push(object!{ + master_login_bonus_id: id, + day_counts: [], + event_bonus_list: [] + }).unwrap(); +} + pub fn give_primogems(amount: i64, user: &mut JsonValue) -> bool { let new_amount = user["gem"]["free"].as_i64().unwrap() + amount; if new_amount > LIMIT_PRIMOGEMS { diff --git a/src/router/login.rs b/src/router/login.rs index a462392..aaf41ee 100644 --- a/src/router/login.rs +++ b/src/router/login.rs @@ -62,21 +62,7 @@ pub fn bonus(req: HttpRequest, body: String) -> HttpResponse { let last_reset = global::timestamp_since_midnight(); let mut bonuses = userdata::get_acc_loginbonus(&key); if bonuses["bonus_list"].is_empty() { - bonuses["bonus_list"].push(object!{ - master_login_bonus_id: 1, - day_counts: [], - event_bonus_list: [] - }).unwrap(); - bonuses["bonus_list"].push(object!{ - master_login_bonus_id: 2, - day_counts: [], - event_bonus_list: [] - }).unwrap(); - bonuses["bonus_list"].push(object!{ - master_login_bonus_id: 3, - day_counts: [], - event_bonus_list: [] - }).unwrap(); + global::start_login_bonus(1, &mut bonuses); } let to_send;