From 2518a7a75f4d1a74327989819561e92e2730b082 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com>
Date: Fri, 3 May 2024 16:32:00 -0500
Subject: [PATCH] I hate this so so so so so so so so so so so so so so so so
 so so so so so so so so so so so so so so so so so so so so so so so so so so
 so so so so so so so so so so so so so so so so so so so so so so so so so so
 so so so so so so so so so so so so so so so so so so so so so so so so so so
 so so so so so so so so so so so so so so so so so so so so so so so so so so
 so so so so so so so so so so so so so so so so so so so so much

---
 src/router/global.rs      |  4 +++-
 src/router/lottery/mod.rs | 13 ++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/router/global.rs b/src/router/global.rs
index c24219a..a47b24c 100644
--- a/src/router/global.rs
+++ b/src/router/global.rs
@@ -108,8 +108,10 @@ pub fn timestamp_since_midnight() -> u64 {
     rv
 }
 
-pub fn send(data: JsonValue) -> HttpResponse {
+pub fn send(mut data: JsonValue) -> HttpResponse {
     //println!("{}", json::stringify(data.clone()));
+    data["server_time"] = 1711741114.into();
+    
     let encrypted = encryption::encrypt_packet(&json::stringify(data)).unwrap();
     let resp = encrypted.into_bytes();
 
diff --git a/src/router/lottery/mod.rs b/src/router/lottery/mod.rs
index db18f38..ebed652 100644
--- a/src/router/lottery/mod.rs
+++ b/src/router/lottery/mod.rs
@@ -157,7 +157,7 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
     
     let mut cardstogive;
     
-    let mut lottery_id = body["master_lottery_id"].as_i64().unwrap();
+    let lottery_id = body["master_lottery_id"].as_i64().unwrap();
     if user["tutorial_step"].as_i32().unwrap() != 130 {
         cardstogive = get_random_cards(body["master_lottery_id"].as_i64().unwrap(), 9);
         let item_id = (body["master_lottery_id"].to_string().parse::<i32>().unwrap() * 100) + 1;
@@ -169,14 +169,13 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
         };
         cardstogive.push(new_card).unwrap();
     } else {
-        lottery_id = 1110024;
         let price = PRICE[lottery_id.to_string()][body["master_lottery_price_number"].to_string()].clone();
         
-        //if price["consumeType"].as_i32().unwrap() == 1 {
-        //    global::remove_gems(&mut user, price["price"].as_i64().unwrap());
-        //} else if price["consumeType"].as_i32().unwrap() == 4 {
-        //    global::use_item(price["masterItemId"].as_i64().unwrap(), price["price"].as_i64().unwrap(), &mut user);
-        //}
+        if price["consumeType"].as_i32().unwrap() == 1 {
+            global::remove_gems(&mut user, price["price"].as_i64().unwrap());
+        } else if price["consumeType"].as_i32().unwrap() == 4 {
+            global::use_item(price["masterItemId"].as_i64().unwrap(), price["price"].as_i64().unwrap(), &mut user);
+        }
         
         cardstogive = get_random_cards(lottery_id, price["count"].as_usize().unwrap());
     }