From 339a0fcbf42ce56e768bcd55ef036e78be2d2676 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Mon, 9 Mar 2026 17:35:52 +0100
Subject: Migrate Thread*Event to satisfies, part of #1577

---
 src/api/routes/channels/#channel_id/index.ts          |  4 ++--
 src/api/routes/channels/#channel_id/messages/index.ts |  6 +++---
 src/api/routes/channels/#channel_id/thread-members.ts | 14 +++++++-------
 src/api/routes/guilds/#guild_id/channels.ts           |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/api')

diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts
index 15d0e0175..3318eca2e 100644
--- a/src/api/routes/channels/#channel_id/index.ts
+++ b/src/api/routes/channels/#channel_id/index.ts
@@ -77,7 +77,7 @@ router.delete(
                 recipient.save(),
                 emitEvent({
                     event: "CHANNEL_DELETE",
-                    data: channel,
+                    data: channel.toJSON(),
                     user_id: req.user_id,
                 } satisfies ChannelDeleteEvent),
             ]);
@@ -120,7 +120,7 @@ router.delete(
                 Channel.deleteChannel(channel),
                 emitEvent({
                     event: "CHANNEL_DELETE",
-                    data: channel,
+                    data: channel.toJSON(),
                     channel_id,
                 } satisfies ChannelDeleteEvent),
             ]);
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index bd0f32ec9..eada48759 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -338,17 +338,17 @@ router.post(
                         data: {
                             guild_id: channel.guild_id!,
                             id: channel.id,
-                            member_count: channel.member_count,
+                            member_count: channel.member_count ?? 0, // TODO: is this the right fix?
                             added_members: [{ user_id: req.user_id, ...threadMember.toJSON() }],
                         },
                         channel_id: channel.id,
-                    } as ThreadMembersUpdateEvent);
+                    } satisfies ThreadMembersUpdateEvent);
 
                     await emitEvent({
                         event: "THREAD_CREATE",
                         data: { ...channel.toJSON(), newly_created: false },
                         user_id: req.user_id,
-                    } as ThreadCreateEvent);
+                    } satisfies ThreadCreateEvent);
                 }
             }
         } else {
diff --git a/src/api/routes/channels/#channel_id/thread-members.ts b/src/api/routes/channels/#channel_id/thread-members.ts
index 83b1b2930..9006fa144 100644
--- a/src/api/routes/channels/#channel_id/thread-members.ts
+++ b/src/api/routes/channels/#channel_id/thread-members.ts
@@ -102,17 +102,17 @@ router.post(
             data: {
                 guild_id: thread.guild_id!,
                 id: thread.id,
-                member_count: thread.member_count,
+                member_count: thread.member_count ?? 0, //TODO: is this the right fix?
                 added_members: [{ user_id: user_id, ...threadMember.toJSON() }],
             },
             channel_id: thread.id,
-        } as ThreadMembersUpdateEvent);
+        } satisfies ThreadMembersUpdateEvent);
 
         await emitEvent({
             event: "THREAD_CREATE",
             data: { ...thread.toJSON(), newly_created: false },
             user_id: user_id,
-        } as ThreadCreateEvent);
+        } satisfies ThreadCreateEvent);
 
         return res.status(204).send();
     },
@@ -151,11 +151,11 @@ router.delete(
             data: {
                 guild_id: thread.guild_id!,
                 id: thread.id,
-                member_count: thread.member_count,
+                member_count: thread.member_count ?? 0, // TODO: is this the right fix?
                 removed_member_ids: [user_id],
             },
             channel_id: thread.id,
-        } as ThreadMembersUpdateEvent);
+        } satisfies ThreadMembersUpdateEvent);
         if (thread.type === ChannelType.GUILD_PRIVATE_THREAD)
             await emitEvent({
                 event: "THREAD_DELETE",
@@ -166,7 +166,7 @@ router.delete(
                     type: thread.type,
                 },
                 user_id: user_id,
-            } as ThreadDeleteEvent);
+            } satisfies ThreadDeleteEvent);
 
         return res.status(204).send();
     },
@@ -193,7 +193,7 @@ router.patch(
         //     event: "THREAD_MEMBER_UPDATE",
         //     data: ,
         //     user_id: user_id,
-        // } as ThreadMemberUpdateEvent);
+        // } satisfies ThreadMemberUpdateEvent);
 
         return res.status(500).send("not implemented");
     },
diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts
index f20463d14..5c87a1dc0 100644
--- a/src/api/routes/guilds/#guild_id/channels.ts
+++ b/src/api/routes/guilds/#guild_id/channels.ts
@@ -155,7 +155,7 @@ router.patch(
 
             await emitEvent({
                 event: "CHANNEL_UPDATE",
-                data: channel.toJSON(),
+                data: channel?.toJSON(),
                 channel_id: channel.id,
                 guild_id,
             } satisfies ChannelUpdateEvent);
-- 
cgit 1.5.1