Send GUILD_DELETE for unavailable guilds again, avoid large box

Signed-off-by: Jens Reidel <[email protected]>

Author: Gelbpunkt

src/cache.rs

@@ -2,18 +2,18 @@
 use halfbrown::hashmap;
 use serde::Serialize;
 #[cfg(not(feature = "simd-json"))]
-use serde_json::Value as OwnedValue;
+use serde_json::{to_string, Value as OwnedValue};
 #[cfg(feature = "simd-json")]
-use simd_json::OwnedValue;
+use simd_json::{to_string, OwnedValue};
 use twilight_cache_inmemory::{DefaultCacheModels, InMemoryCache, InMemoryCacheStats, UpdateCache};
 use twilight_model::{
     channel::{message::Sticker, Channel, StageInstance},
     gateway::{
-        payload::incoming::GuildCreate,
+        payload::incoming::GuildDelete,
         presence::{Presence, UserOrId},
         OpCode,
     },
-    guild::{scheduled_event::GuildScheduledEvent, Emoji, Guild, Member, Role, UnavailableGuild},
+    guild::{scheduled_event::GuildScheduledEvent, Emoji, Guild, Member, Role},
     id::{
         marker::{GuildMarker, UserMarker},
         Id,
@@ -26,20 +26,13 @@ use std::sync::Arc;
 use crate::model::JsonObject;
 
 #[derive(Serialize)]
-pub struct Payload {
-    pub d: Event,
+pub struct Payload<T> {
+    pub d: T,
     pub op: OpCode,
-    pub t: String,
+    pub t: &'static str,
     pub s: usize,
 }
 
-#[derive(Serialize, Clone)]
-#[serde(untagged)]
-pub enum Event {
-    Ready(JsonObject),
-    GuildCreate(Box<GuildCreate>),
-}
-
 pub struct Guilds(Arc<InMemoryCache>);
 
 impl Guilds {
@@ -55,7 +48,11 @@ impl Guilds {
         self.0.stats()
     }
 
-    pub fn get_ready_payload(&self, mut ready: JsonObject, sequence: &mut usize) -> Payload {
+    pub fn get_ready_payload(
+        &self,
+        mut ready: JsonObject,
+        sequence: &mut usize,
+    ) -> Payload<JsonObject> {
         *sequence += 1;
 
         let guild_id_to_json = |guild_id: Id<GuildMarker>| {
@@ -94,9 +91,9 @@ impl Guilds {
         ready.insert(String::from("guilds"), OwnedValue::Array(guilds));
 
         Payload {
-            d: Event::Ready(ready),
+            d: ready,
             op: OpCode::Dispatch,
-            t: String::from("READY"),
+            t: "READY",
             s: *sequence,
         }
     }
@@ -323,15 +320,21 @@ impl Guilds {
     pub fn get_guild_payloads<'a>(
         &'a self,
         sequence: &'a mut usize,
-    ) -> impl Iterator<Item = Payload> + 'a {
+    ) -> impl Iterator<Item = String> + 'a {
         self.0.iter().guilds().map(move |guild| {
             *sequence += 1;
 
-            let guild_create = if guild.unavailable() {
-                GuildCreate::Unavailable(UnavailableGuild {
-                    id: guild.id(),
-                    unavailable: true,
+            if guild.unavailable() {
+                to_string(&Payload {
+                    d: GuildDelete {
+                        id: guild.id(),
+                        unavailable: true,
+                    },
+                    op: OpCode::Dispatch,
+                    t: "GUILD_DELETE",
+                    s: *sequence,
                 })
+                .unwrap()
             } else {
                 let guild_channels = self.channels_in_guild(guild.id());
                 let presences = self.presences_in_guild(guild.id());
@@ -397,14 +400,13 @@ impl Guilds {
                     widget_enabled: guild.widget_enabled(),
                 };
 
-                GuildCreate::Available(new_guild)
-            };
-
-            Payload {
-                d: Event::GuildCreate(Box::new(guild_create)),
-                op: OpCode::Dispatch,
-                t: String::from("GUILD_CREATE"),
-                s: *sequence,
+                to_string(&Payload {
+                    d: new_guild,
+                    op: OpCode::Dispatch,
+                    t: "GUILD_CREATE",
+                    s: *sequence,
+                })
+                .unwrap()
             }
         })
     }

src/server.rs

@@ -28,7 +28,6 @@ use tracing::{debug, error, info, trace, warn};
 use std::{convert::Infallible, future::ready, net::SocketAddr, sync::Arc};
 
 use crate::{
-    cache::Event,
     config::CONFIG,
     deserializer::{GatewayEvent, SequenceInfo},
     model::{Identify, Resume},
@@ -135,9 +134,9 @@ async fn forward_shard(
             .get_ready_payload(ready_payload, &mut seq);
 
         // Overwrite the session ID in the READY
-        if let Event::Ready(payload) = &mut ready_payload.d {
-            payload.insert(String::from("session_id"), OwnedValue::String(session_id));
-        }
+        ready_payload
+            .d
+            .insert(String::from("session_id"), OwnedValue::String(session_id));
 
         if let Ok(serialized) = to_string(&ready_payload) {
             debug!("[Shard {shard_id}] Sending newly created READY");
@@ -146,12 +145,8 @@ async fn forward_shard(
 
         // Send GUILD_CREATE/GUILD_DELETEs based on guild availability
         for payload in shard_status.guilds.get_guild_payloads(&mut seq) {
-            if let Ok(serialized) = to_string(&payload) {
-                trace!(
-                    "[Shard {shard_id}] Sending newly created GUILD_CREATE/GUILD_DELETE payload",
-                );
-                let _res = stream_writer.send(Message::text(serialized));
-            };
+            trace!("[Shard {shard_id}] Sending newly created GUILD_CREATE/GUILD_DELETE payload");
+            let _res = stream_writer.send(Message::text(payload));
         }
     } else {
         let _res = stream_writer.send(Message::text(RESUMED.to_string()));