Codeforces: asyncify announcer

youmubot-cf/src/announcer.rs

@@ -1,85 +1,62 @@
-use crate::db::{CfSavedUsers, CfUser};
+use crate::{
+    db::{CfSavedUsers, CfUser},
+    CFClient,
+};
 use announcer::MemberToChannels;
 use chrono::Utc;
 use codeforces::{RatingChange, User};
-use serenity::{
+use serenity::{http::CacheHttp, model::id::UserId, CacheAndHttp};
-    framework::standard::{CommandError, CommandResult},
-    http::CacheHttp,
-    model::id::{ChannelId, UserId},
-    CacheAndHttp,
-};
 use std::sync::Arc;
 use youmubot_prelude::*;
 
 type Reqwest = <HTTPClient as TypeMapKey>::Value;
 
 /// Updates the rating and rating changes of the users.
-pub fn updates(
+pub struct Announcer;
+
+#[async_trait]
+impl youmubot_prelude::Announcer for Announcer {
+    async fn updates(
+        &mut self,
         http: Arc<CacheAndHttp>,
         data: AppData,
         channels: MemberToChannels,
-) -> CommandResult {
+    ) -> Result<()> {
-    let mut users = CfSavedUsers::open(&*data.read()).borrow()?.clone();
+        let data = data.read().await;
-    let reqwest = data.get_cloned::<HTTPClient>();
+        let client = data.get::<CFClient>().unwrap();
+        let mut users = CfSavedUsers::open(&*data).borrow()?.clone();
 
-    for (user_id, cfu) in users.iter_mut() {
+        users
-        if let Err(e) = update_user(http.clone(), &channels, &reqwest, *user_id, cfu) {
+            .iter_mut()
-            dbg!((*user_id, e));
+            .map(|(user_id, cfu)| update_user(http.clone(), &channels, &client, *user_id, cfu))
-        }
+            .collect::<stream::FuturesUnordered<_>>()
-    }
+            .try_collect::<()>()
-
+            .await?;
-    *CfSavedUsers::open(&*data.read()).borrow_mut()? = users;
+        *CfSavedUsers::open(&*data).borrow_mut()? = users;
         Ok(())
+    }
 }
 
-fn update_user(
+async fn update_user(
     http: Arc<CacheAndHttp>,
     channels: &MemberToChannels,
-    reqwest: &Reqwest,
+    client: &codeforces::Client,
     user_id: UserId,
     cfu: &mut CfUser,
-) -> CommandResult {
+) -> Result<()> {
-    // Ensure this takes 200ms
+    let info = User::info(client, &[cfu.handle.as_str()])
-    let after = crossbeam_channel::after(std::time::Duration::from_secs_f32(0.2));
+        .await?
-    let info = User::info(reqwest, &[cfu.handle.as_str()])?
         .into_iter()
         .next()
-        .ok_or(CommandError::from("Not found"))?;
+        .ok_or(Error::msg("Not found"))?;
 
-    let rating_changes = info.rating_changes(reqwest)?;
+    let rating_changes = info.rating_changes(client).await?;
 
-    let mut channels_list: Option<Vec<ChannelId>> = None;
+    let channels_list = channels.channels_of(&http, user_id).await;
     cfu.last_update = Utc::now();
     // Update the rating
     cfu.rating = info.rating;
 
-    let mut send_message = |rc: RatingChange| -> CommandResult {
-        let channels =
-            channels_list.get_or_insert_with(|| channels.channels_of(http.clone(), user_id));
-        if channels.is_empty() {
-            return Ok(());
-        }
-        let (contest, _, _) =
-            codeforces::Contest::standings(reqwest, rc.contest_id, |f| f.limit(1, 1))?;
-        for channel in channels {
-            if let Err(e) = channel.send_message(http.http(), |e| {
-                e.content(format!("Rating change for {}!", user_id.mention()))
-                    .embed(|c| {
-                        crate::embed::rating_change_embed(
-                            &rc,
-                            &info,
-                            &contest,
-                            &user_id.mention(),
-                            c,
-                        )
-                    })
-            }) {
-                dbg!(e);
-            }
-        }
-        Ok(())
-    };
-
     let rating_changes = match cfu.last_contest_id {
         None => rating_changes,
         Some(v) => {
@@ -101,12 +78,46 @@ fn update_user(
         .or(cfu.last_contest_id);
 
     // Check for any good announcements to make
-    for rc in rating_changes {
+    rating_changes
-        if let Err(v) = send_message(rc) {
+        .into_iter()
-            dbg!(v);
+        .map(|rc: RatingChange| {
+            let channels = channels_list.clone();
+            let http = http.clone();
+            let info = info.clone();
+            async move {
+                if channels.is_empty() {
+                    return Ok(());
                 }
+                let (contest, _, _) =
+                    codeforces::Contest::standings(client, rc.contest_id, |f| f.limit(1, 1))
+                        .await?;
+                channels
+                    .iter()
+                    .map(|channel| {
+                        channel.send_message(http.http(), |e| {
+                            e.content(format!("Rating change for {}!", user_id.mention()))
+                                .embed(|c| {
+                                    crate::embed::rating_change_embed(
+                                        &rc,
+                                        &info,
+                                        &contest,
+                                        &user_id.mention(),
+                                        c,
+                                    )
+                                })
+                        })
+                    })
+                    .collect::<stream::FuturesUnordered<_>>()
+                    .map(|v| v.map(|_| ()))
+                    .try_collect::<()>()
+                    .await?;
+                let r: Result<_> = Ok(());
+                r
             }
-    after.recv().ok();
+        })
+        .collect::<stream::FuturesUnordered<_>>()
+        .try_collect::<()>()
+        .await?;
 
     Ok(())
 }