Migrate GuildMemberUpdate to satisfies, part of #1577

4 files changed, 11 insertions, 10 deletions

diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts

index 3db964d2..d20710de 100644
--- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -146,7 +146,7 @@ router.patch(
             event: "GUILD_MEMBER_UPDATE",
             guild_id,
             data: { ...member, roles: member.roles.map((x) => x.id) },
-        } as GuildMemberUpdateEvent);
+        } satisfies GuildMemberUpdateEvent);
 
         res.json(member);
     },
diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts

index 74f40874..30a600b0 100644
--- a/src/api/routes/guilds/#guild_id/profile/index.ts
+++ b/src/api/routes/guilds/#guild_id/profile/index.ts
@@ -76,7 +76,7 @@ router.patch(
             event: "GUILD_MEMBER_UPDATE",
             guild_id,
             data: { ...member, roles: member.roles.map((x) => x.id) },
-        } as GuildMemberUpdateEvent);
+        } satisfies GuildMemberUpdateEvent);
 
         res.json(member);
     },
diff --git a/src/util/entities/Member.ts b/src/util/entities/Member.ts

index 6d93cf5d..b9b53cb4 100644
--- a/src/util/entities/Member.ts
+++ b/src/util/entities/Member.ts
@@ -242,7 +242,7 @@ export class Member extends BaseClassWithoutId {
                     roles: member.roles.map((x) => x.id),
                 },
                 guild_id,
-            } as GuildMemberUpdateEvent),
+            } satisfies GuildMemberUpdateEvent),
         ]);
     }
 
@@ -272,7 +272,7 @@ export class Member extends BaseClassWithoutId {
                     roles: member.roles.map((x) => x.id),
                 },
                 guild_id,
-            } as GuildMemberUpdateEvent),
+            } satisfies GuildMemberUpdateEvent),
         ]);
     }
 
@@ -282,7 +282,7 @@ export class Member extends BaseClassWithoutId {
                 id: user_id,
                 guild_id,
             },
-            relations: { user: true },
+            relations: { user: true, roles: true },
         });
 
         // @ts-expect-error Member nickname is nullable
@@ -296,10 +296,11 @@ export class Member extends BaseClassWithoutId {
                 data: {
                     guild_id,
                     user: member.user,
-                    nick: nickname || null,
+                    nick: nickname || undefined,
+                    roles: member.roles.map((x) => x.id),
                 },
                 guild_id,
-            } as GuildMemberUpdateEvent),
+            } satisfies GuildMemberUpdateEvent),
         ]);
     }
 
diff --git a/src/util/entities/ThreadMember.ts b/src/util/entities/ThreadMember.ts

index cedf1f7b..22741bd6 100644
--- a/src/util/entities/ThreadMember.ts
+++ b/src/util/entities/ThreadMember.ts
@@ -138,7 +138,7 @@ export class ThreadMember extends BaseClassWithoutId {
     // 				roles: member.roles.map((x) => x.id)
     // 			},
     // 			guild_id
-    // 		} as GuildMemberUpdateEvent)
+    // 		} satisfies GuildMemberUpdateEvent)
     // 	]);
     // }
 
@@ -164,7 +164,7 @@ export class ThreadMember extends BaseClassWithoutId {
     // 				roles: member.roles.map((x) => x.id)
     // 			},
     // 			guild_id
-    // 		} as GuildMemberUpdateEvent)
+    // 		} satisfies GuildMemberUpdateEvent)
     // 	]);
     // }
 
@@ -189,7 +189,7 @@ export class ThreadMember extends BaseClassWithoutId {
     // 				nick: nickname
     // 			},
     // 			guild_id
-    // 		} as GuildMemberUpdateEvent)
+    // 		} satisfies GuildMemberUpdateEvent)
     // 	]);
     // }
 }