Finished nonce checking

Author: roobscoob

src/chat/src/message.rs

@@ -4,7 +4,7 @@ pub trait Message: Clone {
   fn get_author(&self) -> &impl MessageAuthor;
   fn get_content(&self) -> impl Element;
   fn get_identifier(&self) -> String;
-  fn get_nonce(&self) -> Option<String>;
+  fn get_nonce(&self) -> Option<&String>;
 }
 
 pub trait MessageAuthor {

src/discord/src/channel/mod.rs

@@ -52,10 +52,7 @@ impl Channel for DiscordChannel {
 
     DiscordMessage {
       content: DiscordMessageContent { content, is_pending: true },
-      author: DiscordMessageAuthor {
-        display_name: DisplayName("Pending".to_owned()),
-        icon: "".to_owned(),
-      },
+      author: self.client.user().clone(),
       id: Snowflake { content: 0 },
       nonce: Some(nonce),
     }

src/discord/src/client.rs

@@ -26,6 +26,7 @@ use crate::{
 pub struct DiscordClient {
   channel_message_event_handlers: RwLock<HashMap<Snowflake, Vec<broadcast::Sender<DiscordMessage>>>>,
   client: OnceLock<serenity::Client>,
+  user: OnceLock<DiscordMessageAuthor>,
 }
 
 impl DiscordClient {
@@ -51,6 +52,10 @@ impl DiscordClient {
     self.client.get().unwrap()
   }
 
+  pub fn user(&self) -> &DiscordMessageAuthor {
+    self.user.get().unwrap()
+  }
+
   pub async fn add_channel_message_sender(&self, channel: Snowflake, sender: broadcast::Sender<DiscordMessage>) {
     self.channel_message_event_handlers.write().await.entry(channel).or_default().push(sender);
   }
@@ -72,7 +77,18 @@ struct RawClient(Arc<DiscordClient>);
 impl RawEventHandler for RawClient {
   async fn raw_event(&self, ctx: Context, ev: serenity::model::prelude::Event) {
     if let Event::Unknown(unk) = ev {
-      // writeln!(&mut File::create(unk.kind).unwrap(), "{:#?}", unk.value);
+      if unk.kind == "READY" {
+        let user = unk.value.as_object().unwrap().get("user").unwrap().as_object().unwrap();
+
+        self.0.user.get_or_init(|| DiscordMessageAuthor {
+          display_name: DisplayName(user.get("username").unwrap().as_str().unwrap().to_owned()),
+          icon: format!(
+            "https://cdn.discordapp.com/avatars/{}/{}",
+            user.get("id").unwrap().as_str().unwrap(),
+            user.get("avatar").unwrap().as_str().unwrap()
+          ),
+        });
+      }
     }
   }
 }

src/discord/src/message/content.rs

@@ -8,6 +8,6 @@ pub struct DiscordMessageContent {
 
 impl RenderOnce for DiscordMessageContent {
   fn render(self, _: &mut WindowContext) -> impl IntoElement {
-    div().opacity(if self.is_pending { 0.5 } else { 1.0 }).child(self.content.clone())
+    div().opacity(if self.is_pending { 0.25 } else { 1.0 }).child(self.content.clone())
   }
 }

src/discord/src/message/mod.rs

@@ -29,7 +29,7 @@ impl Message for DiscordMessage {
     self.id.to_string()
   }
 
-  fn get_nonce(&self) -> Option<String> {
-    self.nonce.clone()
+  fn get_nonce(&self) -> Option<&String> {
+    self.nonce.as_ref()
   }
 }

src/ui/src/channel/message_list.rs

@@ -19,6 +19,15 @@ impl<M: Message> MessageList<M> {
   }
 
   pub fn add_external_message(&mut self, message: M) {
+    if let Some((_, pending_index)) = self
+      .pending_messages
+      .iter()
+      .zip(0..)
+      .find(|(msg, _)| msg.get_nonce().map(|v1| message.get_nonce().map(|v2| v2 == v1).unwrap_or(false)).unwrap_or(false))
+    {
+      self.pending_messages.remove(pending_index);
+    }
+
     self.real_messages.push(message);
   }
 
@@ -31,10 +40,10 @@ impl<M: Message> MessageList<M> {
   }
 
   pub fn get(&self, index: usize) -> Option<&M> {
-    if index >= self.pending_messages.len() {
-      self.real_messages.get(index - self.pending_messages.len())
+    if index >= self.real_messages.len() {
+      self.pending_messages.get(index - self.real_messages.len())
     } else {
-      self.pending_messages.get(index)
+      self.real_messages.get(index)
     }
   }
 

src/ui/src/channel/mod.rs

@@ -75,6 +75,8 @@ impl<M: Message + 'static> ChannelView<M> {
             channel_view.list_model.update(ctx, move |v, _| {
               v.add_pending_message(pending);
             });
+            channel_view.list_state = channel_view.list_model.read(ctx).create_list_state();
+            ctx.notify();
           }
           _ => {}
         })