From 3ed59060a6945c05ef9219305b5080ec34d6cca1 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien Date: Tue, 4 Jun 2024 10:32:55 -0500 Subject: [PATCH] Give user (some) sif titles when transfering --- src/main.rs | 2 +- src/router/items.rs | 3 ++- src/router/user.rs | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 895b4b3..5ce0113 100644 --- a/src/main.rs +++ b/src/main.rs @@ -63,7 +63,7 @@ fn api_req(req: HttpRequest, body: String) -> HttpResponse { "/api/event_star_live/change_target_music" => router::event::change_target_music(req, body), "/api/event_star_live/start" => router::live::event_start(req, body), "/api/event_star_live/end" => router::live::event_end(req, body), - // "/api/event_star_live/skip" => router::live::event_skip(req, body), + //"/api/event_star_live/skip" => router::live::event_skip(req, body), "/api/live/start" => router::live::start(req, body), "/api/live/end" => router::live::end(req, body), "/api/live/skip" => router::live::skip(req, body), diff --git a/src/router/items.rs b/src/router/items.rs index 9437687..83d9410 100644 --- a/src/router/items.rs +++ b/src/router/items.rs @@ -136,8 +136,9 @@ pub fn give_gift(data: &JsonValue, user: &mut JsonValue, missions: &mut JsonValu let title = data["value"].as_i64().unwrap(); if !user["master_title_ids"].contains(title) { user["master_title_ids"].push(title).unwrap(); + return true; } - return true; + return false; } println!("Redeeming reward not implemented for reward type {}", data["reward_type"]); false diff --git a/src/router/user.rs b/src/router/user.rs index bebfa6a..d546aa4 100644 --- a/src/router/user.rs +++ b/src/router/user.rs @@ -282,13 +282,17 @@ pub fn detail(req: HttpRequest, body: String) -> Option { pub fn sif(req: HttpRequest) -> Option { let key = global::get_login(req.headers(), ""); - let user = userdata::get_acc(&key); + let mut user = userdata::get_acc(&key); let mut cards = userdata::get_acc_sif(&key); // prevent duplicate data in the database if user["user"]["sif_user_id"].as_i64().unwrap() == 111111111 { cards = json::parse(&include_file!("src/router/userdata/full_sif.json")).unwrap(); } + + if items::give_gift_basic(8, 4293000525, 1, &mut user, &mut array![], &mut array![], &mut array![]) || items::give_gift_basic(8, 4293000521, 1, &mut user, &mut array![], &mut array![], &mut array![]) { + userdata::save_acc(&key, user); + } Some(object!{ cards: cards @@ -308,6 +312,8 @@ pub fn sif_migrate(req: HttpRequest, body: String) -> Option { let key = global::get_login(req.headers(), &body); let mut user = userdata::get_acc(&key); user["user"]["sif_user_id"] = 111111111.into(); + items::give_gift_basic(8, 4293000525, 1, &mut user, &mut array![], &mut array![], &mut array![]); + items::give_gift_basic(8, 4293000521, 1, &mut user, &mut array![], &mut array![], &mut array![]); userdata::save_acc(&key, user.clone()); @@ -316,7 +322,7 @@ pub fn sif_migrate(req: HttpRequest, body: String) -> Option { "user": user["user"].clone(), "master_title_ids": user["master_title_ids"].clone() }) - + /* // Error response