Merge Refactor into main

src/chat/src/async_list.rs

@@ -1,4 +1,4 @@
-use std::{fmt::Debug, future::Future, hash::Hash};
+use std::{fmt::Debug, future::Future, hash::Hash, sync::Arc};
 
 pub trait AsyncList {
   type Content: AsyncListItem;
@@ -12,7 +12,30 @@ pub trait AsyncList {
   fn bounded_at_bottom_by(&self) -> impl Future<Output = Option<<Self::Content as AsyncListItem>::Identifier>>;
 }
 
-pub trait AsyncListItem: Clone + Debug {
+impl<L: AsyncList> AsyncList for Arc<L> {
+  type Content = L::Content;
+
+  fn bounded_at_bottom_by(&self) -> impl Future<Output = Option<<Self::Content as AsyncListItem>::Identifier>> {
+    (**self).bounded_at_bottom_by()
+  }
+
+  fn bounded_at_top_by(&self) -> impl Future<Output = Option<<Self::Content as AsyncListItem>::Identifier>> {
+    (**self).bounded_at_top_by()
+  }
+
+  fn find(&self, identifier: &<Self::Content as AsyncListItem>::Identifier) -> impl Future<Output = Option<Self::Content>> {
+    (**self).find(identifier)
+  }
+
+  fn get(
+    &self,
+    index: AsyncListIndex<<Self::Content as AsyncListItem>::Identifier>,
+  ) -> impl Future<Output = Option<AsyncListResult<Self::Content>>> + Send {
+    (**self).get(index)
+  }
+}
+
+pub trait AsyncListItem: Clone {
   type Identifier: Eq + Hash + Clone + Send + Debug;
 
   fn get_list_identifier(&self) -> Self::Identifier;

src/chat/src/channel.rs

@@ -1,11 +1,33 @@
+use std::{fmt::Debug, sync::Arc};
+
 use tokio::sync::broadcast;
 
 use crate::{async_list::AsyncList, message::Message};
 
 pub trait Channel: AsyncList<Content = Self::Message> + Send + Sync + Clone {
-  type Message: Message;
+  type Message: Message<Identifier = Self::Identifier>;
+  type Identifier: Sized + Copy + Clone + Debug + Eq + PartialEq;
 
   fn get_receiver(&self) -> broadcast::Receiver<Self::Message>;
 
   fn send_message(&self, content: String, nonce: String) -> Self::Message;
+
+  fn get_identifier(&self) -> Self::Identifier;
+}
+
+impl<C: Channel> Channel for Arc<C> {
+  type Identifier = C::Identifier;
+  type Message = C::Message;
+
+  fn get_identifier(&self) -> Self::Identifier {
+    (**self).get_identifier()
+  }
+
+  fn get_receiver(&self) -> broadcast::Receiver<Self::Message> {
+    (**self).get_receiver()
+  }
+
+  fn send_message(&self, content: String, nonce: String) -> Self::Message {
+    (**self).send_message(content, nonce)
+  }
 }

src/chat/src/client.rs

@@ -0,0 +1,17 @@
+use std::{fmt::Debug, future::Future};
+
+use crate::channel::Channel;
+
+pub trait ClientConstructor<C: Client> {
+  type ConstructorArguments;
+  type ConstructorFailure;
+
+  fn construct(args: Self::ConstructorArguments) -> impl Future<Output = Result<C, Self::ConstructorFailure>>;
+}
+
+pub trait Client {
+  type Identifier: Sized + Copy + Clone + Debug + Eq + PartialEq;
+  type Channel: Channel;
+
+  fn channel(identifier: Self::Identifier) -> impl Future<Output = Option<Self::Channel>>;
+}

src/chat/src/lib.rs

@@ -1,3 +1,4 @@
 pub mod async_list;
 pub mod channel;
+pub mod client;
 pub mod message;

src/chat/src/message.rs

@@ -1,20 +1,55 @@
+use std::fmt::Debug;
+
 use chrono::{DateTime, Utc};
-use gpui::Element;
+use gpui::{IntoElement, Render, View, WindowContext};
 
 use crate::async_list::AsyncListItem;
 
 pub trait Message: Clone + AsyncListItem + Send {
-  fn get_author(&self) -> &impl MessageAuthor;
-  fn get_content(&self) -> impl Element;
-  fn get_identifier(&self) -> String;
-  fn get_nonce(&self) -> Option<&String>;
+  type Identifier: Sized + Copy + Clone + Debug + Eq + PartialEq;
+  type Author: MessageAuthor<Identifier = <Self as Message>::Identifier>;
+  type Content: Render;
+
+  fn get_author(&self) -> Self::Author;
+  fn get_content(&self, cx: &mut WindowContext) -> View<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>>;
 }
 
+#[derive(Debug, Clone, Copy)]
+pub struct IconRenderConfig {
+  size: usize,
+}
+
+impl Default for IconRenderConfig {
+  fn default() -> Self {
+    IconRenderConfig { size: 1024 }
+  }
+}
+
+impl IconRenderConfig {
+  pub fn small() -> Self {
+    IconRenderConfig { size: 32 }
+  }
+
+  pub fn with_size(mut self, size: usize) -> IconRenderConfig {
+    self.size = size;
+    self
+  }
+
+  pub fn size(&self) -> usize {
+    self.size
+  }
+}
+
 pub trait MessageAuthor: PartialEq + Eq {
-  fn get_display_name(&self) -> impl Element;
-  fn get_icon(&self) -> String;
-  fn get_small_icon(&self) -> String;
-  fn get_id(&self) -> String;
+  type Identifier: Sized + Copy + Clone + Debug + Eq + PartialEq;
+  type DisplayName: IntoElement + Clone;
+  type Icon: IntoElement + Clone;
+
+  fn get_display_name(&self) -> Self::DisplayName;
+  fn get_icon(&self, config: IconRenderConfig) -> Self::Icon;
+  fn get_identifier(&self) -> Self::Identifier;
 }

src/discord/Cargo.toml

@@ -6,7 +6,13 @@ edition = "2021"
 [dependencies]
 gpui.workspace = true
 scope-chat = { version = "0.1.0", path = "../chat" }
-serenity = { git = "https://github.com/scopeclient/serenity", version = "0.12" }
+serenity = { git = "https://github.com/scopeclient/serenity", version = "0.12", branch = "dev" }
 tokio = "1.41.1"
 chrono.workspace = true
 scope-backend-cache = { version = "0.1.0", path = "../cache" }
+url = "2.5.3"
+querystring = "1.1.0"
+catty = "0.1.5"
+atomic_refcell = "0.1.13"
+rand = "0.8.5"
+dashmap = "6.1.0"