Files
discord.js/lib/Client/Resolver/Resolver.js
SooYou fd5c981d83 fix resolveServer undefined when TextChannel
So far it has been the case that resolveServer has been returning
undefined in the case that the resource was a Message from a TextChannel.
This was the case because the conditional returned the value of member
"server" in the Message object. The Message object doesn't have a server
member though. The fix is to use the "channel" member of the Message
object and return its "server" member which was likely the original
intention considering the if statement.
2016-02-06 18:18:00 +01:00

296 lines
8.2 KiB
JavaScript

"use strict";
/* global Buffer */
exports.__esModule = true;
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var _fs = require("fs");
var _fs2 = _interopRequireDefault(_fs);
var _superagent = require("superagent");
var _superagent2 = _interopRequireDefault(_superagent);
var _StructuresUser = require("../../Structures/User");
var _StructuresUser2 = _interopRequireDefault(_StructuresUser);
var _StructuresChannel = require("../../Structures/Channel");
var _StructuresChannel2 = _interopRequireDefault(_StructuresChannel);
var _StructuresTextChannel = require("../../Structures/TextChannel");
var _StructuresTextChannel2 = _interopRequireDefault(_StructuresTextChannel);
var _StructuresVoiceChannel = require("../../Structures/VoiceChannel");
var _StructuresVoiceChannel2 = _interopRequireDefault(_StructuresVoiceChannel);
var _StructuresServerChannel = require("../../Structures/ServerChannel");
var _StructuresServerChannel2 = _interopRequireDefault(_StructuresServerChannel);
var _StructuresPMChannel = require("../../Structures/PMChannel");
var _StructuresPMChannel2 = _interopRequireDefault(_StructuresPMChannel);
var _StructuresRole = require("../../Structures/Role");
var _StructuresRole2 = _interopRequireDefault(_StructuresRole);
var _StructuresServer = require("../../Structures/Server");
var _StructuresServer2 = _interopRequireDefault(_StructuresServer);
var _StructuresMessage = require("../../Structures/Message");
var _StructuresMessage2 = _interopRequireDefault(_StructuresMessage);
var _StructuresInvite = require("../../Structures/Invite");
var _StructuresInvite2 = _interopRequireDefault(_StructuresInvite);
var Resolver = (function () {
function Resolver(internal) {
_classCallCheck(this, Resolver);
this.internal = internal;
}
Resolver.prototype.resolveToBase64 = function resolveToBase64(resource) {
if (resource instanceof Buffer) {
resource = resource.toString("base64");
resource = "data:image/jpg;base64," + resource;
}
return resource;
};
Resolver.prototype.resolveInviteID = function resolveInviteID(resource) {
if (resource instanceof _StructuresInvite2["default"]) {
return resource.id;
}
if (typeof resource === "string" || resource instanceof String) {
if (resource.indexOf("http") === 0) {
var split = resource.split("/");
return split.pop();
}
return resource;
}
return null;
};
Resolver.prototype.resolveServer = function resolveServer(resource) {
if (resource instanceof _StructuresServer2["default"]) {
return resource;
}
if (resource instanceof _StructuresServerChannel2["default"]) {
return resource.server;
}
if (resource instanceof String || typeof resource === "string") {
return this.internal.servers.get("id", resource);
}
if (resource instanceof _StructuresMessage2["default"]) {
if (resource.channel instanceof _StructuresTextChannel2["default"]) {
return resource.channel.server;
}
}
return null;
};
Resolver.prototype.resolveRole = function resolveRole(resource) {
if (resource instanceof _StructuresRole2["default"]) {
return resource;
}
if (resource instanceof String || typeof resource === "string") {
var role = null;
for (var _iterator = this.internal.servers, _isArray = Array.isArray(_iterator), _i = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
var _ref;
if (_isArray) {
if (_i >= _iterator.length) break;
_ref = _iterator[_i++];
} else {
_i = _iterator.next();
if (_i.done) break;
_ref = _i.value;
}
var server = _ref;
if (role = server.roles.find(function (r) {
return r.id == resource;
})) {
return role;
}
}
}
return null;
};
Resolver.prototype.resolveFile = function resolveFile(resource) {
if (typeof resource === "string" || resource instanceof String) {
if (/^https?:\/\//.test(resource)) {
return new Promise(function (resolve, reject) {
_superagent2["default"].get(resource).end(function (err, res) {
if (err) {
reject(err);
} else if (res.text === undefined) {
resolve(res.body);
} else {
resolve(new Buffer(res.text));
}
});
});
} else {
return Promise.resolve(resource);
}
}
return Promise.resolve(resource);
};
Resolver.prototype.resolveMentions = function resolveMentions(resource) {
// resource is a string
var _mentions = [];
var changed = resource;
for (var _iterator2 = resource.match(/<@[0-9]+>/g) || [], _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
var _ref2;
if (_isArray2) {
if (_i2 >= _iterator2.length) break;
_ref2 = _iterator2[_i2++];
} else {
_i2 = _iterator2.next();
if (_i2.done) break;
_ref2 = _i2.value;
}
var mention = _ref2;
var userID = mention.substring(2, mention.length - 1);
var user = this.internal.client.users.get("id", userID);
if (user) {
_mentions.push(user);
changed = changed.replace(new RegExp(mention, "g"), "@" + user.username);
}
}
return [_mentions, changed];
};
Resolver.prototype.resolveString = function resolveString(resource) {
// accepts Array, Channel, Server, User, Message, String and anything
// toString()-able
var final = resource;
if (resource instanceof Array) {
final = resource.join("\n");
}
return final.toString();
};
Resolver.prototype.resolveUser = function resolveUser(resource) {
/*
accepts a Message, Channel, Server, String ID, User, PMChannel
*/
if (resource instanceof _StructuresUser2["default"]) {
return resource;
}
if (resource instanceof _StructuresMessage2["default"]) {
return resource.author;
}
if (resource instanceof _StructuresTextChannel2["default"]) {
var lmsg = resource.lastMessage;
if (lmsg) {
return lmsg.author;
}
}
if (resource instanceof _StructuresServer2["default"]) {
return resource.owner;
}
if (resource instanceof _StructuresPMChannel2["default"]) {
return resource.recipient;
}
if (resource instanceof String || typeof resource === "string") {
return this.internal.users.get("id", resource);
}
return null;
};
Resolver.prototype.resolveMessage = function resolveMessage(resource) {
// accepts a Message, PMChannel & TextChannel
if (resource instanceof _StructuresTextChannel2["default"] || resource instanceof _StructuresPMChannel2["default"]) {
return resource.lastMessage;
}
if (resource instanceof _StructuresMessage2["default"]) {
return resource;
}
return null;
};
Resolver.prototype.resolveChannel = function resolveChannel(resource) {
/*
accepts a Message, Channel, Server, String ID, User
*/
if (resource instanceof _StructuresMessage2["default"]) {
return Promise.resolve(resource.channel);
}
if (resource instanceof _StructuresChannel2["default"]) {
return Promise.resolve(resource);
}
if (resource instanceof _StructuresServer2["default"]) {
return Promise.resolve(resource.channels.get("id", resource.id));
}
if (resource instanceof String || typeof resource === "string") {
return Promise.resolve(this.internal.channels.get("id", resource));
}
if (resource instanceof _StructuresUser2["default"]) {
// see if a PM exists
var chatFound = false;
for (var _iterator3 = this.internal.private_channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) {
var _ref3;
if (_isArray3) {
if (_i3 >= _iterator3.length) break;
_ref3 = _iterator3[_i3++];
} else {
_i3 = _iterator3.next();
if (_i3.done) break;
_ref3 = _i3.value;
}
var pmchat = _ref3;
if (pmchat.recipient.equals(resource)) {
chatFound = pmchat;
break;
}
}
if (chatFound) {
// a PM already exists!
return Promise.resolve(chatFound);
}
// PM does not exist :\
return this.internal.startPM(resource);
}
var error = new Error("Could not resolve channel");
error.resource = resource;
return Promise.reject(error);
};
return Resolver;
})();
exports["default"] = Resolver;
module.exports = exports["default"];