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

Migrate most of the Client Data Store to Clien

Browse Source
This commit is contained in:
Amish Shah
2016-08-19 22:21:30 +01:00
parent ad8b4c7698
commit 82ab92ca2a
31 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,11 +167,11 @@ class WebSocketManager {
* the `READY` event.
* @returns {null}
*/
checkIfReady() {
checkIfReady(a) {
if (this.status !== Constants.Status.READY) {
let unavailableCount = 0;
for (const guildID in this.client.store.data.guilds) {
unavailableCount += this.client.store.data.guilds[guildID].available ? 0 : 1;
for (const guildID of this.client.guilds.keys()) {
unavailableCount += this.client.guilds.get(guildID).available ? 0 : 1;
}
if (unavailableCount === 0) {

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

@@ -9,8 +9,8 @@ class GuildBanAddHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const user = client.store.get('users', data.user.id);
const guild = client.guilds.get(data.guild_id);
const user = client.users.get(data.user.id);
if (guild && user) {
client.emit(Constants.Events.GUILD_BAN_ADD, guild, user);

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

@@ -10,8 +10,8 @@ class GuildBanRemoveHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const user = client.store.get('users', data.user.id);
const guild = client.guilds.get(data.guild_id);
const user = client.users.get(data.user.id);
if (guild && user) {
client.emit(Constants.Events.GUILD_BAN_REMOVE, guild, user);

2
src/client/websocket/packets/handlers/GuildCreate.js
View File

@@ -6,7 +6,7 @@ class GuildCreateHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.id);
const guild = client.guilds.get(data.id);
if (guild) {
if (!guild.available && !data.unavailable) {

2
src/client/websocket/packets/handlers/GuildMemberAdd.js
View File

@@ -8,7 +8,7 @@ class GuildMemberAddHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const guild = client.guilds.get(data.guild_id);
if (guild) {
guild._addMember(data);

2
src/client/websocket/packets/handlers/GuildMemberUpdate.js
View File

@@ -8,7 +8,7 @@ class GuildMemberUpdateHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const guild = client.guilds.get(data.guild_id);
if (guild) {
const member = guild.members.get(data.user.id);

2
src/client/websocket/packets/handlers/GuildMembersChunk.js
View File

@@ -8,7 +8,7 @@ class GuildMembersChunkHandler extends AbstractHandler {
handle(packet) {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const guild = client.guilds.get(data.guild_id);
const members = [];
if (guild) {

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

@@ -7,8 +7,8 @@ class PresenceUpdateHandler extends AbstractHandler {
handle(packet) {
const data = packet.d;
const client = this.packetManager.client;
let user = client.store.get('users', data.user.id);
const guild = client.store.get('guilds', data.guild_id);
let user = client.users.get(data.user.id);
const guild = client.guilds.get(data.guild_id);
function makeUser(newUser) {
return client.store.newUser(newUser);

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

@@ -9,8 +9,9 @@ class ReadyHandler extends AbstractHandler {
const data = packet.d;
const client = this.packetManager.client;
client.store.user = client.store.add('users', new ClientUser(client, data.user));
const clientUser = new ClientUser(client, data.user);
client.store.user = clientUser;
client.users.set(clientUser.id, clientUser);
for (const guild of data.guilds) {
client.store.newGuild(guild);
}
@@ -21,7 +22,7 @@ class ReadyHandler extends AbstractHandler {
this.packetManager.ws.sessionID = data.session_id;
this.packetManager.ws.checkIfReady();
this.packetManager.ws.checkIfReady('abc');
}
}

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

@@ -23,8 +23,8 @@ class TypingStartHandler extends AbstractHandler {
handle(packet) {
const data = packet.d;
const client = this.packetManager.client;
const channel = client.store.get('channels', data.channel_id);
const user = client.store.get('users', data.user_id);
const channel = client.channels.get(data.channel_id);
const user = client.users.get(data.user_id);
const timestamp = new Date(data.timestamp * 1000);
function tooLate() {

2
src/client/websocket/packets/handlers/VoiceStateUpdate.js
View File

@@ -8,7 +8,7 @@ class VoiceStateUpdateHandler extends AbstractHandler {
handle(packet) {
const data = packet.d;
const client = this.packetManager.client;
const guild = client.store.get('guilds', data.guild_id);
const guild = client.guilds.get(data.guild_id);
if (guild) {
const member = guild.members.get(data.user_id);