Compare commits
4 Commits
e7f2c4efea
...
f512f29cfa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f512f29cfa | ||
| 8601d7ced1 | |||
| 74941a8abc | |||
| 86683d410f |
@ -13,7 +13,7 @@ bytes = "1"
|
|||||||
rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" }
|
rocket_prost_responder_derive = { path = "rocket_prost_responder_derive" }
|
||||||
uuid = { version = "1.19.0", features = ["v4"] }
|
uuid = { version = "1.19.0", features = ["v4"] }
|
||||||
bcrypt = "0.17.1"
|
bcrypt = "0.17.1"
|
||||||
bincode = "2.0.1"
|
bincode = "3.0.0"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
reqwest = { version = "0.12.24", features = ["json"] }
|
reqwest = { version = "0.12.24", features = ["json"] }
|
||||||
|
|||||||
@ -124,6 +124,19 @@ async fn update_game(
|
|||||||
if let Some(existing) = games.iter_mut().find(|g| {
|
if let Some(existing) = games.iter_mut().find(|g| {
|
||||||
(g.remote_id == game.remote_id && g.source == game.source) || (g.title == game.title)
|
(g.remote_id == game.remote_id && g.source == game.source) || (g.title == game.title)
|
||||||
}) {
|
}) {
|
||||||
|
if existing.title != game.title {
|
||||||
|
// Update title for every opinion
|
||||||
|
for person in user_list.lock().await.iter_mut() {
|
||||||
|
let opinion = person
|
||||||
|
.person
|
||||||
|
.opinion
|
||||||
|
.iter_mut()
|
||||||
|
.find(|o| o.title == existing.title);
|
||||||
|
if let Some(opinion) = opinion {
|
||||||
|
opinion.title = game.title.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
existing.title = game.title.clone();
|
existing.title = game.title.clone();
|
||||||
existing.source = game.source;
|
existing.source = game.source;
|
||||||
existing.min_players = game.min_players;
|
existing.min_players = game.min_players;
|
||||||
@ -133,6 +146,9 @@ async fn update_game(
|
|||||||
|
|
||||||
r_existing = Some(existing.clone());
|
r_existing = Some(existing.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
games.sort_unstable_by(|g1, g2| g1.title.cmp(&g2.title));
|
||||||
|
|
||||||
let users = user_list.lock().await;
|
let users = user_list.lock().await;
|
||||||
save_state(&games, &users);
|
save_state(&games, &users);
|
||||||
|
|
||||||
@ -154,7 +170,12 @@ async fn delete_game(
|
|||||||
{
|
{
|
||||||
let game = games.remove(pos);
|
let game = games.remove(pos);
|
||||||
|
|
||||||
let users = user_list.lock().await;
|
let mut users = user_list.lock().await;
|
||||||
|
|
||||||
|
for person in users.iter_mut() {
|
||||||
|
person.person.opinion.retain_mut(|o| o.title != game.title);
|
||||||
|
}
|
||||||
|
|
||||||
save_state(&games, &users);
|
save_state(&games, &users);
|
||||||
|
|
||||||
return Some(game);
|
return Some(game);
|
||||||
|
|||||||
@ -86,7 +86,7 @@ export function FilteredGamesList({
|
|||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{price === 0 ? "0 (Free)" : price}€
|
{price === 0 ? "0€ (Free)" : `${price}€`}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<GameImage game={game} />
|
<GameImage game={game} />
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user