Built internal changes

This commit is contained in:
hydrabolt
2015-11-18 16:59:37 +00:00
parent 7b73671295
commit e7df5bd400
25 changed files with 93 additions and 43 deletions

View File

@@ -682,4 +682,4 @@ var Client = (function (_EventEmitter) {
return Client;
})(EventEmitter);
module.exports = Client;
module.exports = Client;

View File

@@ -4,4 +4,4 @@ exports.IDLE = 0;
exports.LOGGING_IN = 1;
exports.LOGGED_IN = 2;
exports.READY = 3;
exports.DISCONNECTED = 4;
exports.DISCONNECTED = 4;

View File

@@ -142,6 +142,34 @@ var InternalClient = (function () {
});
};
//def joinServer
InternalClient.prototype.joinServer = function joinServer(invite) {
var self = this;
return new Promise(function (resolve, reject) {
invite = self.resolver.resolveInvite(invite);
if (invite) {
request.post(Endpoints.INVITE(invite.id)).set("authorization", self.token).end(function (err, res) {
if (err) {
reject(err);
} else {
// valid server, wait until it is received via ws and cached
var inter = setInterval(function () {
if (self.servers.get("id", res.body.guild.id)) {
clearInterval(inter);
resolve(self.servers.get("id", res.body.guild.id));
}
}, 20);
}
});
} else {
reject(new Error("Not a valid invite"));
}
});
};
//def leaveServer
InternalClient.prototype.leaveServer = function leaveServer(srv) {
@@ -1459,4 +1487,4 @@ var InternalClient = (function () {
return InternalClient;
})();
module.exports = InternalClient;
module.exports = InternalClient;

View File

@@ -11,7 +11,8 @@ var User = require("../../Structures/User.js"),
ServerChannel = require("../../Structures/ServerChannel.js"),
PMChannel = require("../../Structures/PMChannel.js"),
Server = require("../../Structures/Server.js"),
Message = require("../../Structures/Message.js");
Message = require("../../Structures/Message.js"),
Invite = require("../../Structures/Invite.js");
var Resolver = (function () {
function Resolver(internal) {
@@ -20,6 +21,21 @@ var Resolver = (function () {
this.internal = internal;
}
Resolver.prototype.resolveInvite = function resolveInvite(resource) {
if (resource instanceof Invite) {
return resource;
} else if (typeof resource == "string" || resource instanceof String) {
if (resource.indexOf("http") === 0) {
var split = resource.split("/");
return split.pop();
} else {
return resource;
}
}
return null;
};
Resolver.prototype.resolveServer = function resolveServer(resource) {
if (resource instanceof Server) {
return resource;
@@ -182,4 +198,4 @@ var Resolver = (function () {
return Resolver;
})();
module.exports = Resolver;
module.exports = Resolver;