From fca4872a73a2c1cb8ee125311e52cfeac5b18cb7 Mon Sep 17 00:00:00 2001
From: Julius de Jeu <julius@voidcorp.nl>
Date: Fri, 24 Jun 2022 22:43:08 +0200
Subject: [PATCH] Make any errors not crash the entire application

---
 src/main.rs | 73 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 790d9a6..c9087ce 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,8 @@ use serenity::{
     client::{Context, EventHandler},
     model::{
         channel::Reaction,
-        gateway::{Activity, Ready}, id::{ChannelId, MessageId},
+        gateway::{Activity, Ready},
+        id::{ChannelId, MessageId},
     },
     prelude::GatewayIntents,
     Client,
@@ -20,48 +21,50 @@ impl EventHandler for Handler {
     }
 
     async fn reaction_add(&self, c: Context, r: Reaction) {
-        let emoji = r.emoji.as_data();
-        if emoji == "📌" {
-            let msg = r.message(c.http.clone()).await.expect("Could not find message");
-            for r in &msg.reactions {
-                let emoji = r.reaction_type.as_data();
-                if emoji == "📌" {
-                    let count = r.count;
-                    if count >= 5 {
-                        msg.pin(c.http.clone()).await.expect("Could not pin message");
-                    }
-                }
-            }
+        if let Err(e) = handle_react(c, r).await {
+            println!("Error: {:?}", e);
         }
     }
 
     async fn reaction_remove(&self, c: Context, r: Reaction) {
-        let emoji = r.emoji.as_data();
-        if emoji == "📌" {
-            let msg = r.message(&c.http).await.expect("Could not find message");
-            for r in &msg.reactions {
-                let emoji = r.reaction_type.as_data();
-                if emoji == "📌" {
-                    let count = r.count;
-                    if count < 3 {
-                        msg.unpin(&c.http).await.expect("Could not unpin message");
-                    }
+        if let Err(e) = handle_react(c, r).await {
+            println!("Error: {:?}", e);
+        }
+    }
+
+    async fn reaction_remove_all(&self, c: Context, c_id: ChannelId, m_id: MessageId) {
+        let msg = match c.http.get_message(c_id.0, m_id.0).await {
+            Ok(m) => m,
+            Err(e) => {
+                println!("Error: {:?}", e);
+                return;
+            }
+        };
+        if msg.pinned {
+            if let Err(e) = msg.unpin(&c.http).await {
+                println!("Error: {:?}", e);
+            }
+        }
+    }
+}
+
+async fn handle_react(c: Context, r: Reaction) -> Result<(), serenity::Error> {
+    let emoji = r.emoji.as_data();
+    if emoji == "📌" {
+        let msg = r.message(c.http.clone()).await?;
+        for r in &msg.reactions {
+            let emoji = r.reaction_type.as_data();
+            if emoji == "📌" {
+                let count = r.count;
+                if count >= 5 {
+                    msg.pin(c.http.clone()).await?;
+                } else if count < 3 {
+                    msg.unpin(&c.http).await?;
                 }
             }
         }
     }
-
-    async fn reaction_remove_all(
-        &self,
-        c: Context,
-        c_id: ChannelId,
-        m_id: MessageId,
-    ) {
-        let msg = c.http.get_message(c_id.0, m_id.0).await.expect("Could not find message");
-        if msg.pinned {
-            msg.unpin(&c.http).await.expect("Could not unpin message");
-        }
-    }
+    Ok(())
 }
 
 #[tokio::main]