Merge pull request #7 from scopeclient/ali/rustfmt-everything-and-create-util

rustfmt, resultext

Author: alii

.gitignore

@@ -1,5 +1,5 @@
 /target
 .vscode
-
+.DS_Store
 .direnv
 .env

Cargo.lock

@@ -26,4 +26,4 @@ impl Channel for DiscordChannel {
   fn get_receiver(&self) -> broadcast::Receiver<Self::Message> {
     self.receiver.resubscribe()
   }
-}
+}

src/discord/src/channel/mod.rs

@@ -1,13 +1,24 @@
 use std::{collections::HashMap, rc::Rc, sync::Arc};
 
-use serenity::{all::{Context, EventHandler, GatewayIntents, Message}, async_trait, futures::SinkExt};
+use serenity::{
+  all::{Context, EventHandler, GatewayIntents, Message},
+  async_trait,
+  futures::SinkExt,
+};
 use tokio::sync::{broadcast, Mutex, RwLock};
 
-use crate::{message::{author::{DiscordMessageAuthor, DisplayName}, content::DiscordMessageContent, DiscordMessage}, snowflake::{self, Snowflake}};
+use crate::{
+  message::{
+    author::{DiscordMessageAuthor, DisplayName},
+    content::DiscordMessageContent,
+    DiscordMessage,
+  },
+  snowflake::{self, Snowflake},
+};
 
 #[derive(Default)]
 pub struct DiscordClient {
-  channel_message_event_handlers: HashMap<Snowflake, Vec<broadcast::Sender<DiscordMessage>>>
+  channel_message_event_handlers: HashMap<Snowflake, Vec<broadcast::Sender<DiscordMessage>>>,
 }
 
 impl DiscordClient {
@@ -16,10 +27,7 @@ impl DiscordClient {
     let remote = RemoteDiscordClient(client.clone());
 
     tokio::spawn(async {
-      let mut client = serenity::Client::builder(token, GatewayIntents::all())
-        .event_handler(remote)
-        .await
-        .expect("Error creating client");
+      let mut client = serenity::Client::builder(token, GatewayIntents::all()).event_handler(remote).await.expect("Error creating client");
 
       if let Err(why) = client.start().await {
         panic!("Client error: {why:?}");
@@ -45,7 +53,9 @@ impl EventHandler for RemoteDiscordClient {
   async fn message(&self, _: Context, msg: Message) {
     println!("Got message: {:?} {:?}", msg.channel_id, msg.content);
 
-    let snowflake = Snowflake { content: msg.channel_id.get() };
+    let snowflake = Snowflake {
+      content: msg.channel_id.get(),
+    };
 
     if let Some(vec) = self.0.read().await.channel_message_event_handlers.get(&snowflake) {
       for sender in vec {
@@ -55,13 +65,13 @@ impl EventHandler for RemoteDiscordClient {
           id: snowflake,
           author: DiscordMessageAuthor {
             display_name: DisplayName(msg.author.name.clone()),
-            icon: msg.author.avatar_url().unwrap_or(msg.author.default_avatar_url())
+            icon: msg.author.avatar_url().unwrap_or(msg.author.default_avatar_url()),
           },
           content: DiscordMessageContent {
-            content: msg.content.clone()
-          }
+            content: msg.content.clone(),
+          },
         });
       }
     }
   }
-}
+}

src/discord/src/client.rs

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

src/discord/src/lib.rs

@@ -24,4 +24,4 @@ impl RenderOnce for DisplayName {
   fn render(self, _: &mut WindowContext) -> impl IntoElement {
     div().text_sm().child(self.0)
   }
-}
+}

src/discord/src/message/author.rs

@@ -9,4 +9,4 @@ impl RenderOnce for DiscordMessageContent {
   fn render(self, _: &mut WindowContext) -> impl IntoElement {
     self.content.clone()
   }
-}
+}

src/discord/src/message/content.rs

@@ -5,8 +5,8 @@ use scope_chat::message::Message;
 
 use crate::snowflake::Snowflake;
 
-pub mod content;
 pub mod author;
+pub mod content;
 
 #[derive(Clone)]
 pub struct DiscordMessage {
@@ -28,4 +28,3 @@ impl Message for DiscordMessage {
     self.id.to_string()
   }
 }
-

src/discord/src/message/mod.rs

@@ -1,10 +1,10 @@
 #[derive(Clone, Hash, PartialEq, Eq, Copy)]
 pub struct Snowflake {
-  pub content: u64
+  pub content: u64,
 }
 
 impl ToString for Snowflake {
   fn to_string(&self) -> String {
     self.content.to_string()
   }
-}
+}

src/discord/src/snowflake.rs

@@ -3,7 +3,7 @@ name = "scope"
 version = "0.1.0"
 edition = "2021"
 authors = [
-  "Rose Kodsi-Hall <rose@hall.ly>"
+  "Rose Kodsi-Hall <rose@hall.ly>",
   # Add yourself here if you contribute!
 ]
 description = "discord client for power users"
@@ -13,9 +13,13 @@ repository = "https://github.com/scopeclient/scope"
 keywords = ["discord", "scope", "reticle"]
 
 [dependencies]
-gpui = { git = "https://github.com/zed-industries/zed.git", version = "0.1.0", default-features = false, features = ["http_client", "font-kit"]}
-reqwest_client = { git = "https://github.com/zed-industries/zed.git", version = "0.1.0"}
+gpui = { git = "https://github.com/zed-industries/zed.git", version = "0.1.0", default-features = false, features = [
+  "http_client",
+  "font-kit",
+] }
+reqwest_client = { git = "https://github.com/zed-industries/zed.git", version = "0.1.0" }
 scope-chat = { version = "0.1.0", path = "../chat" }
+scope-util = { version = "0.1.0", path = "../util" }
 scope-backend-discord = { version = "0.1.0", path = "../discord" }
 dotenv = "0.15.0"
 env_logger = "0.11.5"