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

Minor patching

Browse Source
This commit is contained in:
abalabahaha
2016-02-02 05:59:55 -08:00
parent b7c1b6ebe6
commit 9173ded903
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Client/InternalClient.js
View File

@@ -843,8 +843,6 @@ var InternalClient = (function () {
}; };
}; };
console.log(roleIDs);
return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(roles[0].server.id) + "/" + member.id, true, { return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(roles[0].server.id) + "/" + member.id, true, {
roles: roleIDs roles: roleIDs
}); });
@@ -1374,7 +1372,6 @@ var InternalClient = (function () {
} }
break; break;
case _Constants.PacketType.MESSAGE_DELETE: case _Constants.PacketType.MESSAGE_DELETE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete
var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
if (channel) { if (channel) {
// potentially blank // potentially blank
@@ -1382,6 +1379,8 @@ var InternalClient = (function () {
client.emit("messageDeleted", msg, channel); client.emit("messageDeleted", msg, channel);
if (msg) { if (msg) {
channel.messages.remove(msg); channel.messages.remove(msg);
} else {
client.emit("warn", "message was deleted but message is not cached");
} }
} else { } else {
client.emit("warn", "message was deleted but channel is not cached"); client.emit("warn", "message was deleted but channel is not cached");

4
lib/Util/Cache.js
View File

@@ -26,7 +26,7 @@ var Cache = (function (_Array) {
key = null; key = null;
} else if (key === this[discrimS] && typeof value === "string") { } else if (key === this[discrimS] && typeof value === "string") {
return this[discrimCacheS][value] || null; return this[discrimCacheS][value] || null;
} else if (value.constructor.name === 'RegExp') { } else if (value && value.constructor.name === 'RegExp') {
var valid = function valid(item) { var valid = function valid(item) {
return value.test(item); return value.test(item);
}; };
@@ -68,7 +68,7 @@ var Cache = (function (_Array) {
if (typeof key === 'function') { if (typeof key === 'function') {
var valid = key; var valid = key;
key = null; key = null;
} else if (value.constructor.name === 'RegExp') { } else if (value && value.constructor.name === 'RegExp') {
var valid = function valid(item) { var valid = function valid(item) {
return value.test(item); return value.test(item);
}; };

5
src/Client/InternalClient.js
View File

@@ -690,8 +690,6 @@ export default class InternalClient {
}; };
}; };
console.log(roleIDs);
return this.apiRequest( return this.apiRequest(
"patch", "patch",
`${Endpoints.SERVER_MEMBERS(roles[0].server.id)}/${member.id}`, `${Endpoints.SERVER_MEMBERS(roles[0].server.id)}/${member.id}`,
@@ -1169,7 +1167,6 @@ export default class InternalClient {
} }
break; break;
case PacketType.MESSAGE_DELETE: case PacketType.MESSAGE_DELETE:
// format https://discordapi.readthedocs.org/en/latest/reference/channels/messages.html#message-delete
var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id); var channel = self.channels.get("id", data.channel_id) || self.private_channels.get("id", data.channel_id);
if (channel) { if (channel) {
// potentially blank // potentially blank
@@ -1177,6 +1174,8 @@ export default class InternalClient {
client.emit("messageDeleted", msg, channel); client.emit("messageDeleted", msg, channel);
if (msg) { if (msg) {
channel.messages.remove(msg); channel.messages.remove(msg);
} else {
client.emit("warn", "message was deleted but message is not cached");
} }
} else { } else {
client.emit("warn", "message was deleted but channel is not cached"); client.emit("warn", "message was deleted but channel is not cached");

4
src/Util/Cache.js
View File

@@ -16,7 +16,7 @@ export default class Cache extends Array {
key = null; key = null;
} else if (key === this[discrimS] && typeof value === "string") { } else if (key === this[discrimS] && typeof value === "string") {
return this[discrimCacheS][value] || null; return this[discrimCacheS][value] || null;
} else if (value.constructor.name === 'RegExp') { } else if (value && value.constructor.name === 'RegExp') {
var valid = function valid(item) { var valid = function valid(item) {
return value.test(item); return value.test(item);
} }
@@ -45,7 +45,7 @@ export default class Cache extends Array {
if (typeof key === 'function') { if (typeof key === 'function') {
var valid = key; var valid = key;
key = null; key = null;
} else if (value.constructor.name === 'RegExp') { } else if (value && value.constructor.name === 'RegExp') {
var valid = function valid(item) { var valid = function valid(item) {
return value.test(item); return value.test(item);
} }