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

Remove GuildDataStore and move towards storing data in Maps

Browse Source
This commit is contained in:
Amish Shah
2016-08-19 19:58:32 +01:00
parent 75ff9fb096
commit ed818d6e7f
13 changed files with 44 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/ClientDataResolver.js
View File

@@ -92,7 +92,7 @@ class ClientDataResolver {
return null;
}
return guild.store.get('members', user.id);
return guild.members.get(user.id);
}
/**

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

@@ -13,7 +13,7 @@ class GuildMemberRemoveAction extends Action {
const client = this.client;
const guild = client.store.get('guilds', data.guild_id);
if (guild) {
let member = guild.store.get('members', data.user.id);
let member = guild.members.get(data.user.id);
if (member) {
guild._removeMember(member);
this.deleted[guild.id + data.user.id] = member;

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

@@ -9,9 +9,9 @@ class GuildRoleCreate extends Action {
const guild = client.store.get('guilds', data.guild_id);
if (guild) {
const already = guild.store.get('roles', data.role.id);
const already = guild.roles.get(data.role.id);
const role = new Role(guild, data.role);
guild.store.add('roles', role);
guild.roles.set(role.id, role);
if (!already) {
client.emit(Constants.Events.GUILD_ROLE_CREATE, guild, role);

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

@@ -14,9 +14,9 @@ class GuildRoleDeleteAction extends Action {
const guild = client.store.get('guilds', data.guild_id);
if (guild) {
let exists = guild.store.get('roles', data.role_id);
let exists = guild.roles.get(data.role_id);
if (exists) {
guild.store.remove('roles', data.role_id);
guild.roles.remove(data.role_id);
this.deleted[guild.id + data.role_id] = exists;
this.scheduleForDeletion(guild.id, data.role_id);
client.emit(Constants.Events.GUILD_ROLE_DELETE, guild, exists);

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

@@ -12,7 +12,7 @@ class GuildRoleUpdateAction extends Action {
if (guild) {
let oldRole;
const existingRole = guild.store.get('roles', roleData.id);
const existingRole = guild.roles.get(roleData.id);
// exists and not the same
if (existingRole && !existingRole.equals(roleData)) {
oldRole = cloneObject(existingRole);

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

@@ -11,7 +11,7 @@ class GuildMemberUpdateHandler extends AbstractHandler {
const guild = client.store.get('guilds', data.guild_id);
if (guild) {
const member = guild.store.get('members', data.user.id);
const member = guild.members.get(data.user.id);
if (member) {
guild._updateMember(member, data);
}

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

@@ -24,7 +24,7 @@ class PresenceUpdateHandler extends AbstractHandler {
}
if (guild) {
const memberInGuild = guild.store.get('members', user.id);
const memberInGuild = guild.members.get(user.id);
if (!memberInGuild) {
const member = guild._addMember({
user,

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

@@ -11,7 +11,7 @@ class VoiceStateUpdateHandler extends AbstractHandler {
const guild = client.store.get('guilds', data.guild_id);
if (guild) {
const member = guild.store.get('members', data.user_id);
const member = guild.members.get(data.user_id);
if (member) {
const oldVoiceChannelMember = cloneObject(member);
if (member.voiceChannel && member.voiceChannel.id !== data.channel_id) {