added grouping gap

Author: roobscoob

src/chat/src/message.rs

@@ -5,6 +5,7 @@ pub trait Message: Clone {
   fn get_content(&self) -> impl Element;
   fn get_identifier(&self) -> String;
   fn get_nonce(&self) -> Option<&String>;
+  fn should_group(&self, previous: &Self) -> bool;
 }
 
 pub trait MessageAuthor: PartialEq + Eq {

src/discord/src/channel/mod.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use scope_chat::channel::Channel;
+use serenity::all::Timestamp;
 use tokio::sync::broadcast;
 
 use crate::{
@@ -51,6 +52,7 @@ impl Channel for DiscordChannel {
       author: self.client.user().clone(),
       id: Snowflake { content: 0 },
       nonce: Some(nonce),
+      creation_time: Timestamp::now(),
     }
   }
 }

src/discord/src/client.rs

@@ -114,6 +114,7 @@ impl EventHandler for DiscordClient {
             Nonce::Number(n) => n.to_string(),
             Nonce::String(s) => s,
           }),
+          creation_time: msg.timestamp,
         });
       }
     }

src/discord/src/message/mod.rs

@@ -1,3 +1,5 @@
+use std::time::Instant;
+
 use author::DiscordMessageAuthor;
 use content::DiscordMessageContent;
 use gpui::{Element, IntoElement};
@@ -14,6 +16,7 @@ pub struct DiscordMessage {
   pub author: DiscordMessageAuthor,
   pub id: Snowflake,
   pub nonce: Option<String>,
+  pub creation_time: serenity::model::Timestamp,
 }
 
 impl Message for DiscordMessage {
@@ -32,4 +35,10 @@ impl Message for DiscordMessage {
   fn get_nonce(&self) -> Option<&String> {
     self.nonce.as_ref()
   }
+
+  fn should_group(&self, previous: &Self) -> bool {
+    const MAX_DISCORD_MESSAGE_GAP_SECS_FOR_GROUP: i64 = 5 * 60;
+
+    self.creation_time.signed_duration_since(&*previous.creation_time).num_seconds() <= MAX_DISCORD_MESSAGE_GAP_SECS_FOR_GROUP
+  }
 }

src/ui/src/channel/message.rs

@@ -49,6 +49,10 @@ impl<M: Message> MessageGroup<M> {
 
     self.contents.remove(index);
   }
+
+  pub fn last(&self) -> &M {
+    self.contents.last().unwrap()
+  }
 }
 
 pub fn message<M: Message>(message: MessageGroup<M>) -> impl IntoElement {

src/ui/src/channel/message_list.rs

@@ -37,7 +37,10 @@ impl<M: Message> MessageList<M> {
 
     let last = self.messages.last_mut();
 
-    if last.is_some() && last.as_ref().unwrap().get_author().get_id() == message.get_author().get_id() {
+    if last.is_some()
+      && last.as_ref().unwrap().get_author().get_id() == message.get_author().get_id()
+      && message.should_group(last.as_ref().unwrap().last())
+    {
       last.unwrap().add(message);
     } else {
       self.messages.push(MessageGroup::new(message));
@@ -47,7 +50,10 @@ impl<M: Message> MessageList<M> {
   pub fn add_pending_message(&mut self, pending_message: M) {
     let last = self.messages.last_mut();
 
-    if last.is_some() && last.as_ref().unwrap().get_author().get_id() == pending_message.get_author().get_id() {
+    if last.is_some()
+      && last.as_ref().unwrap().get_author().get_id() == pending_message.get_author().get_id()
+      && pending_message.should_group(last.as_ref().unwrap().last())
+    {
       last.unwrap().add(pending_message);
     } else {
       self.messages.push(MessageGroup::new(pending_message));