feat: move MESSAGE_PREFIX locally (#194)

riichi · Jan 17, 2024 · e2d7222 · e2d7222
1 parent e959495
commit e2d7222
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/chombot-common/src/lib.rs b/chombot-common/src/lib.rs
@@ -33,11 +33,7 @@ pub fn start_tournaments_watcher<T: TournamentWatcherChannelListProvider + 'stat
     channel_list_provider: T,
     ctx: SerenityContext,
 ) {
-    const MESSAGE_PREFIX: &str =
-        "**TOURNAMENTS UPDATE** (http://mahjong-europe.org/ranking/Calendar.html)\n\n";
-
-    let notifier =
-        TournamentsChannelMessageNotifier::new(channel_list_provider, String::from(MESSAGE_PREFIX));
+    let notifier = TournamentsChannelMessageNotifier::new(channel_list_provider);
     tokio::spawn(async move {
         DataWatcher::new(notifier, get_rcr_tournaments)
             .run(&ctx)

diff --git a/chombot-common/src/tournaments_watcher/notifier.rs b/chombot-common/src/tournaments_watcher/notifier.rs
@@ -11,6 +11,9 @@ use crate::data_watcher::DataUpdateNotifier;
 use crate::discord_utils::send_with_overflow;
 use crate::tournaments_watcher::ema::{TournamentStatus, TournamentStatuses, Tournaments};
 
+const MESSAGE_PREFIX: &str =
+    "**TOURNAMENTS UPDATE** (http://mahjong-europe.org/ranking/Calendar.html)\n\n";
+
 #[async_trait]
 pub trait TournamentsUpdateNotifier<R: Send + Sync> {
     async fn notify(&self, ranking: &R);
@@ -45,21 +48,19 @@ impl<T: TournamentWatcherChannelListProvider> TournamentWatcherChannelListProvid
 
 pub struct TournamentsChannelMessageNotifier<T> {
     channel_list_provider: T,
-    message: String,
 }
 
 impl<T: TournamentWatcherChannelListProvider> TournamentsChannelMessageNotifier<T> {
     #[must_use]
-    pub const fn new(channel_list_provider: T, message: String) -> Self {
+    pub const fn new(channel_list_provider: T) -> Self {
         Self {
             channel_list_provider,
-            message,
         }
     }
 
     #[must_use]
-    fn build_message(&self, tournament_statuses: &TournamentStatuses) -> String {
-        format!("{}{}", self.message, build_message(tournament_statuses))
+    fn build_message(tournament_statuses: &TournamentStatuses) -> String {
+        format!("{}{}", MESSAGE_PREFIX, build_message(tournament_statuses))
     }
 }
 
@@ -122,7 +123,7 @@ impl<T: TournamentWatcherChannelListProvider> DataUpdateNotifier<Option<Tourname
     for TournamentsChannelMessageNotifier<T>
 {
     async fn notify(&self, diff: TournamentStatuses, ctx: &Context) {
-        let text = self.build_message(&diff);
+        let text = Self::build_message(&diff);
 
         let channel_list: Vec<ChannelId> = self
             .channel_list_provider