From e0baf02efdcbabea78cc352fb6642cc09c92d001 Mon Sep 17 00:00:00 2001 From: Rory& Date: Sat, 7 Mar 2026 23:03:30 +0100 Subject: [PATCH] Migrate GuildMemberUpdate to satisfies, part of #1577 --- .../guilds/#guild_id/members/#member_id/index.ts | 2 +- src/api/routes/guilds/#guild_id/profile/index.ts | 2 +- src/util/entities/Member.ts | 11 ++++++----- src/util/entities/ThreadMember.ts | 6 +++--- 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 3db964d2a..d20710dec 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 74f408745..30a600b04 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 6d93cf5db..b9b53cb4d 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 cedf1f7bc..22741bd61 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) // ]); // } }