Add ranking_watcher functionality to chombot with config support

Co-authored-by: seqre <44679055+seqre@users.noreply.github.com>

Author: Copilot

chombot-common/src/ranking_watcher/notifier.rs

@@ -1,10 +1,10 @@
 use async_trait::async_trait;
-use crate::data_watcher::DataUpdateNotifier;
-use crate::discord_utils::send_with_overflow;
 use log::error;
 use poise::serenity_prelude::{ChannelId, Context};
 
 use super::usma::{Ranking, RankingEntry};
+use crate::data_watcher::DataUpdateNotifier;
+use crate::discord_utils::send_with_overflow;
 use crate::ranking_watcher::usma::PositionChangeInfo;
 
 pub struct ChannelMessageNotifier {

chombot-common/src/ranking_watcher/usma.rs

@@ -1,13 +1,14 @@
 use std::convert::TryFrom;
 
 use anyhow::{anyhow, Context, Result};
-use crate::data_watcher::WatchableData;
-use crate::scraping_utils::{create_chombot_http_client, first_nonempty_text};
-use crate::{select_all, select_one, unpack_children};
 use log::info;
 use scraper::node::{Element, Node};
 use scraper::{CaseSensitivity, ElementRef, Html, Selector};
 
+use crate::data_watcher::WatchableData;
+use crate::scraping_utils::{create_chombot_http_client, first_nonempty_text};
+use crate::{select_all, select_one, unpack_children};
+
 const RANKING_URL: &str = "https://ranking.cvgo.re/";
 
 #[derive(Clone, Debug, Eq, PartialEq)]

chombot-kcc/src/main.rs

@@ -10,6 +10,8 @@ extern crate core;
 use anyhow::Error;
 use chombot_common::chombot::ChombotBase;
 use chombot_common::data_watcher::DataWatcher;
+use chombot_common::ranking_watcher::notifier::ChannelMessageNotifier;
+use chombot_common::ranking_watcher::usma::get_ranking;
 use chombot_common::slash_commands::hand::hand;
 use chombot_common::slash_commands::score::score;
 use chombot_common::{start_tournaments_watcher, ChombotPoiseUserData};
@@ -23,8 +25,6 @@ use poise::{BoxFuture, Command, Context, Framework, FrameworkContext, FrameworkO
 use crate::args::Arguments;
 use crate::chombot::Chombot;
 use crate::kcc3::Kcc3ClientResult;
-use chombot_common::ranking_watcher::notifier::ChannelMessageNotifier;
-use chombot_common::ranking_watcher::usma::get_ranking;
 use crate::slash_commands::chombo::chombo;
 use crate::slash_commands::pasta::pasta;
 

chombot/src/args.rs

@@ -7,4 +7,8 @@ pub struct Arguments {
     /// Discord API token
     #[arg(long, env)]
     pub discord_token: String,
+
+    /// Enable ranking watcher
+    #[arg(long, env, default_value_t = false)]
+    pub feature_ranking_watcher: bool,
 }

chombot/src/config.rs

@@ -4,12 +4,14 @@ use std::collections::HashMap;
 use std::fs;
 use std::ops::{Deref, DerefMut};
 use std::path::PathBuf;
+use std::sync::Arc;
 
 use async_trait::async_trait;
 use chombot_common::tournaments_watcher::notifier::TournamentWatcherChannelListProvider;
 use log::info;
 use poise::serenity_prelude::{ChannelId, GuildId};
 use serde::{Deserialize, Serialize};
+use tokio::sync::RwLock;
 
 #[derive(Clone, Default, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Config {
@@ -22,6 +24,8 @@ pub struct Config {
 pub struct GuildConfig {
     /// Tournaments watcher channel ID
     pub tournaments_watcher_channel_id: Option<ChannelId>,
+    /// Ranking watcher channel ID
+    pub ranking_watcher_channel_id: Option<ChannelId>,
 }
 
 #[async_trait]
@@ -39,6 +43,37 @@ impl TournamentWatcherChannelListProvider for ChombotConfig {
     }
 }
 
+#[async_trait]
+pub trait RankingWatcherChannelListProvider: Send + Sync {
+    type RankingWatcherChannelList: IntoIterator<Item = ChannelId> + Send;
+
+    async fn ranking_watcher_channels(&self) -> Self::RankingWatcherChannelList;
+}
+
+#[async_trait]
+impl RankingWatcherChannelListProvider for ChombotConfig {
+    type RankingWatcherChannelList = Vec<ChannelId>;
+
+    async fn ranking_watcher_channels(&self) -> Self::RankingWatcherChannelList {
+        let channel_ids = self
+            .config
+            .guilds
+            .iter()
+            .filter_map(|(_, config)| config.ranking_watcher_channel_id);
+
+        channel_ids.collect()
+    }
+}
+
+#[async_trait]
+impl<T: RankingWatcherChannelListProvider> RankingWatcherChannelListProvider for Arc<RwLock<T>> {
+    type RankingWatcherChannelList = T::RankingWatcherChannelList;
+
+    async fn ranking_watcher_channels(&self) -> Self::RankingWatcherChannelList {
+        self.read().await.ranking_watcher_channels().await
+    }
+}
+
 #[derive(Debug)]
 pub struct ChombotConfig {
     path: PathBuf,
@@ -136,12 +171,14 @@ mod tests {
                     GuildId::new(69),
                     GuildConfig {
                         tournaments_watcher_channel_id: Some(ChannelId::new(2137)),
+                        ranking_watcher_channel_id: None,
                     },
                 ),
                 (
                     GuildId::new(420),
                     GuildConfig {
                         tournaments_watcher_channel_id: Some(ChannelId::new(69)),
+                        ranking_watcher_channel_id: None,
                     },
                 ),
             ]),
@@ -171,12 +208,14 @@ mod tests {
                     GuildId::new(69),
                     GuildConfig {
                         tournaments_watcher_channel_id: Some(ChannelId::new(2137)),
+                        ranking_watcher_channel_id: None,
                     },
                 ),
                 (
                     GuildId::new(420),
                     GuildConfig {
                         tournaments_watcher_channel_id: Some(ChannelId::new(69)),
+                        ranking_watcher_channel_id: None,
                     },
                 ),
             ]),

chombot/src/main.rs

@@ -9,17 +9,20 @@ use std::sync::Arc;
 
 use anyhow::Error;
 use chombot_common::chombot::ChombotBase;
+use chombot_common::data_watcher::DataWatcher;
+use chombot_common::ranking_watcher::notifier::ChannelMessageNotifier;
+use chombot_common::ranking_watcher::usma::get_ranking;
 use chombot_common::slash_commands::hand::hand;
 use chombot_common::slash_commands::score::score;
 use chombot_common::{start_tournaments_watcher, ChombotPoiseUserData};
 use clap::Parser;
 use log::{error, info, LevelFilter};
-use poise::serenity_prelude::{ClientBuilder, GatewayIntents};
+use poise::serenity_prelude::{ClientBuilder, Context as SerenityContext, GatewayIntents};
 use poise::{Command, Context, Framework, FrameworkOptions};
 use tokio::sync::RwLock;
 
 use crate::args::Arguments;
-use crate::config::ChombotConfig;
+use crate::config::{ChombotConfig, RankingWatcherChannelListProvider};
 use crate::tournament_watcher::tournament_watcher;
 
 mod args;
@@ -39,6 +42,27 @@ impl ChombotPoiseUserData for PoiseUserData {
 
 pub type PoiseContext<'a> = Context<'a, PoiseUserData, anyhow::Error>;
 
+fn start_ranking_watcher<T: RankingWatcherChannelListProvider + 'static>(
+    channel_list_provider: T,
+    ctx: SerenityContext,
+) {
+    tokio::spawn(async move {
+        let channels = channel_list_provider.ranking_watcher_channels().await;
+        for channel_id in channels {
+            let notifier = ChannelMessageNotifier::new(
+                channel_id,
+                String::from("https://ranking.cvgo.re/ ranking update"),
+            );
+            let ctx_clone = ctx.clone();
+            tokio::spawn(async move {
+                DataWatcher::new(notifier, get_ranking)
+                    .run(&ctx_clone)
+                    .await;
+            });
+        }
+    });
+}
+
 fn get_command_list() -> Vec<Command<PoiseUserData, Error>> {
     vec![hand(), score(), tournament_watcher()]
 }
@@ -63,6 +87,9 @@ async fn main() {
         })
         .setup(move |ctx, ready, framework| {
             Box::pin(async move {
+                if args.feature_ranking_watcher {
+                    start_ranking_watcher(config_ref.clone(), ctx.clone());
+                }
                 start_tournaments_watcher(config_ref.clone(), ctx.clone());
                 poise::builtins::register_globally(ctx, &framework.options().commands).await?;
                 info!("{} is connected!", ready.user.name);