diff --git a/src/main.rs b/src/main.rs index 60a334f..49126fc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -120,14 +120,14 @@ fn api_req(req: HttpRequest, body: String) -> HttpResponse { "server_time": global::timestamp(), "data": resp.unwrap() }; - return global::send(rv, uid); + global::send(rv, uid) } else { let rv = object!{ "code": 2,//Idontnermemrmemremremermrme "server_time": global::timestamp(), "data": "" }; - return global::send(rv, uid); + global::send(rv, uid) } } diff --git a/src/router/card.rs b/src/router/card.rs index 34cad6e..a967dc7 100644 --- a/src/router/card.rs +++ b/src/router/card.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{userdata, global, items, databases}; use crate::encryption; diff --git a/src/router/chat.rs b/src/router/chat.rs index 3954aba..8a090a4 100644 --- a/src/router/chat.rs +++ b/src/router/chat.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{global, items, userdata, databases}; use crate::encryption; diff --git a/src/router/clear_rate.rs b/src/router/clear_rate.rs index ef23b5b..e546a7b 100644 --- a/src/router/clear_rate.rs +++ b/src/router/clear_rate.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use rusqlite::params; use std::sync::Mutex; use std::thread; diff --git a/src/router/debug.rs b/src/router/debug.rs index d84fc91..55bf8d6 100644 --- a/src/router/debug.rs +++ b/src/router/debug.rs @@ -1,7 +1,6 @@ -use json::{object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use json::{JsonValue}; +use actix_web::{HttpRequest}; -use crate::router::global; use crate::encryption; pub fn error(req: HttpRequest, body: String) -> Option { diff --git a/src/router/event.rs b/src/router/event.rs index a28112f..2524c9e 100644 --- a/src/router/event.rs +++ b/src/router/event.rs @@ -1,5 +1,5 @@ use json::{JsonValue, object}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{userdata, global}; diff --git a/src/router/exchange.rs b/src/router/exchange.rs index e801035..a597b61 100644 --- a/src/router/exchange.rs +++ b/src/router/exchange.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{global, userdata, items, databases}; use crate::encryption; diff --git a/src/router/friend.rs b/src/router/friend.rs index 4ed7e36..b687d2f 100644 --- a/src/router/friend.rs +++ b/src/router/friend.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{userdata, global}; use crate::encryption; diff --git a/src/router/global.rs b/src/router/global.rs index 0550bd2..9458dcc 100644 --- a/src/router/global.rs +++ b/src/router/global.rs @@ -1,8 +1,7 @@ use json::{array, object, JsonValue}; use actix_web::{ HttpResponse, - http::header::{HeaderValue, HeaderMap}, - HttpRequest + http::header::{HeaderValue, HeaderMap} }; use std::time::{SystemTime, UNIX_EPOCH}; use base64::{Engine as _, engine::general_purpose}; diff --git a/src/router/home.rs b/src/router/home.rs index 0285836..5d4d007 100644 --- a/src/router/home.rs +++ b/src/router/home.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use lazy_static::lazy_static; use crate::router::{global, userdata, items}; diff --git a/src/router/items.rs b/src/router/items.rs index 2149090..a0e7b33 100644 --- a/src/router/items.rs +++ b/src/router/items.rs @@ -1,6 +1,6 @@ use json::{array, object, JsonValue}; use rand::Rng; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::encryption; use crate::router::{userdata, global, databases}; diff --git a/src/router/live.rs b/src/router/live.rs index 73f6ffc..74886d0 100644 --- a/src/router/live.rs +++ b/src/router/live.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use rand::Rng; use lazy_static::lazy_static; diff --git a/src/router/login.rs b/src/router/login.rs index 8739e0f..72f3601 100644 --- a/src/router/login.rs +++ b/src/router/login.rs @@ -1,5 +1,5 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{global, userdata, items, databases}; diff --git a/src/router/lottery.rs b/src/router/lottery.rs index 4bb6474..e1b5116 100644 --- a/src/router/lottery.rs +++ b/src/router/lottery.rs @@ -1,5 +1,5 @@ use json::{array, object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use rand::Rng; use crate::router::{global, userdata, items, databases}; diff --git a/src/router/mission.rs b/src/router/mission.rs index c8c0421..cd3fa47 100644 --- a/src/router/mission.rs +++ b/src/router/mission.rs @@ -1,5 +1,5 @@ use json::{array, object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{global, userdata, items, databases}; use crate::encryption; diff --git a/src/router/notice.rs b/src/router/notice.rs index c7645a3..a68a437 100644 --- a/src/router/notice.rs +++ b/src/router/notice.rs @@ -1,7 +1,6 @@ use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; -use crate::router::global; //todo pub fn reward(req: HttpRequest) -> Option { diff --git a/src/router/purchase.rs b/src/router/purchase.rs index 0e2158b..5be0fa9 100644 --- a/src/router/purchase.rs +++ b/src/router/purchase.rs @@ -1,7 +1,6 @@ use json::{object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; -use crate::router::global; pub fn purchase(req: HttpRequest) -> Option { Some(object!{ diff --git a/src/router/serial_code.rs b/src/router/serial_code.rs index 2319323..123007a 100644 --- a/src/router/serial_code.rs +++ b/src/router/serial_code.rs @@ -1,5 +1,5 @@ use json::{array, object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{global, userdata, items}; use crate::encryption; diff --git a/src/router/shop.rs b/src/router/shop.rs index 998d6c9..4f840ee 100644 --- a/src/router/shop.rs +++ b/src/router/shop.rs @@ -1,5 +1,5 @@ use json::{object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::router::{userdata, global, items, databases}; use crate::encryption; diff --git a/src/router/start.rs b/src/router/start.rs index a4bb6f3..d111c4e 100644 --- a/src/router/start.rs +++ b/src/router/start.rs @@ -1,5 +1,5 @@ use json::{JsonValue, object}; -use actix_web::{HttpResponse, HttpRequest, http::header::HeaderValue}; +use actix_web::{HttpRequest, http::header::HeaderValue}; use crate::encryption; use crate::router::{userdata, global}; diff --git a/src/router/story.rs b/src/router/story.rs index 3554a9c..b521ab1 100644 --- a/src/router/story.rs +++ b/src/router/story.rs @@ -1,7 +1,6 @@ use json::{object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; -use crate::router::global; pub fn read(req: HttpRequest, _body: String) -> Option { Some(object!{"gift_list":[],"updated_value_list":{"master_chat_room_ids":[3001001,3101001],"master_chat_chapter_ids":[300100101,310100101]},"reward_list":[{"type":16,"value":3001001,"level":0,"amount":1},{"type":16,"value":3101001,"level":0,"amount":1},{"type":17,"value":300100101,"level":0,"amount":1},{"type":17,"value":310100101,"level":0,"amount":1}],"clear_mission_ids":[]}) diff --git a/src/router/tutorial.rs b/src/router/tutorial.rs index 72f42f2..bd8298a 100644 --- a/src/router/tutorial.rs +++ b/src/router/tutorial.rs @@ -1,5 +1,5 @@ -use json::{object, array, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use json::{array, JsonValue}; +use actix_web::{HttpRequest}; use crate::router::{userdata, global}; use crate::encryption; diff --git a/src/router/user.rs b/src/router/user.rs index 621befd..8b7419c 100644 --- a/src/router/user.rs +++ b/src/router/user.rs @@ -1,5 +1,5 @@ use json::{array, object, JsonValue}; -use actix_web::{HttpResponse, HttpRequest}; +use actix_web::{HttpRequest}; use crate::encryption; use crate::router::{userdata, global, items};