From f6cf70ab9ff780414607ab9efb84104f7740a6f2 Mon Sep 17 00:00:00 2001 From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com> Date: Mon, 26 Feb 2024 20:50:11 -0600 Subject: [PATCH] Remove dead code --- src/router/chat.rs | 3 +-- src/router/home.rs | 3 +-- src/router/live.rs | 9 ++------- src/router/login.rs | 3 +-- src/router/lottery/mod.rs | 7 +++---- src/router/mission.rs | 3 +-- src/router/start.rs | 5 ++--- src/router/tutorial.rs | 5 ++--- src/router/user.rs | 15 ++++++--------- src/router/userdata/mod.rs | 6 +++--- 10 files changed, 22 insertions(+), 37 deletions(-) diff --git a/src/router/chat.rs b/src/router/chat.rs index ca37309..ea4c472 100644 --- a/src/router/chat.rs +++ b/src/router/chat.rs @@ -8,8 +8,7 @@ use crate::router::userdata; pub fn home(req: HttpRequest, _body: String) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc(key, uid); + let user = userdata::get_acc(key); let id = user["user"]["favorite_master_card_id"].as_i64().unwrap() / 10000; diff --git a/src/router/home.rs b/src/router/home.rs index f2ab888..69de1d4 100644 --- a/src/router/home.rs +++ b/src/router/home.rs @@ -7,8 +7,7 @@ use crate::router::userdata; pub fn home(req: HttpRequest) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc_home(key, uid); + let user = userdata::get_acc_home(key); let resp = object!{ "code": 0, diff --git a/src/router/live.rs b/src/router/live.rs index 642c9bd..b961efd 100644 --- a/src/router/live.rs +++ b/src/router/live.rs @@ -6,10 +6,6 @@ use actix_web::{HttpResponse, HttpRequest, http::header::HeaderValue}; use crate::router::userdata; pub fn guest(_req: HttpRequest, _body: String) -> HttpResponse { - //let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); - //let blank_header = HeaderValue::from_static(""); - //let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - //let user = userdata::get_acc(key, ""); let resp = object!{ "code": 0, @@ -33,9 +29,8 @@ pub fn end(req: HttpRequest, _body: String) -> HttpResponse { //let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc(key, uid); - let user2 = userdata::get_acc_home(key, uid); + let user = userdata::get_acc(key); + let user2 = userdata::get_acc_home(key); let resp = object!{ "code": 0, diff --git a/src/router/login.rs b/src/router/login.rs index 8c1a3b6..7eaf638 100644 --- a/src/router/login.rs +++ b/src/router/login.rs @@ -10,8 +10,7 @@ pub fn dummy(req: HttpRequest, _body: String) -> HttpResponse { //let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc(key, uid); + let user = userdata::get_acc(key); println!("Signin from uid: {}", user["user"]["id"].clone()); let resp = object!{ diff --git a/src/router/lottery/mod.rs b/src/router/lottery/mod.rs index 08e263f..a01fd3a 100644 --- a/src/router/lottery/mod.rs +++ b/src/router/lottery/mod.rs @@ -59,9 +59,8 @@ pub fn lottery(req: HttpRequest, body: String) -> HttpResponse { println!("lottery: {}", body); let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let mut user = userdata::get_acc(key, uid); - let user2 = userdata::get_acc(key, uid); + let mut user = userdata::get_acc(key); + let user2 = userdata::get_acc(key); let mut cardstogive = get_random_cards(9); /*let cardstogive = array![ @@ -95,7 +94,7 @@ pub fn lottery(req: HttpRequest, body: String) -> HttpResponse { user["deck_list"][0]["main_card_ids"][i] = data["id"].clone(); } - userdata::save_acc(key, uid, user); + userdata::save_acc(key, user); let mut lottery_list = array![]; for (_i, data) in cardstogive.members().enumerate() { diff --git a/src/router/mission.rs b/src/router/mission.rs index 482bf64..d7b28a6 100644 --- a/src/router/mission.rs +++ b/src/router/mission.rs @@ -7,8 +7,7 @@ use crate::router::userdata; pub fn mission(req: HttpRequest) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc(key, uid); + let user = userdata::get_acc(key); let resp = object!{ "code": 0, diff --git a/src/router/start.rs b/src/router/start.rs index 084707e..b158697 100644 --- a/src/router/start.rs +++ b/src/router/start.rs @@ -27,13 +27,12 @@ pub fn start(req: HttpRequest, body: String) -> HttpResponse { } let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let mut user = userdata::get_acc(key, uid); + let mut user = userdata::get_acc(key); user["user"]["last_login_time"] = global::timestamp().into(); user["stamina"]["last_updated_time"] = global::timestamp().into(); - userdata::save_acc(key, uid, user); + userdata::save_acc(key, user); let resp = object!{ "code": 0, diff --git a/src/router/tutorial.rs b/src/router/tutorial.rs index 32eef5d..f2e39a0 100644 --- a/src/router/tutorial.rs +++ b/src/router/tutorial.rs @@ -9,12 +9,11 @@ pub fn tutorial(req: HttpRequest, body: String) -> HttpResponse { let body = json::parse(&encryption::decrypt_packet(&body).unwrap()).unwrap(); let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let mut user = userdata::get_acc(key, uid); + let mut user = userdata::get_acc(key); user["tutorial_step"] = body["step"].clone(); - userdata::save_acc(key, uid, user); + userdata::save_acc(key, user); let resp = object!{ "code": 0, diff --git a/src/router/user.rs b/src/router/user.rs index fb00399..42e454c 100644 --- a/src/router/user.rs +++ b/src/router/user.rs @@ -9,8 +9,7 @@ pub fn user(req: HttpRequest) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let user = userdata::get_acc(key, uid); + let user = userdata::get_acc(key); let resp = object!{ "code": 0, @@ -25,14 +24,13 @@ pub fn user_post(req: HttpRequest, body: String) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let mut user = userdata::get_acc(key, uid); - let user_2 = userdata::get_acc_home(key, uid); + let mut user = userdata::get_acc(key); + let user_2 = userdata::get_acc_home(key); user["user"]["name"] = body["name"].clone(); user["user"]["friend_request_disabled"] = body["friend_request_disabled"].clone(); - userdata::save_acc(key, uid, user.clone()); + userdata::save_acc(key, user.clone()); let resp = object!{ "code": 0, @@ -50,8 +48,7 @@ pub fn initialize(req: HttpRequest, body: String) -> HttpResponse { let blank_header = HeaderValue::from_static(""); let key = req.headers().get("a6573cbe").unwrap_or(&blank_header).to_str().unwrap_or(""); - let uid = req.headers().get("aoharu-user-id").unwrap_or(&blank_header).to_str().unwrap_or(""); - let mut user = userdata::get_acc(key, uid); + let mut user = userdata::get_acc(key); let id = (body["master_character_id"].as_i32().unwrap() * 10000) + 7; //todo - is this alwasy the case? user["user"]["favorite_master_card_id"] = id.into(); @@ -73,7 +70,7 @@ pub fn initialize(req: HttpRequest, body: String) -> HttpResponse { user["user"]["master_title_ids"][0] = masterid.into(); - userdata::save_acc(key, uid, user.clone()); + userdata::save_acc(key, user.clone()); let resp = object!{ "code": 0, diff --git a/src/router/userdata/mod.rs b/src/router/userdata/mod.rs index d5f0a11..44ba766 100644 --- a/src/router/userdata/mod.rs +++ b/src/router/userdata/mod.rs @@ -160,15 +160,15 @@ fn get_data(a6573cbe: &str) -> JsonValue { } } -pub fn get_acc(a6573cbe: &str, _uid: &str) -> JsonValue { +pub fn get_acc(a6573cbe: &str) -> JsonValue { return get_data(a6573cbe)["userdata"].clone(); } -pub fn get_acc_home(a6573cbe: &str, _uid: &str) -> JsonValue { +pub fn get_acc_home(a6573cbe: &str) -> JsonValue { return get_data(a6573cbe)["home"].clone(); } -pub fn save_acc(a6573cbe: &str, _uid: &str, data: JsonValue) { +pub fn save_acc(a6573cbe: &str, data: JsonValue) { let decoded = general_purpose::STANDARD.decode(a6573cbe).unwrap(); let a6573cbe = String::from_utf8_lossy(&decoded);