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

Merge remote-tracking branch 'origin/indev-rewrite' into indev-rewrite-sharding

Browse Source
This commit is contained in:
Amish Shah
2016-08-31 13:43:18 +01:00
parent 8c3ae2fd90 b18aaa8711
commit 631626a3f9
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/ClientDataManager.js
View File

@@ -84,7 +84,7 @@ class ClientDataManager {
} }
killUser(user) { killUser(user) {
this.users.delete(user.id); this.client.users.delete(user.id);
} }
killChannel(channel) { killChannel(channel) {

2
src/structures/GuildChannel.js
View File

@@ -137,7 +137,7 @@ class GuildChannel extends Channel {
const roleOverwrites = []; const roleOverwrites = [];
const memberOverwrites = []; const memberOverwrites = [];
for (const overwrite of this.permissionOverwrites) { for (const overwrite of this.permissionOverwrites.values()) {
if (overwrite.id === member.id) { if (overwrite.id === member.id) {
memberOverwrites.push(overwrite); memberOverwrites.push(overwrite);
} else if (memberRoles.indexOf(overwrite.id) > -1) { } else if (memberRoles.indexOf(overwrite.id) > -1) {

2
src/structures/interface/TextBasedChannel.js
View File

@@ -166,7 +166,7 @@ class TextBasedChannel {
} }
if (this.messages.size >= maxSize) { if (this.messages.size >= maxSize) {
this.messages.delete(Array.from(this.messages.keys())[0]); this.messages.delete(this.messages.keys().next().value);
} }
this.messages.set(message.id, message); this.messages.set(message.id, message);

4
src/util/Collection.js
View File

@@ -77,6 +77,8 @@ class Collection extends Map {
* collection.getAll('username', 'Bob'); * collection.getAll('username', 'Bob');
*/ */
findAll(key, value) { findAll(key, value) {
if (typeof key !== 'string') throw new TypeError('key must be a string');
if (typeof value === 'undefined') throw new Error('value must be specified');
const results = []; const results = [];
for (const item of this.values()) { for (const item of this.values()) {
if (item[key] === value) { if (item[key] === value) {
@@ -95,6 +97,8 @@ class Collection extends Map {
* collection.get('id', '123123...'); * collection.get('id', '123123...');
*/ */
find(key, value) { find(key, value) {
if (typeof key !== 'string') throw new TypeError('key must be a string');
if (typeof value === 'undefined') throw new Error('value must be specified');
for (const item of this.values()) { for (const item of this.values()) {
if (item[key] === value) { if (item[key] === value) {
return item; return item;