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

Merge pull request #375 from GexoXYZ/374

Browse Source 
Fix bulk deletion error if < 2 messages (#374)
This commit is contained in:
abalabahaha
2016-05-27 09:37:34 -07:00
parent eff8caed85 ad7ffcecb4
commit e912c72a95
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Client/InternalClient.js
View File

@@ -849,7 +849,7 @@ var InternalClient = (function () {
InternalClient.prototype.deleteMessages = function deleteMessages(_messages) { InternalClient.prototype.deleteMessages = function deleteMessages(_messages) {
if (!_messages instanceof Array) return Promise.reject(new Error("Messages provided must be in an array")); if (!_messages instanceof Array) return Promise.reject(new Error("Messages provided must be in an array"));
if (_messages.length < 1) return Promise.reject(new Error("You must provide at least one message to delete")); if (_messages.length < 1) return Promise.reject(new Error("You must provide at least one message to delete"));else if (_messages.length === 1) return this.deleteMessage(_messages[0]);
var messages = []; var messages = [];
var channel; var channel;
@@ -869,6 +869,7 @@ var InternalClient = (function () {
var message = this.resolver.resolveMessage(_message); var message = this.resolver.resolveMessage(_message);
if (!message) return Promise.reject(new Error("Something other than a message could not be resolved in the array...")); if (!message) return Promise.reject(new Error("Something other than a message could not be resolved in the array..."));
if (!message.server) return Promise.reject(new Error("You can only bulk delete messages on guild channels"));
// ensure same channel // ensure same channel
if (!channel) { if (!channel) {

24
lib/Util/TokenCacher-shim.js
View File

@@ -6,23 +6,23 @@ exports.__esModule = true;
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var TokenCacher = (function () { var TokenCacher = (function () {
function TokenCacher() { function TokenCacher() {
_classCallCheck(this, TokenCacher); _classCallCheck(this, TokenCacher);
} }
TokenCacher.prototype.setToken = function setToken() {}; TokenCacher.prototype.setToken = function setToken() {};
TokenCacher.prototype.save = function save() {}; TokenCacher.prototype.save = function save() {};
TokenCacher.prototype.getToken = function getToken() { TokenCacher.prototype.getToken = function getToken() {
return null; return null;
}; };
TokenCacher.prototype.init = function init(ind) { TokenCacher.prototype.init = function init(ind) {
this.done = true; this.done = true;
}; };
return TokenCacher; return TokenCacher;
})(); })();
exports["default"] = TokenCacher; exports["default"] = TokenCacher;

7
src/Client/InternalClient.js
View File

@@ -702,7 +702,10 @@ export default class InternalClient {
if (!_messages instanceof Array) if (!_messages instanceof Array)
return Promise.reject(new Error("Messages provided must be in an array")); return Promise.reject(new Error("Messages provided must be in an array"));
if (_messages.length < 1) if (_messages.length < 1)
return Promise.reject(new Error("You must provide at least one message to delete")) return Promise.reject(new Error("You must provide at least one message to delete"));
else if (_messages.length === 1)
return this.deleteMessage(_messages[0]);
var messages = []; var messages = [];
var channel; var channel;
@@ -710,6 +713,8 @@ export default class InternalClient {
var message = this.resolver.resolveMessage(_message); var message = this.resolver.resolveMessage(_message);
if (!message) if (!message)
return Promise.reject(new Error("Something other than a message could not be resolved in the array...")); return Promise.reject(new Error("Something other than a message could not be resolved in the array..."));
if (!message.server)
return Promise.reject(new Error("You can only bulk delete messages on guild channels"));
// ensure same channel // ensure same channel
if (!channel) { if (!channel) {