feat!: decomplex emit type for rolesUpdated

zaida04 · Mar 1, 2023 · ad416a2 · ad416a2
1 parent fecf36c
commit ad416a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.changeset/ten-boats-drop.md b/.changeset/ten-boats-drop.md
@@ -0,0 +1,5 @@
+---
+"guilded.js": minor
+---
+
+feat!: decomplex rolesUpdate event types
diff --git a/packages/guilded.js/lib/gateway/handler/ServerEventHandler.ts b/packages/guilded.js/lib/gateway/handler/ServerEventHandler.ts
@@ -5,17 +5,16 @@ import { buildMemberKey } from "../../util";
 
 export class ServerEventHandler extends GatewayEventHandler {
 	serverRolesUpdated(data: WSServerRolesUpdatedPayload): boolean {
-		const newMembers = [];
 		const oldMembers = [];
+		// update members cache
 		for (const m of data.d.memberRoleIds) {
 			const member = this.client.members.cache.get(buildMemberKey(data.d.serverId, m.userId));
-			if (!member) {
-				newMembers.push({ ...m, serverId: data.d.serverId });
-				continue;
+			if (member) {
+				oldMembers.push(member._clone());
+				member._update({ roleIds: m.roleIds });
 			}
-			oldMembers.push(member._clone());
-			newMembers.push(member._update({ roleIds: m.roleIds }));
 		}
-		return this.client.emit(constants.clientEvents.ROLES_UPATED, newMembers, oldMembers);
+
+		return this.client.emit(constants.clientEvents.ROLES_UPATED, { serverId: data.d.serverId, members: data.d.memberRoleIds }, oldMembers);
 	}
 }
diff --git a/packages/guilded.js/lib/typings.ts b/packages/guilded.js/lib/typings.ts
@@ -76,6 +76,6 @@ export type ClientEvents = {
 	serverCreated: (server: { serverId: string }) => unknown;
 	webhookCreated: (webhook: Webhook) => unknown;
 	webhookUpdated: (webhook: Webhook, oldWebhook: Webhook | null) => unknown;
-	rolesUpdated: (members: (Member | (ServerMemberRoleIdsPayload & { serverId: string }))[], oldMembers: Member[]) => unknown;
+	rolesUpdated: (updatedMembers: { serverId: string, members: ServerMemberRoleIdsPayload[] }, oldMembers: Member[]) => unknown;
 	unknownGatewayEvent: (data: any) => unknown;
 };