From e8ae7a3b30bf94c6d86dd1c5569ad3d72a26280c Mon Sep 17 00:00:00 2001 From: topi314 Date: Thu, 26 Sep 2024 11:33:37 +0200 Subject: [PATCH] don't emit *events.GuildJoin on startup --- handlers/guild_handlers.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/handlers/guild_handlers.go b/handlers/guild_handlers.go index 66df917f..c58bf082 100644 --- a/handlers/guild_handlers.go +++ b/handlers/guild_handlers.go @@ -91,6 +91,7 @@ func gatewayHandlerGuildCreate(client bot.Client, sequenceNumber int, shardID in }() } + return } if wasUnavailable { client.Caches().SetGuildUnavailable(event.ID, false) @@ -118,6 +119,10 @@ func gatewayHandlerGuildUpdate(client bot.Client, sequenceNumber int, shardID in } func gatewayHandlerGuildDelete(client bot.Client, sequenceNumber int, shardID int, event gateway.EventGuildDelete) { + if event.Unavailable { + client.Caches().SetGuildUnavailable(event.ID, true) + } + guild, _ := client.Caches().RemoveGuild(event.ID) client.Caches().RemoveVoiceStatesByGuildID(event.ID) client.Caches().RemovePresencesByGuildID(event.ID) @@ -137,10 +142,6 @@ func gatewayHandlerGuildDelete(client bot.Client, sequenceNumber int, shardID in client.Caches().RemoveGuildSoundboardSoundsByGuildID(event.ID) client.Caches().RemoveMessagesByGuildID(event.ID) - if event.Unavailable { - client.Caches().SetGuildUnavailable(event.ID, true) - } - genericGuildEvent := &events.GenericGuild{ GenericEvent: events.NewGenericEvent(client, sequenceNumber, shardID), GuildID: event.ID,