rust/lootalot
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

adds nicer notifications to user

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-10-18 14:48:27 +02:00
parent 60a6e69f67
commit 3fce1dc7d0
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/api.rs
View File

@@ -133,7 +133,6 @@ pub fn execute(
let mut cumulated_diff: Vec<db::Wealth> = Vec::with_capacity(params.len()); let mut cumulated_diff: Vec<db::Wealth> = Vec::with_capacity(params.len());
let mut added_items: u16 = 0; let mut added_items: u16 = 0;
for (item_id, price_mod) in params.into_iter() { for (item_id, price_mod) in params.into_iter() {
// Use a transaction to avoid incoherant state in case of error
if let Ok((item, diff)) = db::buy_item_from_inventory(conn, id, item_id, price_mod) { if let Ok((item, diff)) = db::buy_item_from_inventory(conn, id, item_id, price_mod) {
cumulated_diff.push(diff); cumulated_diff.push(diff);
response.push_update(Update::ItemAdded(item)); response.push_update(Update::ItemAdded(item));
@@ -142,12 +141,11 @@ pub fn execute(
response.push_error(format!("Error adding {}", item_id)); response.push_error(format!("Error adding {}", item_id));
} }
} }
response.notify(format!("Added {} items", added_items)); let total_amount = cumulated_diff
response.push_update(Update::Wealth(
cumulated_diff
.into_iter() .into_iter()
.fold(db::Wealth::from_gp(0.0), |acc, i| acc + i), .fold(db::Wealth::from_gp(0.0), |acc, i| acc + i);
)); response.notify(format!("{} objets achetés pour {}po", added_items, total_amount.to_gp()));
response.push_update(Update::Wealth(total_amount));
} }
ApiActions::SellItems(id, params) => { ApiActions::SellItems(id, params) => {
let mut all_results: Vec<db::Wealth> = Vec::with_capacity(params.len()); let mut all_results: Vec<db::Wealth> = Vec::with_capacity(params.len());
@@ -161,22 +159,23 @@ pub fn execute(
response.push_error(format!("Error selling {}", loot_id)); response.push_error(format!("Error selling {}", loot_id));
} }
} }
response.notify(format!("Sold {} items", sold_items)); let total_amount = all_results
response.push_update(Update::Wealth(
all_results
.into_iter() .into_iter()
.fold(db::Wealth::from_gp(0.0), |acc, i| acc + i), .fold(db::Wealth::from_gp(0.0), |acc, i| acc + i);
)); response.notify(format!("{} objet(s) vendu(s) pour {} po", sold_items, total_amount.to_gp()));
response.push_update(Update::Wealth(total_amount));
} }
ApiActions::ClaimItem(id, item) => { ApiActions::ClaimItem(id, item) => {
response.push_update(Update::ClaimAdded( response.push_update(Update::ClaimAdded(
db::Claims(conn).add(id, item)?, db::Claims(conn).add(id, item)?,
)); ));
response.notify(format!("Pour moi !"));
} }
ApiActions::UnclaimItem(id, item) => { ApiActions::UnclaimItem(id, item) => {
response.push_update(Update::ClaimRemoved( response.push_update(Update::ClaimRemoved(
db::Claims(conn).remove(id, item)?, db::Claims(conn).remove(id, item)?,
)); ));
response.notify(format!("Bof! Finalement non."));
} }
// Group actions // Group actions
ApiActions::AddLoot(items) => {} ApiActions::AddLoot(items) => {}