prololo: switch to tokio async channel

src/bot.rs

@@ -2,7 +2,6 @@ use std::{
     fs::File,
     io::{BufReader, BufWriter},
     path::PathBuf,
-    sync::mpsc::Receiver,
 };
 
 use anyhow::Context;
@@ -11,6 +10,7 @@ use matrix_sdk::{
     ruma::events::{room::member::MemberEventContent, StrippedStateEvent},
     Client, ClientConfig, Session, SyncSettings,
 };
+use tokio::sync::mpsc::UnboundedReceiver;
 use tracing::{debug, info};
 
 use crate::{config::ProloloConfig, webhooks::Event};
@@ -62,21 +62,29 @@ impl Prololo {
     ///
     /// [`Prololo::init`] **must** be called before this function, otherwise the [`Client`] isn't
     /// logged in.
-    pub async fn run(&self, events: Receiver<Event>) {
+    pub async fn run(&self, events: UnboundedReceiver<Event>) {
         debug!("running...");
 
         let client = self.client.clone();
         let config = self.config.clone();
-        tokio::task::spawn_blocking(move || {
+        tokio::task::spawn(async move { Self::receive_events(events, client, config).await });
-            Self::handle_events(events, client, config);
-        });
 
         self.client.sync(SyncSettings::default()).await
     }
 
-    fn handle_events(events: Receiver<Event>, client: Client, config: ProloloConfig) {
+    async fn receive_events(
+        mut events: UnboundedReceiver<Event>,
+        client: Client,
+        config: ProloloConfig,
+    ) {
         loop {
-            let event = events.recv().unwrap();
+            let event = match events.recv().await {
+                Some(event) => event,
+                None => {
+                    info!("all channel senders were dropped, exiting receive loop");
+                    break;
+                }
+            };
             debug!("received event: {:?}", event);
         }
     }

src/main.rs

@@ -1,11 +1,11 @@
 use std::fs::File;
 use std::io::BufReader;
 use std::path::PathBuf;
-use std::sync::mpsc::sync_channel;
 
 use anyhow::Context;
 use clap::Clap;
 use rocket::routes;
+use tokio::sync::mpsc::unbounded_channel;
 
 mod bot;
 use bot::Prololo;
@@ -34,7 +34,7 @@ async fn main() -> anyhow::Result<()> {
     let config: ProloloConfig = serde_yaml::from_reader(BufReader::new(config_file))
         .context("couldn't parse config file")?;
 
-    let (sender, receiver) = sync_channel(42);
+    let (sender, receiver) = unbounded_channel();
 
     let prololo = Prololo::new(config).context("failed to create prololo bot")?;
     prololo.init().await.context("failed to init prololo bot")?;

src/webhooks.rs

@@ -1,9 +1,8 @@
-use std::sync::{mpsc::SyncSender};
-
 mod github;
 pub use github::{github_webhook, GitHubEvent};
+use tokio::sync::mpsc::UnboundedSender;
 
-pub struct EventSender(pub SyncSender<Event>);
+pub struct EventSender(pub UnboundedSender<Event>);
 
 #[derive(Debug)]
 pub enum Event {

src/webhooks/github.rs

@@ -39,7 +39,10 @@ pub fn github_webhook(
         }
     };
 
-    sender.0.send(Event::GitHub(event)).unwrap();
+    sender
+        .0
+        .send(Event::GitHub(event))
+        .expect("mpsc channel was closed / dropped");
 
     Status::Ok
 }