fix: checking if the map has been captured by the clan in the Capture…

… the map command

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bl-bot"
-version = "0.18.5"
+version = "0.18.6"
 description = "Beat Leader Discord Bot"
 readme = "README.md"
 repository = "https://github.com/motzel/bl-bot"

src/beatleader/clan.rs

@@ -177,6 +177,16 @@ pub struct ClanMapScore {
     pub timepost: DateTime<Utc>,
 }
 
+#[serde_as]
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct ClanLeaderboard {
+    pub id: LeaderboardId,
+    pub clan_id: ClanId,
+    pub play_count: u32,
+    pub plays: u32,
+}
+
 #[serde_as]
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
@@ -191,7 +201,7 @@ pub struct BlApiClanRankingScoresResponse {
     #[serde(with = "ts_seconds")]
     pub last_update_time: DateTime<Utc>,
     #[serde_as(deserialize_as = "DefaultOnNull")]
-    pub leaderboard: Leaderboard,
+    pub leaderboard: ClanLeaderboard,
     #[serde_as(deserialize_as = "DefaultOnNull")]
     pub associated_scores_count: u32,
     #[serde_as(deserialize_as = "DefaultOnNull")]

src/discord/bot/commands/clan.rs

@@ -659,7 +659,7 @@ pub(crate) async fn cmd_capture(
                     data: scores.associated_scores,
                     items_per_page: None,
                     total: Some(scores.associated_scores_count),
-                    other_data: Some((scores.clan, scores.pp)),
+                    other_data: Some((scores.clan, scores.pp, scores.leaderboard)),
                 })
             })
             .await
@@ -671,10 +671,8 @@ pub(crate) async fn cmd_capture(
                     };
 
                     let mut is_captured = false;
-                    if let Some((clan, ..)) = data.other_data {
-                        if clan.captured_leaderboards.is_some()
-                            && !clan.captured_leaderboards.unwrap().is_empty()
-                        {
+                    if let Some((clan, .., leaderboard)) = data.other_data {
+                        if clan.id == leaderboard.clan_id {
                             is_captured = true;
                         }
                     }