refactor: remove extended collection (#6246)

Co-authored-by: iCrawl <buechler.noel@outlook.com>
discordjs · Jul 31, 2021 · 00bae4f · 00bae4f
1 parent 65ae064
commit 00bae4f
Show file tree

Hide file tree

Showing 49 changed files with 56 additions and 75 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
   "homepage": "https://github.com/discordjs/discord.js#readme",
   "dependencies": {
     "@discordjs/builders": "^0.2.0",
-    "@discordjs/collection": "^0.2.0",
+    "@discordjs/collection": "^0.2.1",
     "@discordjs/form-data": "^3.0.1",
     "@sapphire/async-queue": "^1.1.4",
     "@types/ws": "^7.4.5",

diff --git a/src/client/Client.js b/src/client/Client.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseClient = require('./BaseClient');
 const ActionsManager = require('./actions/ActionsManager');
 const ClientVoiceManager = require('./voice/ClientVoiceManager');
@@ -19,7 +20,6 @@ const StickerPack = require('../structures/StickerPack');
 const VoiceRegion = require('../structures/VoiceRegion');
 const Webhook = require('../structures/Webhook');
 const Widget = require('../structures/Widget');
-const Collection = require('../util/Collection');
 const { Events, InviteScopes, Status } = require('../util/Constants');
 const DataResolver = require('../util/DataResolver');
 const Intents = require('../util/Intents');

diff --git a/src/client/actions/MessageDeleteBulk.js b/src/client/actions/MessageDeleteBulk.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Action = require('./Action');
-const Collection = require('../../util/Collection');
 const { Events } = require('../../util/Constants');
 
 class MessageDeleteBulkAction extends Action {

diff --git a/src/client/actions/ThreadListSync.js b/src/client/actions/ThreadListSync.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Action = require('./Action');
-const Collection = require('../../util/Collection');
 const { Events } = require('../../util/Constants');
 
 class ThreadListSyncAction extends Action {

diff --git a/src/client/websocket/WebSocketManager.js b/src/client/websocket/WebSocketManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const EventEmitter = require('events');
+const { Collection } = require('@discordjs/collection');
 const WebSocketShard = require('./WebSocketShard');
 const PacketHandlers = require('./handlers');
 const { Error } = require('../../errors');
-const Collection = require('../../util/Collection');
 const { Events, ShardEvents, Status, WSCodes, WSEvents } = require('../../util/Constants');
 const Util = require('../../util/Util');
 

diff --git a/src/client/websocket/handlers/GUILD_MEMBERS_CHUNK.js b/src/client/websocket/handlers/GUILD_MEMBERS_CHUNK.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const Collection = require('../../../util/Collection');
+const { Collection } = require('@discordjs/collection');
 const { Events } = require('../../../util/Constants');
 
 module.exports = (client, { d: data }) => {

diff --git a/src/index.js b/src/index.js
@@ -14,7 +14,7 @@ module.exports = {
   ApplicationFlags: require('./util/ApplicationFlags'),
   BaseManager: require('./managers/BaseManager'),
   BitField: require('./util/BitField'),
-  Collection: require('./util/Collection'),
+  Collection: require('@discordjs/collection').Collection,
   Constants: require('./util/Constants'),
   DataResolver: require('./util/DataResolver'),
   DiscordAPIError: require('./rest/DiscordAPIError'),

diff --git a/src/managers/ApplicationCommandManager.js b/src/managers/ApplicationCommandManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const ApplicationCommandPermissionsManager = require('./ApplicationCommandPermissionsManager');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ApplicationCommand = require('../structures/ApplicationCommand');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for application commands and stores their cache.

diff --git a/src/managers/ApplicationCommandPermissionsManager.js b/src/managers/ApplicationCommandPermissionsManager.js
@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseManager = require('./BaseManager');
 const { Error, TypeError } = require('../errors');
-const Collection = require('../util/Collection');
 const { ApplicationCommandPermissionTypes, APIErrors } = require('../util/Constants');
 
 /**

diff --git a/src/managers/GuildBanManager.js b/src/managers/GuildBanManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError, Error } = require('../errors');
 const GuildBan = require('../structures/GuildBan');
 const GuildMember = require('../structures/GuildMember');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for GuildBans and stores their cache.

diff --git a/src/managers/GuildChannelManager.js b/src/managers/GuildChannelManager.js
@@ -1,11 +1,11 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const GuildChannel = require('../structures/GuildChannel');
 const PermissionOverwrites = require('../structures/PermissionOverwrites');
 const ThreadChannel = require('../structures/ThreadChannel');
-const Collection = require('../util/Collection');
 const { ChannelTypes, ThreadChannelTypes } = require('../util/Constants');
 
 /**

diff --git a/src/managers/GuildEmojiManager.js b/src/managers/GuildEmojiManager.js
@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const BaseGuildEmojiManager = require('./BaseGuildEmojiManager');
 const { TypeError } = require('../errors');
-const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
 
 /**

diff --git a/src/managers/GuildEmojiRoleManager.js b/src/managers/GuildEmojiRoleManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const DataManager = require('./DataManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for roles belonging to emojis and stores their cache.

diff --git a/src/managers/GuildInviteManager.js b/src/managers/GuildInviteManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const Invite = require('../structures/Invite');
-const Collection = require('../util/Collection');
 const DataResolver = require('../util/DataResolver');
 
 /**

diff --git a/src/managers/GuildManager.js b/src/managers/GuildManager.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const Guild = require('../structures/Guild');
 const GuildChannel = require('../structures/GuildChannel');
@@ -8,7 +9,6 @@ const GuildMember = require('../structures/GuildMember');
 const Invite = require('../structures/Invite');
 const OAuth2Guild = require('../structures/OAuth2Guild');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const {
   ChannelTypes,
   Events,

diff --git a/src/managers/GuildMemberManager.js b/src/managers/GuildMemberManager.js
@@ -1,11 +1,11 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error, TypeError, RangeError } = require('../errors');
 const BaseGuildVoiceChannel = require('../structures/BaseGuildVoiceChannel');
 const GuildMember = require('../structures/GuildMember');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const { Events, Opcodes } = require('../util/Constants');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 

diff --git a/src/managers/GuildMemberRoleManager.js b/src/managers/GuildMemberRoleManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const DataManager = require('./DataManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for roles of a GuildMember and stores their cache.

diff --git a/src/managers/GuildStickerManager.js b/src/managers/GuildStickerManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const MessagePayload = require('../structures/MessagePayload');
 const Sticker = require('../structures/Sticker');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for Guild Stickers and stores their cache.

diff --git a/src/managers/MessageManager.js b/src/managers/MessageManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const Message = require('../structures/Message');
 const MessagePayload = require('../structures/MessagePayload');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for Messages and holds their cache.

diff --git a/src/managers/PermissionOverwriteManager.js b/src/managers/PermissionOverwriteManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const PermissionOverwrites = require('../structures/PermissionOverwrites');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const { OverwriteTypes } = require('../util/Constants');
 
 /**

diff --git a/src/managers/ReactionUserManager.js b/src/managers/ReactionUserManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { Error } = require('../errors');
 const User = require('../structures/User');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for users who reacted to a reaction and stores their cache.

diff --git a/src/managers/RoleManager.js b/src/managers/RoleManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const Role = require('../structures/Role');
-const Collection = require('../util/Collection');
 const Permissions = require('../util/Permissions');
 const { resolveColor, setPosition } = require('../util/Util');
 

diff --git a/src/managers/ThreadManager.js b/src/managers/ThreadManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ThreadChannel = require('../structures/ThreadChannel');
-const Collection = require('../util/Collection');
 const { ChannelTypes } = require('../util/Constants');
 
 /**

diff --git a/src/managers/ThreadMemberManager.js b/src/managers/ThreadMemberManager.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const CachedManager = require('./CachedManager');
 const { TypeError } = require('../errors');
 const ThreadMember = require('../structures/ThreadMember');
-const Collection = require('../util/Collection');
 
 /**
  * Manages API methods for GuildMembers and stores their cache.

diff --git a/src/rest/RESTManager.js b/src/rest/RESTManager.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const APIRequest = require('./APIRequest');
 const routeBuilder = require('./APIRouter');
 const RequestHandler = require('./RequestHandler');
 const { Error } = require('../errors');
-const Collection = require('../util/Collection');
 const { Endpoints } = require('../util/Constants');
 
 class RESTManager {

diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js
@@ -3,9 +3,9 @@
 const EventEmitter = require('events');
 const fs = require('fs');
 const path = require('path');
+const { Collection } = require('@discordjs/collection');
 const Shard = require('./Shard');
 const { Error, TypeError, RangeError } = require('../errors');
-const Collection = require('../util/Collection');
 const Util = require('../util/Util');
 
 /**

diff --git a/src/structures/BaseGuildVoiceChannel.js b/src/structures/BaseGuildVoiceChannel.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const GuildChannel = require('./GuildChannel');
-const Collection = require('../util/Collection');
 const Permissions = require('../util/Permissions');
 
 /**

diff --git a/src/structures/Guild.js b/src/structures/Guild.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const AnonymousGuild = require('./AnonymousGuild');
 const GuildAuditLogs = require('./GuildAuditLogs');
 const GuildPreview = require('./GuildPreview');
@@ -19,7 +20,6 @@ const PresenceManager = require('../managers/PresenceManager');
 const RoleManager = require('../managers/RoleManager');
 const StageInstanceManager = require('../managers/StageInstanceManager');
 const VoiceStateManager = require('../managers/VoiceStateManager');
-const Collection = require('../util/Collection');
 const {
   ChannelTypes,
   DefaultMessageNotificationLevels,

diff --git a/src/structures/GuildAuditLogs.js b/src/structures/GuildAuditLogs.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Integration = require('./Integration');
 const StageInstance = require('./StageInstance');
 const Sticker = require('./Sticker');
 const Webhook = require('./Webhook');
-const Collection = require('../util/Collection');
 const { OverwriteTypes, PartialTypes } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 const SnowflakeUtil = require('../util/SnowflakeUtil');

diff --git a/src/structures/GuildChannel.js b/src/structures/GuildChannel.js
@@ -1,10 +1,10 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Channel = require('./Channel');
 const PermissionOverwrites = require('./PermissionOverwrites');
 const { Error } = require('../errors');
 const PermissionOverwriteManager = require('../managers/PermissionOverwriteManager');
-const Collection = require('../util/Collection');
 const { ChannelTypes, VoiceBasedChannelTypes } = require('../util/Constants');
 const Permissions = require('../util/Permissions');
 const Util = require('../util/Util');

diff --git a/src/structures/GuildPreview.js b/src/structures/GuildPreview.js
@@ -1,8 +1,8 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Base = require('./Base');
 const GuildPreviewEmoji = require('./GuildPreviewEmoji');
-const Collection = require('../util/Collection');
 const SnowflakeUtil = require('../util/SnowflakeUtil');
 
 /**

diff --git a/src/structures/InteractionCollector.js b/src/structures/InteractionCollector.js
@@ -1,7 +1,7 @@
 'use strict';
 
+const { Collection } = require('@discordjs/collection');
 const Collector = require('./interfaces/Collector');
-const Collection = require('../util/Collection');
 const { Events } = require('../util/Constants');
 const { InteractionTypes, MessageComponentTypes } = require('../util/Constants');