feat: update GPUI and refactor to make it happen

Author: Bloeckchengrafik

Cargo.lock

@@ -1,7 +1,7 @@
 use std::fmt::Debug;
 
 use chrono::{DateTime, Utc};
-use gpui::{IntoElement, Render, View, WindowContext};
+use gpui::{IntoElement, Render, Entity, App};
 
 use crate::async_list::AsyncListItem;
 use crate::reaction::ReactionList;
@@ -12,12 +12,12 @@ pub trait Message: Clone + AsyncListItem + Send {
   type Content: Render;
 
   fn get_author(&self) -> Self::Author;
-  fn get_content(&self, cx: &mut WindowContext) -> View<Self::Content>;
+  fn get_content(&self, cx: &mut App) -> Entity<Self::Content>;
   fn get_identifier(&self) -> Option<<Self as Message>::Identifier>;
   fn get_nonce(&self) -> impl PartialEq;
   fn should_group(&self, previous: &Self) -> bool;
   fn get_timestamp(&self) -> Option<DateTime<Utc>>;
-  fn get_reactions(&mut self) -> &mut impl ReactionList;
+  fn get_reactions(&mut self) -> Option<&mut impl ReactionList>;
 }
 
 #[derive(Debug, Clone, Copy)]

src/chat/src/message.rs

@@ -12,7 +12,7 @@ pub enum MessageReactionType {
 #[derive(Clone, PartialEq)]
 pub enum ReactionEmoji {
   Simple(String),
-  Custom { url: String, animated: bool, name: Option<String> },
+  Custom { url: String, animated: bool, name: Option<String>, id: u64 },
 }
 
 impl Debug for ReactionEmoji {
@@ -25,6 +25,7 @@ impl Debug for ReactionEmoji {
 }
 
 pub trait MessageReaction: IntoElement {
+
   fn get_count(&self, kind: Option<MessageReactionType>) -> u64;
   fn get_self_reaction(&self) -> Option<MessageReactionType>;
   fn get_emoji(&self) -> ReactionEmoji;

src/chat/src/reaction.rs

@@ -75,7 +75,6 @@ impl Channel for DiscordChannel {
         content,
         sent_time: Utc::now(),
         list_item_id: Snowflake::random(),
-        reactions: Default::default(),
       },
       content: OnceLock::new(),
     }

src/discord/src/channel/mod.rs

@@ -6,8 +6,8 @@ use std::{
 use crate::message::reaction::discord_reaction_to_emoji;
 use atomic_refcell::AtomicRefCell;
 use dashmap::DashMap;
-use scope_chat::reaction::{MessageReactionType, ReactionEvent, ReactionOperation};
-use serenity::all::Reaction;
+use scope_chat::reaction::{MessageReactionType, ReactionEmoji, ReactionEvent, ReactionOperation};
+use serenity::all::{EmojiId, Reaction, ReactionType};
 use serenity::{
   all::{
     Cache, CacheHttp, ChannelId, Context, CreateMessage, EventHandler, GatewayIntents, GetMessages, GuildId, Http, Member, Message, MessageId,
@@ -146,6 +146,19 @@ impl DiscordClient {
       }
     }
   }
+
+  pub async fn add_reaction(&self, channel_id: ChannelId, message_id: MessageId, emoji: ReactionEmoji) {
+    let reaction_type = match emoji {
+      ReactionEmoji::Simple(c) => ReactionType::Unicode(c),
+      ReactionEmoji::Custom { name, animated, id, .. } => ReactionType::Custom {
+        id: EmojiId::new(id),
+        animated,
+        name,
+      },
+    };
+
+    channel_id.create_reaction(self.discord().http.clone(), message_id, reaction_type).await.unwrap();
+  }
 }
 
 #[async_trait]

src/discord/src/client.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui::{div, img, IntoElement, ParentElement, RenderOnce, SharedString, Styled, WindowContext};
+use gpui::{div, img, App, IntoElement, ParentElement, RenderOnce, SharedString, Styled, Window};
 use scope_chat::message::{IconRenderConfig, MessageAuthor};
 use url::Url;
 
@@ -72,7 +72,7 @@ impl MessageAuthor for DiscordMessageAuthor {
 pub struct DisplayName(pub SharedString);
 
 impl RenderOnce for DisplayName {
-  fn render(self, _: &mut WindowContext) -> impl IntoElement {
+  fn render(self, _: &mut Window, _: &mut App) -> impl IntoElement {
     div().text_sm().child(self.0)
   }
 }
@@ -81,7 +81,7 @@ impl RenderOnce for DisplayName {
 pub struct DisplayIcon(pub String, pub IconRenderConfig);
 
 impl RenderOnce for DisplayIcon {
-  fn render(self, _: &mut WindowContext) -> impl IntoElement {
+  fn render(self, _: &mut Window, _: &mut App) -> impl IntoElement {
     let mut url = Url::parse(&self.0).unwrap();
     let mut query_params = querystring::querify(url.query().unwrap_or(""));
 

src/discord/src/message/author.rs

@@ -1,37 +1,38 @@
 use crate::message::reaction_list::DiscordReactionList;
-use gpui::{div, IntoElement, ParentElement, Render, Styled, ViewContext};
+use gpui::prelude::FluentBuilder;
+use gpui::{div, Context, IntoElement, ParentElement, Render, Styled, Window};
 use serenity::all::Message;
 
 #[derive(Clone, Debug)]
 pub struct DiscordMessageContent {
   pub content: String,
   pub is_pending: bool,
-  pub reactions: DiscordReactionList,
+  pub reactions: Option<DiscordReactionList>,
 }
 
 impl DiscordMessageContent {
   pub fn pending(content: String) -> DiscordMessageContent {
     DiscordMessageContent {
       content,
       is_pending: true,
-      reactions: Default::default(),
+      reactions: None,
     }
   }
 
   pub fn received(message: &Message, reactions: &DiscordReactionList) -> DiscordMessageContent {
     DiscordMessageContent {
       content: message.content.clone(),
       is_pending: false,
-      reactions: reactions.clone(),
+      reactions: Some(reactions.clone()),
     }
   }
 }
 
 impl Render for DiscordMessageContent {
-  fn render(&mut self, _: &mut ViewContext<DiscordMessageContent>) -> impl IntoElement {
+  fn render(&mut self, _: &mut Window, _: &mut Context<DiscordMessageContent>) -> impl IntoElement {
     div()
-        .opacity(if self.is_pending { 0.25 } else { 1.0 })
-        .child(self.content.clone())
-        .child(self.reactions.clone())
+      .opacity(if self.is_pending { 0.25 } else { 1.0 })
+      .child(self.content.clone())
+      .when_some(self.reactions.clone(), |d, reactions| d.child(reactions))
   }
 }

src/discord/src/message/content.rs

@@ -4,7 +4,7 @@ use crate::message::reaction_list::DiscordReactionList;
 use author::DiscordMessageAuthor;
 use chrono::{DateTime, Utc};
 use content::DiscordMessageContent;
-use gpui::{View, VisualContext, WindowContext};
+use gpui::{App, AppContext, Entity};
 use scope_chat::reaction::ReactionList;
 use scope_chat::{async_list::AsyncListItem, message::Message};
 use serenity::all::{ModelError, Nonce};
@@ -23,7 +23,6 @@ pub enum DiscordMessageData {
     content: String,
     sent_time: DateTime<Utc>,
     list_item_id: Snowflake,
-    reactions: DiscordReactionList
   },
   Received(Arc<serenity::model::channel::Message>, Option<Arc<serenity::model::guild::Member>>, DiscordReactionList),
 }
@@ -33,7 +32,7 @@ pub struct DiscordMessage {
   pub client: Arc<DiscordClient>,
   pub channel: Arc<serenity::model::channel::Channel>,
   pub data: DiscordMessageData,
-  pub content: OnceLock<View<DiscordMessageContent>>,
+  pub content: OnceLock<Entity<DiscordMessageContent>>,
 }
 
 impl DiscordMessage {
@@ -46,7 +45,7 @@ impl DiscordMessage {
     }
     .unwrap();
 
-    let reactions = (&msg.reactions).into();
+    let reactions = DiscordReactionList::new_serenity(msg.reactions.clone(), channel.id(), msg.id.clone(), client.clone());
 
     Self {
       client,
@@ -62,7 +61,7 @@ impl DiscordMessage {
     channel: Arc<serenity::model::channel::Channel>,
     member: Option<Arc<serenity::model::guild::Member>>,
   ) -> Self {
-    let reactions = (&msg.reactions).into();
+    let reactions = DiscordReactionList::new_serenity(msg.reactions.clone(), channel.id(), msg.id.clone(), client.clone());
     Self {
       client,
       channel,
@@ -130,7 +129,7 @@ impl Message for DiscordMessage {
   }
 
   // TODO: want reviewer discussion. I'm really stretching the abilities of gpui here and im not sure if this is the right way to do this.
-  fn get_content(&self, cx: &mut WindowContext) -> View<Self::Content> {
+  fn get_content(&self, cx: &mut App) -> Entity<Self::Content> {
     self
       .content
       .get_or_init(|| {
@@ -139,7 +138,7 @@ impl Message for DiscordMessage {
           DiscordMessageData::Received(message, _, reactions) => DiscordMessageContent::received(message, reactions),
         };
 
-        cx.new_view(|_cx| content)
+        cx.new(|_| content)
       })
       .clone()
   }
@@ -174,10 +173,10 @@ impl Message for DiscordMessage {
     }
   }
 
-  fn get_reactions(&mut self) -> &mut impl ReactionList {
+  fn get_reactions(&mut self) -> Option<&mut impl ReactionList> {
     match &mut self.data {
-      DiscordMessageData::Pending { reactions, .. } => reactions,
-      DiscordMessageData::Received(_, _, reactions) => reactions,
+      DiscordMessageData::Pending { .. } => None,
+      DiscordMessageData::Received(_, _, reactions) => Some(reactions),
     }
   }
 }

src/discord/src/message/mod.rs

@@ -1,9 +1,10 @@
 use components::theme::ActiveTheme;
-use gpui::{div, img, px, AnyElement, InteractiveElement, IntoElement, ParentElement, RenderOnce, Rgba, StatefulInteractiveElement, Styled, WindowContext};
 use gpui::prelude::FluentBuilder;
+use gpui::{div, img, px, AnyElement, App, IntoElement, ParentElement, RenderOnce, Rgba, Styled};
 use scope_chat::reaction::MessageReactionType::Normal;
 use scope_chat::reaction::{MessageReaction, MessageReactionType, ReactionEmoji};
 use serenity::all::ReactionType;
+use std::fmt::Debug;
 use MessageReactionType::Burst;
 
 #[derive(Clone, Debug)]
@@ -46,7 +47,7 @@ impl DiscordMessageReaction {
     }
   }
 
-  fn use_local(&mut self) {
+  fn swap_to_local(&mut self) {
     let (count_normal, count_burst) = match &self.data {
       ReactionData::Message(reaction) => (reaction.count_details.normal, reaction.count_details.burst),
       ReactionData::Local {
@@ -64,6 +65,12 @@ impl DiscordMessageReaction {
       burst_colours,
     }
   }
+  fn render_emoji(emoji: &ReactionEmoji) -> AnyElement {
+    match emoji {
+      ReactionEmoji::Simple(character) => div().text_size(px(12f32)).child(character.clone()).into_any_element(),
+      ReactionEmoji::Custom { url, .. } => img(url.clone()).w(px(16f32)).h(px(16f32)).into_any_element(),
+    }
+  }
 }
 
 impl MessageReaction for DiscordMessageReaction {
@@ -114,7 +121,7 @@ impl MessageReaction for DiscordMessageReaction {
   }
 
   fn increment(&mut self, kind: MessageReactionType, user_is_self: bool, by: isize) {
-    self.use_local();
+    self.swap_to_local();
     match kind {
       Burst => {
         if let ReactionData::Local { count_burst, .. } = &mut self.data {
@@ -140,47 +147,34 @@ impl MessageReaction for DiscordMessageReaction {
   }
 }
 
-impl DiscordMessageReaction {
-  fn render_emoji(emoji: &ReactionEmoji) -> AnyElement {
-    match emoji {
-      ReactionEmoji::Simple(character) => div().text_size(px(12f32)).child(character.clone()).into_any_element(),
-      ReactionEmoji::Custom { url, .. } => img(url.clone()).w(px(16f32)).h(px(16f32)).into_any_element(),
-    }
-  }
-}
-
 impl RenderOnce for DiscordMessageReaction {
-  fn render(self, cx: &mut WindowContext) -> impl IntoElement {
+  fn render(self, _: &mut gpui::Window, cx: &mut App) -> impl IntoElement {
     let emoji = self.get_emoji();
-    let async_emoji = emoji.clone();
     let theme = cx.theme();
     div()
-        .px_1()
-        .py_px()
-        .border_1()
-        .border_color(theme.border)
-        .when(self.get_self_reaction().is_some(), |s| s.border_color(theme.accent))
-        .bg(theme.panel)
-        .rounded_md()
-        .flex()
-        .id("reaction")
-        .on_click(move |_, _| {
-          eprintln!("Reaction {:?} clicked", async_emoji);
-        })
-        .justify_center()
-        .items_center()
-        .gap_1()
-        .child(Self::render_emoji(&emoji))
-        .child(self.get_count(None).to_string())
+      .px_1()
+      .py_px()
+      .border_1()
+      .border_color(theme.border)
+      .when(self.get_self_reaction().is_some(), |s| s.border_color(theme.accent))
+      .bg(theme.panel)
+      .rounded_md()
+      .flex()
+      .justify_center()
+      .items_center()
+      .gap_1()
+      .child(Self::render_emoji(&emoji))
+      .child(self.get_count(None).to_string())
   }
 }
 
-pub fn discord_reaction_to_emoji(reaction: &serenity::all::ReactionType) -> ReactionEmoji {
+pub fn discord_reaction_to_emoji(reaction: &ReactionType) -> ReactionEmoji {
   match reaction {
     ReactionType::Custom { animated, id, name } => ReactionEmoji::Custom {
       url: format!("https://cdn.discordapp.com/emojis/{}.png", id),
       animated: *animated,
       name: name.clone(),
+      id: id.get(),
     },
     ReactionType::Unicode(character) => ReactionEmoji::Simple(character.clone()),
     ty => {