Add reactions support for sections / projects

haecker-felix · Jun 25, 2021 · 7cc1832 · 7cc1832
1 parent b30aa2c
commit 7cc1832
Show file tree

Hide file tree

Showing 4 changed files with 274 additions and 66 deletions.
diff --git a/src/bot.rs b/src/bot.rs
@@ -239,34 +239,89 @@ impl EventCallback {
 
         let message_event_id = message_event_id.to_string();
         let reaction_event_id = reaction_event_id.to_string();
-
+        let reaction_emoji = reaction_emoji.chars().collect::<Vec<char>>()[0];
         let approval_emoji = &self.0.config.approval_emoji;
 
         // Approval emoji
-        if reaction_emoji == approval_emoji.to_string() {
-            let msg = {
-                let mut news_store = self.0.news_store.lock().unwrap();
-                match news_store.approve_news(&message_event_id, &reaction_event_id) {
-                    Ok(news) => format!(
-                        "Editor {} approved {}'s news entry (ID {})",
-                        reaction_sender.user_id().to_string(),
-                        news.reporter_id,
-                        message_event_id
-                    ),
-                    Err(err) => format!(
-                        "Unable to add {}'s news approval (ID {}): {:?}",
-                        reaction_sender.user_id().to_string(),
-                        message_event_id,
-                        err
-                    ),
-                }
+        let message = if &reaction_emoji == approval_emoji {
+            let mut news_store = self.0.news_store.lock().unwrap();
+            let msg = match news_store.add_news_approval(
+                &message_event_id,
+                &reaction_event_id,
+                reaction_emoji,
+            ) {
+                Ok(news) => format!(
+                    "Editor {} approved {}'s news entry.",
+                    reaction_sender.user_id().to_string(),
+                    news.reporter_id
+                ),
+                Err(err) => format!(
+                    "Unable to add {}'s news approval: {:?}\n(ID {})",
+                    reaction_sender.user_id().to_string(),
+                    err,
+                    message_event_id
+                ),
+            };
+            Some(msg)
+
+        // Section emoji
+        } else if let Some(section) = &self.0.config.section_by_emoji(&reaction_emoji) {
+            let mut news_store = self.0.news_store.lock().unwrap();
+            let msg = match news_store.add_news_section(
+                &message_event_id,
+                &reaction_event_id,
+                reaction_emoji,
+            ) {
+                Ok(news) => format!(
+                    "Editor {} added {}'s news entry to the \"{}\" section.",
+                    reaction_sender.user_id().to_string(),
+                    news.reporter_id,
+                    section.title
+                ),
+                Err(err) => format!(
+                    "Unable to add {}'s news entry to the {} section: {:?}\n(ID {})",
+                    reaction_sender.user_id().to_string(),
+                    section.title,
+                    err,
+                    message_event_id
+                ),
+            };
+            Some(msg)
+
+        // Project emoji
+        } else if let Some(project) = &self.0.config.project_by_emoji(&reaction_emoji) {
+            let mut news_store = self.0.news_store.lock().unwrap();
+            let msg = match news_store.add_news_project(
+                &message_event_id,
+                &reaction_event_id,
+                reaction_emoji,
+            ) {
+                Ok(news) => format!(
+                    "Editor {} added the project description \"{}\" to {}'s news entry.",
+                    reaction_sender.user_id().to_string(),
+                    project.title,
+                    news.reporter_id
+                ),
+                Err(err) => format!(
+                    "Unable to add project description \"{}\"  to {}'s news entry: {:?}\n(ID {})",
+                    project.title,
+                    reaction_sender.user_id().to_string(),
+                    err,
+                    message_event_id
+                ),
             };
-            self.0.send_message(&msg, false, true).await;
+            Some(msg)
         } else {
             debug!(
                 "Ignore emoji reaction, doesn't match any known emoji ({:?})",
                 reaction_emoji
             );
+            None
+        };
+
+        // Send confirm message to admin room
+        if let Some(message) = message {
+            self.0.send_message(&message, false, true).await;
         }
     }
 
@@ -279,30 +334,51 @@ impl EventCallback {
             return;
         }
 
-        let msg = {
+        let message = {
             let mut news_store = self.0.news_store.lock().unwrap();
+            let redacted_event_id = redacted_event_id.to_string();
 
-            // Try to unapprove a message
-            if let Ok(news) = news_store.unapprove_news(&redacted_event_id.to_string()) {
+            // News approval
+            if let Ok(news) = news_store.remove_news_approval(&redacted_event_id) {
                 let mut msg = format!(
-                    "Editor {} removed their approval from {}'s news entry (ID {}).",
+                    "Editor {} removed their approval from {}'s news entry.",
                     member.user_id().to_string(),
-                    news.reporter_id,
-                    news.event_id
+                    news.reporter_id
                 );
 
                 if news.approvals.is_empty() {
                     msg += " This news entry doesn't have an approval anymore."
                 }
 
                 Some(msg)
+
+            // News section
+            } else if let Ok(news) = news_store.remove_news_section(&redacted_event_id) {
+                Some(format!(
+                    "Editor {} removed a section from {}'s news entry.",
+                    member.user_id().to_string(),
+                    news.reporter_id
+                ))
+
+            // News project
+            } else if let Ok(news) = news_store.remove_news_project(&redacted_event_id) {
+                Some(format!(
+                    "Editor {} removed a project from {}'s news entry.",
+                    member.user_id().to_string(),
+                    news.reporter_id
+                ))
             } else {
+                debug!(
+                    "Ignore redaction, doesn't match any known emoji reaction event id (ID {:?})",
+                    redacted_event_id
+                );
                 None
             }
         };
 
-        if let Some(msg) = msg {
-            self.0.send_message(&msg, false, true).await;
+        // Send confirm message to admin room
+        if let Some(message) = message {
+            self.0.send_message(&message, false, true).await;
         }
     }
 

diff --git a/src/config.rs b/src/config.rs
@@ -1,9 +1,25 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use std::env;
 use std::fs::File;
 use std::io::Read;
 
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct Section {
+    pub title: String,
+    pub emoji: char,
+    pub order: u32,
+}
+
+#[derive(Serialize, Deserialize, Clone, Debug)]
+pub struct Project {
+    pub title: String,
+    pub description: String,
+    pub repository: String,
+    pub emoji: char,
+    pub order: u32,
+}
+
 #[derive(Deserialize, Clone, Debug)]
 pub struct Config {
     pub bot_user_id: String,
@@ -12,6 +28,8 @@ pub struct Config {
     pub admin_room_id: String,
     pub approval_emoji: char,
     pub editors: Vec<String>,
+    pub sections: Vec<Section>,
+    pub projects: Vec<Project>,
 }
 
 impl Config {
@@ -28,4 +46,22 @@ impl Config {
 
         serde_json::from_str(&data).expect("Unable to parse configuration file")
     }
+
+    pub fn section_by_emoji(&self, emoji: &char) -> Option<Section> {
+        for section in &self.sections {
+            if &section.emoji == emoji {
+                return Some(section.clone());
+            }
+        }
+        None
+    }
+
+    pub fn project_by_emoji(&self, emoji: &char) -> Option<Project> {
+        for project in &self.projects {
+            if &project.emoji == emoji {
+                return Some(project.clone());
+            }
+        }
+        None
+    }
 }
diff --git a/src/error.rs b/src/error.rs
@@ -1,5 +1,5 @@
 #[derive(Debug)]
 pub enum Error {
     NewsEventIdNotFound,
-    ApprovalReactionIdNotFound,
+    RedactionEventIdNotFound,
 }