tmp: switch workstations

Author: Bloeckchengrafik

src/chat/src/reaction.rs

@@ -1,7 +1,7 @@
+use atomic_refcell::AtomicRefCell;
+use gpui::{App, IntoElement, Render, Rgba};
 use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
-use atomic_refcell::AtomicRefCell;
-use gpui::{App, IntoElement, Rgba};
 
 pub type ReactionEvent<T> = (T, ReactionOperation);
 
@@ -14,7 +14,12 @@ pub enum MessageReactionType {
 #[derive(Clone, PartialEq)]
 pub enum ReactionEmoji {
   Simple(String),
-  Custom { url: String, animated: bool, name: Option<String>, id: u64 },
+  Custom {
+    url: String,
+    animated: bool,
+    name: Option<String>,
+    id: u64,
+  },
 }
 
 impl Debug for ReactionEmoji {
@@ -27,7 +32,6 @@ 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;
@@ -43,6 +47,7 @@ pub enum ReactionOperation {
   RemoveSelf(ReactionEmoji),
   RemoveAll,
   RemoveEmoji(ReactionEmoji),
+  SetMembers(ReactionEmoji, Vec<String>),
 }
 
 pub trait ReactionList {

src/discord/src/client.rs

@@ -157,6 +157,14 @@ impl DiscordClient {
     }
   }
 
+  pub async fn load_users_reacting_to(&self, channel_id: ChannelId, message_id: MessageId, emoji: ReactionEmoji) {
+    let reactions = channel_id.reaction_users(self.discord().http.clone(), message_id, Self::emoji_to_serenity(&emoji), Some(5), None).await;
+    if reactions.is_err() {return;}
+    let reactions = reactions.unwrap().iter().map(|user|user.name.clone()).collect();
+
+    self.send_reaction_operation(channel_id, message_id, ReactionOperation::SetMembers(emoji, reactions)).await;
+  }
+
   pub async fn add_reaction(&self, channel_id: ChannelId, message_id: MessageId, emoji: ReactionEmoji) {
     let reaction_type = Self::emoji_to_serenity(&emoji);
     channel_id.create_reaction(self.discord().http.clone(), message_id, reaction_type).await.unwrap();

src/discord/src/message/reaction.rs

@@ -1,7 +1,7 @@
 use crate::client::DiscordClient;
 use components::theme::ActiveTheme;
 use gpui::prelude::FluentBuilder;
-use gpui::{div, img, px, AnyElement, App, InteractiveElement, IntoElement, ParentElement, RenderOnce, Rgba, StatefulInteractiveElement, Styled};
+use gpui::{div, img, px, AnyElement, AnyView, App, AppContext, Context, InteractiveElement, IntoElement, ParentElement, Render, RenderOnce, Rgba, StatefulInteractiveElement, Styled, Window};
 use scope_chat::reaction::MessageReactionType::Normal;
 use scope_chat::reaction::{MessageReaction, MessageReactionType, ReactionEmoji};
 use serenity::all::{ChannelId, MessageId, ReactionType};
@@ -43,6 +43,7 @@ pub struct DiscordMessageReaction {
   pub(crate) client: Arc<DiscordClient>,
   pub(crate) message_id: MessageId,
   pub(crate) channel_id: ChannelId,
+  pub(crate) users: Arc<Option<Vec<String>>>,
 }
 
 impl DiscordMessageReaction {
@@ -52,6 +53,7 @@ impl DiscordMessageReaction {
       client,
       message_id,
       channel_id,
+      users: Arc::new(None),
     }
   }
 
@@ -83,13 +85,15 @@ impl DiscordMessageReaction {
   fn handle_click(&self, app: &App) {
     let reaction = self.clone();
     let had_reaction = reaction.get_self_reaction().is_some();
-    app.spawn(|_| async move {
-      if had_reaction {
-        reaction.client.remove_reaction(reaction.channel_id, reaction.message_id, reaction.get_emoji()).await;
-      } else {
-        reaction.client.add_reaction(reaction.channel_id, reaction.message_id, reaction.get_emoji()).await;
-      }
-    }).detach();
+    app
+      .spawn(|_| async move {
+        if had_reaction {
+          reaction.client.remove_reaction(reaction.channel_id, reaction.message_id, reaction.get_emoji()).await;
+        } else {
+          reaction.client.add_reaction(reaction.channel_id, reaction.message_id, reaction.get_emoji()).await;
+        }
+      })
+      .detach();
   }
 }
 
@@ -171,6 +175,12 @@ impl RenderOnce for DiscordMessageReaction {
   fn render(self, _: &mut gpui::Window, cx: &mut App) -> impl IntoElement {
     let emoji = self.get_emoji();
     let theme = cx.theme();
+
+    let channel = self.channel_id.clone();
+    let message = self.message_id.clone();
+    let closure_emoji = self.get_emoji();
+    let client = self.client.clone();
+    let users = self.users.clone();
     div()
       .px_1()
       .py_px()
@@ -189,6 +199,17 @@ impl RenderOnce for DiscordMessageReaction {
       .on_click(move |_, _, app| {
         self.handle_click(app);
       })
+      .tooltip(move |win, cx| {
+
+        AnyView::from(cx.new(|cx| ReactionTooltip::new(users.clone())))
+      })
+      .on_hover(move |_, _, _| {
+        let client = client.clone();
+        let emoji = closure_emoji.clone();
+        tokio::spawn(async move {
+          client.load_users_reacting_to(channel, message, emoji).await;
+        });
+      })
   }
 }
 
@@ -213,3 +234,20 @@ impl Debug for DiscordMessageReaction {
     f.debug_struct("DiscordMessageReaction").field("data", &self.data).finish()
   }
 }
+
+struct ReactionTooltip {
+  users: Arc<Option<Vec<String>>>,
+}
+
+impl ReactionTooltip {
+  pub fn new(users: Arc<Option<Vec<String>>>) -> Self {
+    Self { users }
+  }
+}
+
+impl Render for ReactionTooltip {
+  fn render(&mut self, window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
+    div()
+        .child("yay")
+  }
+}

src/discord/src/message/reaction_list.rs

@@ -52,6 +52,7 @@ impl ReactionList for DiscordReactionList {
         client: self.client.clone(),
         message_id: self.message_id.clone(),
         channel_id: self.channel_id.clone(),
+        users: Arc::new(None)
       };
 
       reaction.increment(kind, user_is_self, by);
@@ -79,11 +80,19 @@ impl ReactionList for DiscordReactionList {
       ReactionOperation::RemoveEmoji(emoji) => {
         self.reactions.borrow_mut().retain(|reaction| reaction.get_emoji() != emoji);
       }
+      ReactionOperation::SetMembers(emoji, members) => {
+        if let Some(reaction) = self.reactions.borrow_mut().iter_mut().find(|reaction| reaction.get_emoji() == emoji) {
+          println!("users {:?}", &members);
+          reaction.users = Arc::new(Some(members));
+        }
+      }
     }
   }
 
   fn get_content(&self, cx: &mut App) -> impl IntoElement {
-    self.entity.get_or_init(|| cx.new(|_| RenderableReactionList::new(self.clone()))).clone()
+    self.entity.get_or_init(|| {
+      cx.new(|_| RenderableReactionList::new(self.clone()))
+    }).clone()
   }
 }