From db63ac406495cf57e1978aae5f0cf75623026817 Mon Sep 17 00:00:00 2001
From: Bob Bobs <bobthebobs@protonmail.com>
Date: Fri, 1 Dec 2023 17:21:39 -0700
Subject: [PATCH] fix: add emojis to ServerCreate event

---
 crates/core/database/src/events/client.rs               | 1 +
 crates/core/database/src/models/server_members/model.rs | 3 +++
 crates/quark/src/events/client.rs                       | 1 +
 crates/quark/src/events/impl.rs                         | 1 +
 crates/quark/src/impl/generic/servers/server.rs         | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs
index 59fb7d3e..de63a9d4 100644
--- a/crates/core/database/src/events/client.rs
+++ b/crates/core/database/src/events/client.rs
@@ -110,6 +110,7 @@ pub enum EventV1 {
         id: String,
         server: Server,
         channels: Vec<Channel>,
+        emojis: Vec<Emoji>,
     },
 
     /// Update existing server
diff --git a/crates/core/database/src/models/server_members/model.rs b/crates/core/database/src/models/server_members/model.rs
index 035b408f..07c349fb 100644
--- a/crates/core/database/src/models/server_members/model.rs
+++ b/crates/core/database/src/models/server_members/model.rs
@@ -119,6 +119,8 @@ impl Member {
             }
         }
 
+        let emojis = db.fetch_emoji_by_parent_id(&server.id).await?;
+
         EventV1::ServerMemberJoin {
             id: server.id.clone(),
             user: user.id.clone(),
@@ -134,6 +136,7 @@ impl Member {
                 .into_iter()
                 .map(|channel| channel.into())
                 .collect(),
+            emojis: emojis.into_iter().map(|emoji| emoji.into()).collect(),
         }
         .private(user.id.clone())
         .await;
diff --git a/crates/quark/src/events/client.rs b/crates/quark/src/events/client.rs
index 219a4641..e9a08eb7 100644
--- a/crates/quark/src/events/client.rs
+++ b/crates/quark/src/events/client.rs
@@ -143,6 +143,7 @@ pub enum EventV1 {
         id: String,
         server: Server,
         channels: Vec<Channel>,
+        emojis: Vec<Emoji>,
     },
 
     /// Update existing server
diff --git a/crates/quark/src/events/impl.rs b/crates/quark/src/events/impl.rs
index e38fa969..c157fe11 100644
--- a/crates/quark/src/events/impl.rs
+++ b/crates/quark/src/events/impl.rs
@@ -401,6 +401,7 @@ impl State {
                 id,
                 server,
                 channels,
+                emojis: _,
             } => {
                 self.insert_subscription(id.clone());
                 self.cache.servers.insert(id.clone(), server.clone());
diff --git a/crates/quark/src/impl/generic/servers/server.rs b/crates/quark/src/impl/generic/servers/server.rs
index 8131eecd..1a4916f0 100644
--- a/crates/quark/src/impl/generic/servers/server.rs
+++ b/crates/quark/src/impl/generic/servers/server.rs
@@ -206,6 +206,8 @@ impl Server {
             }
         }
 
+        let emojis = db.fetch_emoji_by_parent_id(&self.id).await?;
+
         EventV1::ServerMemberJoin {
             id: self.id.clone(),
             user: user.id.clone(),
@@ -217,6 +219,7 @@ impl Server {
             id: self.id.clone(),
             server: self.clone(),
             channels: channels.clone(),
+            emojis,
         }
         .private(user.id.clone())
         .await;