ethanaobrien/ew
1
0
Fork 0
mirror of https://git.ethanthesleepy.one/ethanaobrien/ew.git synced 2025-05-13 11:37:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix is_new flag

Browse source
This commit is contained in:
Ethan O'Brien 2024-05-03 18:56:06 -05:00
parent 84b671d585
commit cebe50d752
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,12 +186,12 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
let mut lottery_list = array![]; let mut lottery_list = array![];
if lottery_type == 1 { if lottery_type == 1 {
let mut new_ids = array![];
for (_i, data) in cardstogive.members().enumerate() { for (_i, data) in cardstogive.members().enumerate() {
let mut is_new = true;
if !global::give_character(data["master_card_id"].to_string(), &mut user) { if !global::give_character(data["master_card_id"].to_string(), &mut user) {
continue; is_new = false;
} }
new_ids.push(data["master_lottery_item_id"].to_string()).unwrap(); if is_new {
let to_push = object!{ let to_push = object!{
"id": data["master_card_id"].clone(), "id": data["master_card_id"].clone(),
"master_card_id": data["master_card_id"].clone(), "master_card_id": data["master_card_id"].clone(),
@ -202,15 +202,13 @@ pub fn lottery_post(req: HttpRequest, body: String) -> HttpResponse {
}; };
new_cards.push(to_push).unwrap(); new_cards.push(to_push).unwrap();
} }
for (_i, data) in cardstogive.members().enumerate() {
let new = if new_ids.contains(data["master_lottery_item_id"].to_string()) { 1 } else { 0 };
let mut to_push = object!{ let mut 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 "is_new": if is_new { 1 } else { 0 }
}; };
if new == 0 { if !is_new {
//given by global::give_character call
to_push["exchange_item"] = object!{"master_item_id": 19100001, "amount": 50}; to_push["exchange_item"] = object!{"master_item_id": 19100001, "amount": 50};
} }
lottery_list.push(to_push).unwrap(); lottery_list.push(to_push).unwrap();