ethanaobrien/ew
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor cleanup

Browse source
This commit is contained in:
Ethan O'Brien 2024-04-08 20:30:58 -05:00
parent 237e403163
commit f84e03ac04
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/router/gree.rs
View file

@ -54,7 +54,7 @@ fn lock_and_select(command: &str) -> Result<String, rusqlite::Error> {
init(&mut result); init(&mut result);
} }
let conn = result.as_ref().unwrap(); 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)); return stmt.query_row([], |row| row.get(0));
} }
Err(_) => { Err(_) => {

3
src/router/lottery/mod.rs
View file

@ -159,10 +159,11 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
let mut lottery_list = array![]; let mut lottery_list = array![];
for (_i, data) in cardstogive.members().enumerate() { 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!{ let to_push = object!{
"master_lottery_item_id": data["master_lottery_item_id"].clone(), "master_lottery_item_id": data["master_lottery_item_id"].clone(),
"master_lottery_item_number": data["master_lottery_item_number"].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(); lottery_list.push(to_push).unwrap();
} }

8
src/router/start.rs
View file

@ -12,8 +12,8 @@ pub fn asset_hash(req: HttpRequest, body: String) -> HttpResponse {
} }
let blank_header = HeaderValue::from_static(""); let blank_header = HeaderValue::from_static("");
let key = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or(""); let platform = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
let android = !key.to_lowercase().contains("iphone"); let android = !platform.to_lowercase().contains("iphone");
let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP { let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
if android { if android {
@ -53,8 +53,8 @@ pub fn start(req: HttpRequest, body: String) -> HttpResponse {
user["stamina"]["last_updated_time"] = global::timestamp().into(); user["stamina"]["last_updated_time"] = global::timestamp().into();
let blank_header = HeaderValue::from_static(""); let blank_header = HeaderValue::from_static("");
let key = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or(""); let platform = req.headers().get("aoharu-platform").unwrap_or(&blank_header).to_str().unwrap_or("");
let android = !key.to_lowercase().contains("iphone"); let android = !platform.to_lowercase().contains("iphone");
let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP { let hash = if body["asset_version"].to_string() == global::ASSET_VERSION_JP {
if android { if android {