refactor: use proper variable names in callbacks (#9840)

* refactor: use proper variable names in callbacks

* refactor: change parameter names

* refactor: change remaining parameter names

* refactor: change remaining variable names

* refactor(GuildAuditLogsEntry): abstract reduce logic into a new function

* chore: undo unrelated changes

This undoes commit b2d93dc as it's unrelated

* refactor: more name changes

* chore: fix tests failing

* refactor: use option instead of opt

---------

Co-authored-by: Jiralite <[email protected]>

Author: sdanialraza

packages/discord.js/src/client/Client.js

@@ -369,7 +369,7 @@ class Client extends BaseClient {
    */
   async fetchStickerPacks() {
     const data = await this.rest.get(Routes.stickerPacks());
-    return new Collection(data.sticker_packs.map(p => [p.id, new StickerPack(this, p)]));
+    return new Collection(data.sticker_packs.map(stickerPack => [stickerPack.id, new StickerPack(this, stickerPack)]));
   }
 
   /**

packages/discord.js/src/client/websocket/WebSocketManager.js

@@ -364,7 +364,7 @@ class WebSocketManager extends EventEmitter {
    */
   checkShardsReady() {
     if (this.status === Status.Ready) return;
-    if (this.shards.size !== this.totalShards || this.shards.some(s => s.status !== Status.Ready)) {
+    if (this.shards.size !== this.totalShards || this.shards.some(shard => shard.status !== Status.Ready)) {
       return;
     }
 

packages/discord.js/src/client/websocket/WebSocketShard.js

@@ -140,7 +140,7 @@ class WebSocketShard extends EventEmitter {
      */
     this.emit(WebSocketShardEvents.Ready);
 
-    this.expectedGuilds = new Set(packet.guilds.map(d => d.id));
+    this.expectedGuilds = new Set(packet.guilds.map(guild => guild.id));
     this.status = Status.WaitingForGuilds;
   }
 

packages/discord.js/src/managers/ApplicationCommandManager.js

@@ -169,9 +169,12 @@ class ApplicationCommandManager extends CachedManager {
    */
   async set(commands, guildId) {
     const data = await this.client.rest.put(this.commandPath({ guildId }), {
-      body: commands.map(c => this.constructor.transformCommand(c)),
+      body: commands.map(command => this.constructor.transformCommand(command)),
     });
-    return data.reduce((coll, command) => coll.set(command.id, this._add(command, true, guildId)), new Collection());
+    return data.reduce(
+      (collection, command) => collection.set(command.id, this._add(command, true, guildId)),
+      new Collection(),
+    );
   }
 
   /**
@@ -253,7 +256,7 @@ class ApplicationCommandManager extends CachedManager {
       nsfw: command.nsfw,
       description_localizations: command.descriptionLocalizations ?? command.description_localizations,
       type: command.type,
-      options: command.options?.map(o => ApplicationCommand.transformOption(o)),
+      options: command.options?.map(option => ApplicationCommand.transformOption(option)),
       default_member_permissions,
       dm_permission: command.dmPermission ?? command.dm_permission,
     };

packages/discord.js/src/managers/ApplicationCommandPermissionsManager.js

@@ -210,17 +210,17 @@ class ApplicationCommandPermissionsManager extends BaseManager {
       );
     }
 
-    let existing = [];
+    let existingPermissions = [];
     try {
-      existing = await this.fetch({ guild: guildId, command: commandId });
+      existingPermissions = await this.fetch({ guild: guildId, command: commandId });
     } catch (error) {
       if (error.code !== RESTJSONErrorCodes.UnknownApplicationCommandPermissions) throw error;
     }
 
     const newPermissions = permissions.slice();
-    for (const perm of existing) {
-      if (!newPermissions.some(x => x.id === perm.id)) {
-        newPermissions.push(perm);
+    for (const existingPermission of existingPermissions) {
+      if (!newPermissions.some(newPermission => newPermission.id === existingPermission.id)) {
+        newPermissions.push(existingPermission);
       }
     }
 

packages/discord.js/src/managers/CategoryChannelChildManager.js

@@ -23,7 +23,7 @@ class CategoryChannelChildManager extends DataManager {
    * @readonly
    */
   get cache() {
-    return this.guild.channels.cache.filter(c => c.parentId === this.channel.id);
+    return this.guild.channels.cache.filter(channel => channel.parentId === this.channel.id);
   }
 
   /**

packages/discord.js/src/managers/GuildChannelManager.js

@@ -166,7 +166,7 @@ class GuildChannelManager extends CachedManager {
     reason,
   }) {
     parent &&= this.client.channels.resolveId(parent);
-    permissionOverwrites &&= permissionOverwrites.map(o => PermissionOverwrites.resolve(o, this.guild));
+    permissionOverwrites &&= permissionOverwrites.map(overwrite => PermissionOverwrites.resolve(overwrite, this.guild));
 
     const data = await this.client.rest.post(Routes.guildChannels(this.guild.id), {
       body: {
@@ -281,19 +281,21 @@ class GuildChannelManager extends CachedManager {
       await this.setPosition(channel, options.position, { position: options.position, reason: options.reason });
     }
 
-    let permission_overwrites = options.permissionOverwrites?.map(o => PermissionOverwrites.resolve(o, this.guild));
+    let permission_overwrites = options.permissionOverwrites?.map(overwrite =>
+      PermissionOverwrites.resolve(overwrite, this.guild),
+    );
 
     if (options.lockPermissions) {
       if (parent) {
         const newParent = this.guild.channels.resolve(parent);
         if (newParent?.type === ChannelType.GuildCategory) {
-          permission_overwrites = newParent.permissionOverwrites.cache.map(o =>
-            PermissionOverwrites.resolve(o, this.guild),
+          permission_overwrites = newParent.permissionOverwrites.cache.map(overwrite =>
+            PermissionOverwrites.resolve(overwrite, this.guild),
           );
         }
       } else if (channel.parent) {
-        permission_overwrites = channel.parent.permissionOverwrites.cache.map(o =>
-          PermissionOverwrites.resolve(o, this.guild),
+        permission_overwrites = channel.parent.permissionOverwrites.cache.map(overwrite =>
+          PermissionOverwrites.resolve(overwrite, this.guild),
         );
       }
     }
@@ -438,11 +440,11 @@ class GuildChannelManager extends CachedManager {
    *   .catch(console.error);
    */
   async setPositions(channelPositions) {
-    channelPositions = channelPositions.map(r => ({
-      id: this.client.channels.resolveId(r.channel),
-      position: r.position,
-      lock_permissions: r.lockPermissions,
-      parent_id: r.parent !== undefined ? this.resolveId(r.parent) : undefined,
+    channelPositions = channelPositions.map(channelPosition => ({
+      id: this.client.channels.resolveId(channelPosition.channel),
+      position: channelPosition.position,
+      lock_permissions: channelPosition.lockPermissions,
+      parent_id: channelPosition.parent !== undefined ? this.resolveId(channelPosition.parent) : undefined,
     }));
 
     await this.client.rest.patch(Routes.guildChannels(this.guild.id), { body: channelPositions });

packages/discord.js/src/managers/GuildEmojiManager.js

@@ -130,7 +130,7 @@ class GuildEmojiManager extends BaseGuildEmojiManager {
   async edit(emoji, options) {
     const id = this.resolveId(emoji);
     if (!id) throw new DiscordjsTypeError(ErrorCodes.InvalidType, 'emoji', 'EmojiResolvable', true);
-    const roles = options.roles?.map(r => this.guild.roles.resolveId(r));
+    const roles = options.roles?.map(role => this.guild.roles.resolveId(role));
     const newData = await this.client.rest.patch(Routes.guildEmoji(this.guild.id, id), {
       body: {
         name: options.name,

packages/discord.js/src/managers/MessageManager.js

@@ -86,7 +86,8 @@ class MessageManager extends CachedManager {
    * @example
    * // Fetch messages and filter by a user id
    * channel.messages.fetch()
-   *   .then(messages => console.log(`${messages.filter(m => m.author.id === '84484653687267328').size} messages`))
+   *   .then(messages => console.log(`${messages.filter(message =>
+   *          message.author.id === '84484653687267328').size} messages`))
    *   .catch(console.error);
    */
   fetch(options) {

packages/discord.js/src/managers/RoleManager.js

@@ -280,9 +280,9 @@ class RoleManager extends CachedManager {
    */
   async setPositions(rolePositions) {
     // Make sure rolePositions are prepared for API
-    rolePositions = rolePositions.map(o => ({
-      id: this.resolveId(o.role),
-      position: o.position,
+    rolePositions = rolePositions.map(rolePosition => ({
+      id: this.resolveId(rolePosition.role),
+      position: rolePosition.position,
     }));
 
     // Call the API to update role positions