From f84e03ac04d87091294e1347e207d98b279183f5 Mon Sep 17 00:00:00 2001
From: Ethan O'Brien <77750390+ethanaobrien@users.noreply.github.com>
Date: Mon, 8 Apr 2024 20:30:58 -0500
Subject: [PATCH] Minor cleanup

---
 src/router/gree.rs        | 2 +-
 src/router/lottery/mod.rs | 3 ++-
 src/router/start.rs       | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/router/gree.rs b/src/router/gree.rs
index ce67472..aea8d4d 100644
--- a/src/router/gree.rs
+++ b/src/router/gree.rs
@@ -54,7 +54,7 @@ fn lock_and_select(command: &str) -> Result<String, rusqlite::Error> {
                     init(&mut result);
                 }
                 let conn = result.as_ref().unwrap();
-                let mut stmt = conn.prepare(command).unwrap();
+                let mut stmt = conn.prepare(command)?;
                 return stmt.query_row([], |row| row.get(0));
             }
             Err(_) => {
diff --git a/src/router/lottery/mod.rs b/src/router/lottery/mod.rs
index 53d9e88..93003dc 100644
--- a/src/router/lottery/mod.rs
+++ b/src/router/lottery/mod.rs
@@ -159,10 +159,11 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
     
     let mut lottery_list = array![];
     for (_i, data) in cardstogive.members().enumerate() {
+        let new = if new_ids.contains(data["master_lottery_item_id"].to_string()) { 1 } else { 0 };
         let to_push = object!{
             "master_lottery_item_id": data["master_lottery_item_id"].clone(),
             "master_lottery_item_number": data["master_lottery_item_number"].clone(),
-            "is_new": new_ids.contains(data["master_lottery_item_id"].to_string())
+            "is_new": new
         };
         lottery_list.push(to_push).unwrap();
     }
diff --git a/src/router/start.rs b/src/router/start.rs
index 5dd0f8c..bf41a63 100644
--- a/src/router/start.rs
+++ b/src/router/start.rs
@@ -12,8 +12,8 @@ pub fn asset_hash(req: HttpRequest, body: String) -> HttpResponse {
     }
     
     let blank_header = HeaderValue::from_static("");
-    let key = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
-    let android = !key.to_lowercase().contains("iphone");
+    let platform = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
+    let android = !platform.to_lowercase().contains("iphone");
     
     let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
         if android {
@@ -53,8 +53,8 @@ pub fn start(req: HttpRequest, body: String) -> HttpResponse {
     user["stamina"]["last_updated_time"] = global::timestamp().into();
     
     let blank_header = HeaderValue::from_static("");
-    let key = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
-    let android = !key.to_lowercase().contains("iphone");
+    let platform = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
+    let android = !platform.to_lowercase().contains("iphone");
     
     let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
         if android {