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

refactor: more oop with stores (#2216)

Browse Source 
* refactor: more oop with stores

* forgot bulk delete

* Revert "forgot bulk delete"

This reverts commit 1b4fb999ee07b358ee6e1af9efb8981b84f83af1.

* appease linter

* missed some


shh

* fail
This commit is contained in:
Isabella
2018-01-11 10:33:30 -06:00
committed by Amish Shah
parent 90fc161159
commit 9eac19d9d8
38 changed files with 364 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/actions/ChannelCreate.js
View File

@@ -5,7 +5,7 @@ class ChannelCreateAction extends Action {
handle(data) {
const client = this.client;
const existing = client.channels.has(data.id);
const channel = client.channels.create(data);
const channel = client.channels.add(data);
if (!existing && channel) {
client.emit(Events.CHANNEL_CREATE, channel);
}

2
src/client/actions/GuildBanRemove.js
View File

@@ -5,7 +5,7 @@ class GuildBanRemove extends Action {
handle(data) {
const client = this.client;
const guild = client.guilds.get(data.guild_id);
const user = client.users.create(data.user);
const user = client.users.add(data.user);
if (guild && user) client.emit(Events.GUILD_BAN_REMOVE, guild, user);
}
}

2
src/client/actions/GuildEmojiCreate.js
View File

@@ -3,7 +3,7 @@ const { Events } = require('../../util/Constants');
class GuildEmojiCreateAction extends Action {
handle(guild, createdEmoji) {
const emoji = guild.emojis.create(createdEmoji);
const emoji = guild.emojis.add(createdEmoji);
this.client.emit(Events.GUILD_EMOJI_CREATE, emoji);
return { emoji };
}

2
src/client/actions/GuildRoleCreate.js
View File

@@ -8,7 +8,7 @@ class GuildRoleCreate extends Action {
let role;
if (guild) {
const already = guild.roles.has(data.role.id);
role = guild.roles.create(data.role);
role = guild.roles.add(data.role);
if (!already) client.emit(Events.GUILD_ROLE_CREATE, role);
}
return { role };

4
src/client/actions/GuildSync.js
View File

@@ -7,7 +7,7 @@ class GuildSync extends Action {
const guild = client.guilds.get(data.id);
if (guild) {
if (data.presences) {
for (const presence of data.presences) guild.presences.create(presence);
for (const presence of data.presences) guild.presences.add(presence);
}
if (data.members) {
@@ -16,7 +16,7 @@ class GuildSync extends Action {
if (member) {
member._patch(syncMember);
} else {
guild.members.create(syncMember, false);
guild.members.add(syncMember, false);
}
}
}

2
src/client/actions/MessageCreate.js
View File

@@ -8,7 +8,7 @@ class MessageCreateAction extends Action {
if (channel) {
const existing = channel.messages.get(data.id);
if (existing) return { message: existing };
const message = channel.messages.create(data);
const message = channel.messages.add(data);
const user = message.author;
const member = channel.guild ? channel.guild.member(user) : null;
channel.lastMessageID = data.id;

2
src/client/actions/MessageReactionAdd.js
View File

@@ -19,7 +19,7 @@ class MessageReactionAdd extends Action {
if (!message) return false;
if (!data.emoji) return false;
// Verify reaction
const reaction = message.reactions.create({
const reaction = message.reactions.add({
emoji: data.emoji,
count: 0,
me: user.id === this.client.user.id,

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

@@ -15,7 +15,7 @@ class GuildCreateHandler extends AbstractHandler {
}
} else {
// A new guild
guild = client.guilds.create(data);
guild = client.guilds.add(data);
const emitEvent = client.ws.connection.status === Status.READY;
if (emitEvent) {
/**

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

@@ -10,7 +10,7 @@ class GuildMemberAddHandler extends AbstractHandler {
const guild = client.guilds.get(data.guild_id);
if (guild) {
guild.memberCount++;
const member = guild.members.create(data);
const member = guild.members.add(data);
if (client.ws.connection.status === Status.READY) {
client.emit(Events.GUILD_MEMBER_ADD, member);
}

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

@@ -10,7 +10,7 @@ class GuildMembersChunkHandler extends AbstractHandler {
if (!guild) return;
const members = new Collection();
for (const member of data.members) members.set(member.user.id, guild.members.create(member));
for (const member of data.members) members.set(member.user.id, guild.members.add(member));
client.emit(Events.GUILD_MEMBERS_CHUNK, members, guild);

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

@@ -11,7 +11,7 @@ class PresenceUpdateHandler extends AbstractHandler {
// Step 1
if (!user) {
if (data.user.username) {
user = client.users.create(data.user);
user = client.users.add(data.user);
} else {
return;
}
@@ -25,7 +25,7 @@ class PresenceUpdateHandler extends AbstractHandler {
if (guild) {
let member = guild.members.get(user.id);
if (!member && data.status !== 'offline') {
member = guild.members.create({
member = guild.members.add({
user,
roles: data.roles,
deaf: false,
@@ -35,17 +35,17 @@ class PresenceUpdateHandler extends AbstractHandler {
}
if (member) {
if (client.listenerCount(Events.PRESENCE_UPDATE) === 0) {
guild.presences.create(data);
guild.presences.add(data);
return;
}
const oldMember = member._clone();
if (member.presence) {
oldMember.frozenPresence = member.presence._clone();
}
guild.presences.create(data);
guild.presences.add(data);
client.emit(Events.PRESENCE_UPDATE, oldMember, member);
} else {
guild.presences.create(data);
guild.presences.add(data);
}
}
}

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

@@ -18,11 +18,11 @@ class ReadyHandler extends AbstractHandler {
client.readyAt = new Date();
client.users.set(clientUser.id, clientUser);
for (const guild of data.guilds) client.guilds.create(guild);
for (const privateDM of data.private_channels) client.channels.create(privateDM);
for (const guild of data.guilds) client.guilds.add(guild);
for (const privateDM of data.private_channels) client.channels.add(privateDM);
for (const relation of data.relationships) {
const user = client.users.create(relation.user);
const user = client.users.add(relation.user);
if (relation.type === 1) {
client.user.friends.set(user.id, user);
} else if (relation.type === 2) {
@@ -30,7 +30,7 @@ class ReadyHandler extends AbstractHandler {
}
}
for (const presence of data.presences || []) client.presences.create(presence);
for (const presence of data.presences || []) client.presences.add(presence);
if (data.notes) {
for (const user in data.notes) {
@@ -42,7 +42,7 @@ class ReadyHandler extends AbstractHandler {
}
if (!client.users.has('1')) {
client.users.create({
client.users.add({
id: '1',
username: 'Clyde',
discriminator: '0000',