refactor: move out reaction list to own file

Author: Bloeckchengrafik

src/discord/src/message/mod.rs

@@ -1,4 +1,4 @@
-use crate::message::reaction::DiscordReactionList;
+use crate::message::reaction_list::DiscordReactionList;
 use crate::snowflake::Snowflake;
 use author::{DiscordMessageAuthor, DisplayName};
 use chrono::{DateTime, Utc};
@@ -12,6 +12,7 @@ use serenity::all::Nonce;
 pub mod author;
 pub mod content;
 pub mod reaction;
+pub mod reaction_list;
 
 #[derive(Clone, Debug)]
 pub struct DiscordMessage {

src/discord/src/message/reaction.rs

@@ -1,5 +1,5 @@
 use gpui::Rgba;
-use scope_chat::reaction::{MessageReaction, MessageReactionType, ReactionEmoji, ReactionList, ReactionOperation};
+use scope_chat::reaction::{MessageReaction, MessageReactionType, ReactionEmoji};
 use serenity::all::ReactionType;
 use MessageReactionType::Burst;
 use scope_chat::reaction::MessageReactionType::Normal;
@@ -138,72 +138,6 @@ impl MessageReaction for DiscordMessageReaction {
   }
 }
 
-#[derive(Clone, Debug, Default)]
-pub struct DiscordReactionList {
-  reactions: Vec<DiscordMessageReaction>,
-}
-
-impl DiscordReactionList {
-  pub fn new(reactions: Vec<DiscordMessageReaction>) -> Self {
-    DiscordReactionList { reactions }
-  }
-}
-
-impl ReactionList for DiscordReactionList {
-  fn get_reactions(&self) -> &Vec<impl MessageReaction> {
-    &self.reactions
-  }
-
-  fn get_reaction(&self, emoji: &ReactionEmoji) -> Option<&impl MessageReaction> {
-    self.reactions.iter().find(|reaction| reaction.get_emoji() == *emoji)
-  }
-
-  fn increment(&mut self, emoji: &ReactionEmoji, kind: MessageReactionType, user_is_self: bool, by: isize) {
-    if let Some(reaction) = self.reactions.iter_mut().find(|reaction| reaction.get_emoji() == *emoji) {
-      reaction.increment(kind, user_is_self, by);
-      if reaction.get_count(None) == 0 {
-        self.reactions.retain(|reaction| reaction.get_emoji() != *emoji);
-      }
-    } else if by > 0 {
-      let mut reaction = DiscordMessageReaction {
-        data: ReactionData::Local {
-          count_normal: 0,
-          count_burst: 0,
-          me: None,
-          emoji: emoji.clone(),
-          burst_colours: vec![],
-        },
-      };
-
-      reaction.increment(kind, user_is_self, by);
-      self.reactions.push(reaction);
-    }
-  }
-
-  fn apply(&mut self, operation: ReactionOperation) {
-    match operation {
-      ReactionOperation::Add(emoji, ty) => {
-        self.increment(&emoji, ty, false, 1);
-      }
-      ReactionOperation::AddSelf(emoji, ty) => {
-        self.increment(&emoji, ty, true, 1);
-      }
-      ReactionOperation::Remove(emoji) => {
-        self.increment(&emoji, Normal, false, -1);
-      }
-      ReactionOperation::RemoveSelf(emoji) => {
-        self.increment(&emoji, Normal, true, -1);
-      }
-      ReactionOperation::RemoveAll => {
-        self.reactions.clear();
-      }
-      ReactionOperation::RemoveEmoji(emoji) => {
-        self.reactions.retain(|reaction| reaction.get_emoji() != emoji);
-      }
-    }
-  }
-}
-
 pub fn discord_reaction_to_emoji(reaction: &serenity::all::ReactionType) -> ReactionEmoji {
   match reaction {
     ReactionType::Custom { animated, id, name } => ReactionEmoji::Custom {

src/discord/src/message/reaction_list.rs

@@ -0,0 +1,69 @@
+use crate::message::reaction::{DiscordMessageReaction, ReactionData};
+use scope_chat::reaction::MessageReactionType::Normal;
+use scope_chat::reaction::{MessageReaction, MessageReactionType, ReactionEmoji, ReactionList, ReactionOperation};
+
+#[derive(Clone, Debug, Default)]
+pub struct DiscordReactionList {
+  reactions: Vec<DiscordMessageReaction>,
+}
+
+impl DiscordReactionList {
+  pub fn new(reactions: Vec<DiscordMessageReaction>) -> Self {
+    DiscordReactionList { reactions }
+  }
+}
+
+impl ReactionList for DiscordReactionList {
+  fn get_reactions(&self) -> &Vec<impl MessageReaction> {
+    &self.reactions
+  }
+
+  fn get_reaction(&self, emoji: &ReactionEmoji) -> Option<&impl MessageReaction> {
+    self.reactions.iter().find(|reaction| reaction.get_emoji() == *emoji)
+  }
+
+  fn increment(&mut self, emoji: &ReactionEmoji, kind: MessageReactionType, user_is_self: bool, by: isize) {
+    if let Some(reaction) = self.reactions.iter_mut().find(|reaction| reaction.get_emoji() == *emoji) {
+      reaction.increment(kind, user_is_self, by);
+      if reaction.get_count(None) == 0 {
+        self.reactions.retain(|reaction| reaction.get_emoji() != *emoji);
+      }
+    } else if by > 0 {
+      let mut reaction = DiscordMessageReaction {
+        data: ReactionData::Local {
+          count_normal: 0,
+          count_burst: 0,
+          me: None,
+          emoji: emoji.clone(),
+          burst_colours: vec![],
+        },
+      };
+
+      reaction.increment(kind, user_is_self, by);
+      self.reactions.push(reaction);
+    }
+  }
+
+  fn apply(&mut self, operation: ReactionOperation) {
+    match operation {
+      ReactionOperation::Add(emoji, ty) => {
+        self.increment(&emoji, ty, false, 1);
+      }
+      ReactionOperation::AddSelf(emoji, ty) => {
+        self.increment(&emoji, ty, true, 1);
+      }
+      ReactionOperation::Remove(emoji) => {
+        self.increment(&emoji, Normal, false, -1);
+      }
+      ReactionOperation::RemoveSelf(emoji) => {
+        self.increment(&emoji, Normal, true, -1);
+      }
+      ReactionOperation::RemoveAll => {
+        self.reactions.clear();
+      }
+      ReactionOperation::RemoveEmoji(emoji) => {
+        self.reactions.retain(|reaction| reaction.get_emoji() != emoji);
+      }
+    }
+  }
+}