From 3f3e4327c86da86734c19a96e97115bd505b4532 Mon Sep 17 00:00:00 2001
From: Synbulat Biishev <syjalo.dev@gmail.com>
Date: Sat, 9 Apr 2022 14:35:55 +0500
Subject: [PATCH] feat(Actions): add parent structure to events parameters
 (#7577)

---
 packages/discord.js/src/client/actions/MessageDeleteBulk.js | 3 ++-
 packages/discord.js/src/client/actions/ThreadListSync.js    | 3 ++-
 .../discord.js/src/client/actions/ThreadMembersUpdate.js    | 4 ++--
 packages/discord.js/typings/index.d.ts                      | 6 +++---
 packages/discord.js/typings/index.test-d.ts                 | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/discord.js/src/client/actions/MessageDeleteBulk.js b/packages/discord.js/src/client/actions/MessageDeleteBulk.js
index 148e665e7..39455194f 100644
--- a/packages/discord.js/src/client/actions/MessageDeleteBulk.js
+++ b/packages/discord.js/src/client/actions/MessageDeleteBulk.js
@@ -33,8 +33,9 @@ class MessageDeleteBulkAction extends Action {
        * Emitted whenever messages are deleted in bulk.
        * @event Client#messageDeleteBulk
        * @param {Collection<Snowflake, Message>} messages The deleted messages, mapped by their id
+       * @param {TextBasedChannels} channel The channel that the messages were deleted in
        */
-      if (messages.size > 0) client.emit(Events.MessageBulkDelete, messages);
+      if (messages.size > 0) client.emit(Events.MessageBulkDelete, messages, channel);
       return { messages };
     }
     return {};
diff --git a/packages/discord.js/src/client/actions/ThreadListSync.js b/packages/discord.js/src/client/actions/ThreadListSync.js
index bad1a47ec..b16fb85a5 100644
--- a/packages/discord.js/src/client/actions/ThreadListSync.js
+++ b/packages/discord.js/src/client/actions/ThreadListSync.js
@@ -39,8 +39,9 @@ class ThreadListSyncAction extends Action {
      * Emitted whenever the client user gains access to a text or news channel that contains threads
      * @event Client#threadListSync
      * @param {Collection<Snowflake, ThreadChannel>} threads The threads that were synced
+     * @param {Guild} guild The guild that the threads were synced in
      */
-    client.emit(Events.ThreadListSync, syncedThreads);
+    client.emit(Events.ThreadListSync, syncedThreads, guild);
 
     return {
       syncedThreads,
diff --git a/packages/discord.js/src/client/actions/ThreadMembersUpdate.js b/packages/discord.js/src/client/actions/ThreadMembersUpdate.js
index 6f7f0a4ff..5d397f4a1 100644
--- a/packages/discord.js/src/client/actions/ThreadMembersUpdate.js
+++ b/packages/discord.js/src/client/actions/ThreadMembersUpdate.js
@@ -33,11 +33,11 @@ class ThreadMembersUpdateAction extends Action {
       /**
        * Emitted whenever members are added or removed from a thread. Requires `GUILD_MEMBERS` privileged intent
        * @event Client#threadMembersUpdate
-       * @param {ThreadChannel} thread The thread where members got updated
        * @param {Collection<Snowflake, ThreadMember>} addedMembers The members that were added
        * @param {Collection<Snowflake, ThreadMember>} removedMembers The members that were removed
+       * @param {ThreadChannel} thread The thread where members got updated
        */
-      client.emit(Events.ThreadMembersUpdate, thread, addedMembers, removedMembers);
+      client.emit(Events.ThreadMembersUpdate, addedMembers, removedMembers, thread);
     }
     return {};
   }
diff --git a/packages/discord.js/typings/index.d.ts b/packages/discord.js/typings/index.d.ts
index f10bb4420..10b70e766 100644
--- a/packages/discord.js/typings/index.d.ts
+++ b/packages/discord.js/typings/index.d.ts
@@ -3740,7 +3740,7 @@ export interface ClientEvents {
     reactions: Collection<string | Snowflake, MessageReaction>,
   ];
   messageReactionRemoveEmoji: [reaction: MessageReaction | PartialMessageReaction];
-  messageDeleteBulk: [messages: Collection<Snowflake, Message | PartialMessage>];
+  messageDeleteBulk: [messages: Collection<Snowflake, Message | PartialMessage>, channel: TextBasedChannel];
   messageReactionAdd: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser];
   messageReactionRemove: [reaction: MessageReaction | PartialMessageReaction, user: User | PartialUser];
   messageUpdate: [oldMessage: Message | PartialMessage, newMessage: Message | PartialMessage];
@@ -3752,12 +3752,12 @@ export interface ClientEvents {
   roleUpdate: [oldRole: Role, newRole: Role];
   threadCreate: [thread: ThreadChannel, newlyCreated: boolean];
   threadDelete: [thread: ThreadChannel];
-  threadListSync: [threads: Collection<Snowflake, ThreadChannel>];
+  threadListSync: [threads: Collection<Snowflake, ThreadChannel>, guild: Guild];
   threadMemberUpdate: [oldMember: ThreadMember, newMember: ThreadMember];
   threadMembersUpdate: [
-    thread: ThreadChannel,
     addedMembers: Collection<Snowflake, ThreadMember>,
     removedMembers: Collection<Snowflake, ThreadMember | PartialThreadMember>,
+    thread: ThreadChannel,
   ];
   threadUpdate: [oldThread: ThreadChannel, newThread: ThreadChannel];
   typingStart: [typing: Typing];
diff --git a/packages/discord.js/typings/index.test-d.ts b/packages/discord.js/typings/index.test-d.ts
index 0746ff0e0..11dd08462 100644
--- a/packages/discord.js/typings/index.test-d.ts
+++ b/packages/discord.js/typings/index.test-d.ts
@@ -762,10 +762,10 @@ client.on('messageCreate', async message => {
   channel.send({ components: [row, buttonsRow, selectsRow], embeds: [embed, buildersEmbed, embedData] });
 });
 
-client.on('threadMembersUpdate', (thread, addedMembers, removedMembers) => {
-  expectType<ThreadChannel>(thread);
+client.on('threadMembersUpdate', (addedMembers, removedMembers, thread) => {
   expectType<Collection<Snowflake, ThreadMember>>(addedMembers);
   expectType<Collection<Snowflake, ThreadMember | PartialThreadMember>>(removedMembers);
+  expectType<ThreadChannel>(thread);
   const left = removedMembers.first();
   if (!left) return;