From 1f87c0f913ce3e08e0628d3b1f3edde2a8995b4d Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Wed, 2 Nov 2022 18:57:08 -0500
Subject: [PATCH] Make telegram actually work

---
 Cargo.lock      |  2 +-
 Cargo.toml      |  2 +-
 src/telegram.rs | 48 ++++++++++++++++++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93208f3..ae5b534 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
 
 [[package]]
 name = "ap-relay"
-version = "0.3.30"
+version = "0.3.31"
 dependencies = [
  "activitystreams",
  "activitystreams-ext",
diff --git a/Cargo.toml b/Cargo.toml
index 539b4a6..114b9a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ap-relay"
 description = "A simple activitypub relay"
-version = "0.3.30"
+version = "0.3.31"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
diff --git a/src/telegram.rs b/src/telegram.rs
index a57742c..9e52184 100644
--- a/src/telegram.rs
+++ b/src/telegram.rs
@@ -1,13 +1,22 @@
 use crate::db::Db;
 use std::sync::Arc;
-use teloxide::{prelude::*, utils::command::BotCommands};
+use teloxide::{
+    dispatching::{Dispatcher, UpdateFilterExt},
+    requests::{Requester, ResponseResult},
+    types::{Message, Update},
+    utils::command::BotCommands,
+    Bot,
+};
 
-#[derive(BotCommands, Clone)]
+#[derive(BotCommands, Clone, Debug)]
 #[command(
     rename_rule = "lowercase",
     description = "These commands are for administering AodeRelay"
 )]
 enum Command {
+    #[command(description = "Display this text.")]
+    Start,
+
     #[command(description = "Display this text.")]
     Help,
 
@@ -29,19 +38,29 @@ pub(crate) fn start(admin_handle: String, db: Db, token: &str) {
     let admin_handle = Arc::new(admin_handle);
 
     actix_rt::spawn(async move {
-        teloxide::repl(bot, move |bot: Bot, msg: Message, cmd: Command| {
-            let admin_handle = admin_handle.clone();
-            let db = db.clone();
+        let command_handler = teloxide::filter_command::<Command, _>().endpoint(
+            move |bot: Bot, msg: Message, cmd: Command| {
+                let admin_handle = admin_handle.clone();
+                let db = db.clone();
 
-            async move {
-                if !is_admin(&admin_handle, &msg) {
-                    return Ok(());
+                async move {
+                    if !is_admin(&admin_handle, &msg) {
+                        bot.send_message(msg.chat.id, "You are not authorized")
+                            .await?;
+                        return Ok(());
+                    }
+
+                    answer(bot, msg, cmd, db).await
                 }
+            },
+        );
 
-                answer(bot, msg, cmd, db).await
-            }
-        })
-        .await;
+        let message_handler = Update::filter_message().branch(command_handler);
+
+        Dispatcher::builder(bot, message_handler)
+            .build()
+            .dispatch()
+            .await;
     });
 }
 
@@ -53,9 +72,10 @@ fn is_admin(admin_handle: &str, message: &Message) -> bool {
         .unwrap_or(false)
 }
 
+#[tracing::instrument(skip(bot, msg, db))]
 async fn answer(bot: Bot, msg: Message, cmd: Command, db: Db) -> ResponseResult<()> {
     match cmd {
-        Command::Help => {
+        Command::Help | Command::Start => {
             bot.send_message(msg.chat.id, Command::descriptions().to_string())
                 .await?;
         }
@@ -79,7 +99,7 @@ async fn answer(bot: Bot, msg: Message, cmd: Command, db: Db) -> ResponseResult<
         }
         Command::Disallow { domain } => {
             if db.remove_allows(vec![domain.clone()]).await.is_ok() {
-                bot.send_message(msg.chat.id, format!("{} has been disallwoed", domain))
+                bot.send_message(msg.chat.id, format!("{} has been disallowed", domain))
                     .await?;
             }
         }