Remove dead code

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);
-    let user = userdata::get_acc(key, uid);
     
     let id = user["user"]["favorite_master_card_id"].as_i64().unwrap() / 10000;
     

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);
-    let user = userdata::get_acc_home(key, uid);
     
     let resp = object!{
         "code": 0,

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);
-    let user = userdata::get_acc(key, uid);
+    let user2 = userdata::get_acc_home(key);
-    let user2 = userdata::get_acc_home(key, uid);
     
     let resp = object!{
         "code": 0,

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);
-    let user = userdata::get_acc(key, uid);
     
     println!("Signin from uid: {}", user["user"]["id"].clone());
     let resp = object!{

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);
-    let mut user = userdata::get_acc(key, uid);
+    let user2 = userdata::get_acc(key);
-    let user2 = userdata::get_acc(key, uid);
     
     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() {

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);
-    let user = userdata::get_acc(key, uid);
     
     let resp = object!{
         "code": 0,

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);
-    let mut user = userdata::get_acc(key, uid);
     
     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,

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);
-    let mut user = userdata::get_acc(key, uid);
     
     user["tutorial_step"] = body["step"].clone();
     
-    userdata::save_acc(key, uid, user);
+    userdata::save_acc(key, user);
     
     let resp = object!{
         "code": 0,

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);
-    let user = userdata::get_acc(key, uid);
     
     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);
-    let mut user = userdata::get_acc(key, uid);
+    let user_2 = userdata::get_acc_home(key);
-    let user_2 = userdata::get_acc_home(key, uid);
     
     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);
-    let mut user = userdata::get_acc(key, uid);
     
     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,

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);