Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-12 01:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed DataStore, deprecation leftovers and a bit of Event Constants (#1841)

Browse Source 
* Fixed leftover fetchThing and removed unused methods/error messages

* Added resume event constant and used event constants wherever possible

* Replaced mentions of removed method name with their new name.

* Fixed typo: resume -> resumed
This commit is contained in:
SpaceEEC
2017-08-28 00:11:28 +02:00
committed by Crawl
parent c4fecf6609
commit 65d9d46a3c
13 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/Client.js
View File

@@ -365,7 +365,7 @@ class Client extends EventEmitter {
throw new TypeError('CLIENT_INVALID_OPTION', 'Lifetime', 'a number');
}
if (lifetime <= 0) {
this.emit('debug', 'Didn\'t sweep messages - lifetime is unlimited');
this.emit(Constants.Events.DEBUG, 'Didn\'t sweep messages - lifetime is unlimited');
return -1;
}
@@ -386,7 +386,8 @@ class Client extends EventEmitter {
}
}
this.emit('debug', `Swept ${messages} messages older than ${lifetime} seconds in ${channels} text-based channels`);
this.emit(Constants.Events.DEBUG,
`Swept ${messages} messages older than ${lifetime} seconds in ${channels} text-based channels`);
return messages;
}

2
src/client/websocket/WebSocketManager.js
View File

@@ -37,7 +37,7 @@ class WebSocketManager extends EventEmitter {
* @returns {void}
*/
debug(message) {
return this.client.emit('debug', `[ws] ${message}`);
return this.client.emit(Constants.Events.DEBUG, `[ws] ${message}`);
}
/**

4
src/client/websocket/packets/handlers/Ready.js
View File

@@ -1,5 +1,5 @@
const AbstractHandler = require('./AbstractHandler');
const Constants = require('../../../../util/Constants');
const ClientUser = require('../../../../structures/ClientUser');
class ReadyHandler extends AbstractHandler {
@@ -73,7 +73,7 @@ class ReadyHandler extends AbstractHandler {
ws.sessionID = data.session_id;
ws._trace = data._trace;
client.emit('debug', `READY ${ws._trace.join(' -> ')} ${ws.sessionID}`);
client.emit(Constants.Events.DEBUG, `READY ${ws._trace.join(' -> ')} ${ws.sessionID}`);
ws.checkIfReady();
}
}

4
src/client/websocket/packets/handlers/RelationshipAdd.js
View File

@@ -5,11 +5,11 @@ class RelationshipAddHandler extends AbstractHandler {
const client = this.packetManager.client;
const data = packet.d;
if (data.type === 1) {
client.fetchUser(data.id).then(user => {
client.users.fetch(data.id).then(user => {
client.user.friends.set(user.id, user);
});
} else if (data.type === 2) {
client.fetchUser(data.id).then(user => {
client.users.fetch(data.id).then(user => {
client.user.blocked.set(user.id, user);
});
}

6
src/client/websocket/packets/handlers/Resumed.js
View File

@@ -14,14 +14,14 @@ class ResumedHandler extends AbstractHandler {
const replayed = ws.sequence - ws.closeSequence;
ws.debug(`RESUMED ${ws._trace.join(' -> ')} | replayed ${replayed} events.`);
client.emit('resume', replayed);
client.emit(Constants.Events.RESUMED, replayed);
ws.heartbeat();
}
}
/**
* Emitted whenever a WebSocket resumes.
* @event Client#resume
* Emitted whenever a WebSocket resumed.
* @event Client#resumed
* @param {number} replayed The number of events that were replayed
*/