Merge branch 'master' of https://github.com/auguwu/Wumpcord

src/models/Guild.ts

@@ -461,13 +461,13 @@ export class Guild extends Base<IGuild> {
         this.members.cache = event.members;
         if (limit && event.members.size >= limit) {
           clearTimeout(timeout);
-          this.client.remove('guildMembersChunk', handler);
+          this.client.removeListener('guildMembersChunk', handler);
 
           return resolve(event.members);
         }
 
         clearTimeout(timeout);
-        this.client.remove('guildMembersChunk', handler);
+        this.client.removeListener('guildMembersChunk', handler);
         return resolve(event.members);
       };
 

src/voice/VoiceConnectionManager.ts

@@ -26,7 +26,6 @@ import type { GatewayVoiceServerUpdateDispatchData } from 'discord-api-types';
 import type WebSocketClient from '../gateway/WebSocketClient';
 import VoiceConnection from './VoiceConnection';
 import { Collection } from '@augu/collections';
-import type { User } from '../models';
 
 interface PendingGuild {
   resolve(connection: VoiceConnection): void;
@@ -111,7 +110,7 @@ export default class VoiceConnectionManager extends Collection<string, VoiceConn
       this.debug(`Established a voice connection (guild_id=${data.guild_id})`);
       pending.resolve(connection);
 
-      connection.remove('establish', establishHandler);
+      connection.removeListener('establish', establishHandler);
       delete this.pending[data.guild_id];
     };
 

tests/Utilities.spec.ts

@@ -21,7 +21,6 @@
  */
 
 import Permissions from '../src/util/Permissions';
-import EventBus from '../src/util/EventBus';
 import Util from '../src/util';
 
 describe('Util', () => {
@@ -39,36 +38,6 @@ describe('Util', () => {
   });
 });
 
-interface EventBusMap {
-  test(message: string): void;
-}
-
-describe('EventBus', () => {
-  let bus!: EventBus<EventBusMap>;
-
-  beforeAll(() => {
-    bus = new EventBus();
-  });
-
-  afterEach(() => bus.removeAllListeners());
-
-  it('should return `test` as the message content', () => {
-    bus.on('test', (msg) => {
-      expect(msg).toStrictEqual('test');
-    });
-
-    bus.emit('test', 'test');
-  });
-
-  it('should not return `test` as the message content', () => {
-    bus.on('test', msg => {
-      expect(msg).not.toStrictEqual('test');
-    });
-
-    bus.emit('test', 'ea sports');
-  });
-});
-
 describe('Permissions', () => {
   let permissions: Permissions;