Migrate ChannelRecipient*Event to satisfies, part of #1577

4 files changed, 11 insertions, 9 deletions

diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts

index 71caa9ee..28200cb5 100644
--- a/src/api/routes/channels/#channel_id/recipients.ts
+++ b/src/api/routes/channels/#channel_id/recipients.ts
@@ -61,13 +61,15 @@ router.put(
                 event: "CHANNEL_RECIPIENT_ADD",
                 data: {
                     channel_id: channel_id,
-                    user: await User.findOneOrFail({
-                        where: { id: user_id },
-                        select: PublicUserProjection,
-                    }),
+                    user: (
+                        await User.findOneOrFail({
+                            where: { id: user_id },
+                            select: PublicUserProjection,
+                        })
+                    ).toPublicUser(),
                 },
                 channel_id: channel_id,
-            } as ChannelRecipientAddEvent);
+            } satisfies ChannelRecipientAddEvent);
             return res.sendStatus(204);
         }
     },
diff --git a/src/api/routes/users/#user_id/delete.ts b/src/api/routes/users/#user_id/delete.ts

index 44ff6ed5..979607c1 100644
--- a/src/api/routes/users/#user_id/delete.ts
+++ b/src/api/routes/users/#user_id/delete.ts
@@ -104,7 +104,7 @@ router.post(
                             channel_id: channel.id,
                         },
                         channel_id: channel.id,
-                    } as ChannelRecipientRemoveEvent);
+                    } satisfies ChannelRecipientRemoveEvent);
                     console.log(`[Instance ban] Removed user ${user.id} from group channel ${channel.id}`);
                 }
 
diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts

index 3ee4df43..454f6b6c 100644
--- a/src/util/entities/Channel.ts
+++ b/src/util/entities/Channel.ts
@@ -549,7 +549,7 @@ export class Channel extends BaseClass {
                 }),
             },
             channel_id: channel.id,
-        } as ChannelRecipientRemoveEvent);
+        } satisfies ChannelRecipientRemoveEvent);
     }
 
     static async deleteChannel(channel: Channel) {
diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts

index 3e1483d9..ed4f70a9 100644
--- a/src/util/interfaces/Event.ts
+++ b/src/util/interfaces/Event.ts
@@ -190,7 +190,7 @@ export interface ChannelRecipientAddEvent extends Event {
     event: "CHANNEL_RECIPIENT_ADD";
     data: {
         channel_id: string;
-        user: User;
+        user: PublicUser;
     };
 }
 
@@ -198,7 +198,7 @@ export interface ChannelRecipientRemoveEvent extends Event {
     event: "CHANNEL_RECIPIENT_REMOVE";
     data: {
         channel_id: string;
-        user: User;
+        user: PublicUser;
     };
 }