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

Built internal changes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored
View File

@@ -1,2 +1,5 @@
// Place your settings in this file to overwrite default and user settings. // Place your settings in this file to overwrite default and user settings.
{ "editor.wrappingColumn": 0 } {
"editor.wrappingColumn": 0,
"editor.formatOnType": true
}

2
lib/Client/Client.js
View File

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

2
lib/Client/ConnectionState.js
View File

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

30
lib/Client/InternalClient.js
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 //def leaveServer
InternalClient.prototype.leaveServer = function leaveServer(srv) { InternalClient.prototype.leaveServer = function leaveServer(srv) {
@@ -1459,4 +1487,4 @@ var InternalClient = (function () {
return InternalClient; return InternalClient;
})(); })();
module.exports = InternalClient; module.exports = InternalClient;

20
lib/Client/Resolver/Resolver.js
View File

@@ -11,7 +11,8 @@ var User = require("../../Structures/User.js"),
ServerChannel = require("../../Structures/ServerChannel.js"), ServerChannel = require("../../Structures/ServerChannel.js"),
PMChannel = require("../../Structures/PMChannel.js"), PMChannel = require("../../Structures/PMChannel.js"),
Server = require("../../Structures/Server.js"), Server = require("../../Structures/Server.js"),
Message = require("../../Structures/Message.js"); Message = require("../../Structures/Message.js"),
Invite = require("../../Structures/Invite.js");
var Resolver = (function () { var Resolver = (function () {
function Resolver(internal) { function Resolver(internal) {
@@ -20,6 +21,21 @@ var Resolver = (function () {
this.internal = internal; 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) { Resolver.prototype.resolveServer = function resolveServer(resource) {
if (resource instanceof Server) { if (resource instanceof Server) {
return resource; return resource;
@@ -182,4 +198,4 @@ var Resolver = (function () {
return Resolver; return Resolver;
})(); })();
module.exports = Resolver; module.exports = Resolver;

5
lib/Constants.js
View File

@@ -13,6 +13,9 @@ var Endpoints = {
AVATAR: function AVATAR(userID, avatar) { AVATAR: function AVATAR(userID, avatar) {
return API + "/users/" + userID + "/avatars/" + avatar + ".jpg"; return API + "/users/" + userID + "/avatars/" + avatar + ".jpg";
}, },
INVITE: function INVITE(id) {
return API + "/invite/" + id;
},
// servers // servers
SERVERS: API + "/guilds", SERVERS: API + "/guilds",
@@ -124,4 +127,4 @@ var PacketType = {
exports.API_ENDPOINT = API; exports.API_ENDPOINT = API;
exports.Endpoints = Endpoints; exports.Endpoints = Endpoints;
exports.PacketType = PacketType; exports.PacketType = PacketType;
exports.Permissions = Permissions; exports.Permissions = Permissions;

2
lib/Structures/Channel.js
View File

@@ -27,4 +27,4 @@ var Channel = (function (_Equality) {
return Channel; return Channel;
})(Equality); })(Equality);
module.exports = Channel; module.exports = Channel;

2
lib/Structures/ChannelPermissions.js
View File

@@ -72,4 +72,4 @@ var ChannelPermissions = (function () {
return ChannelPermissions; return ChannelPermissions;
})(); })();
module.exports = ChannelPermissions; module.exports = ChannelPermissions;

36
lib/Structures/Invite.js
View File

@@ -6,27 +6,27 @@ var Server = require("./Server.js");
var ServerChannel = require("./ServerChannel.js"); var ServerChannel = require("./ServerChannel.js");
var Invite = (function () { var Invite = (function () {
function Invite(data, chan, client) { function Invite(data, chan, client) {
_classCallCheck(this, Invite); _classCallCheck(this, Invite);
this.maxAge = data.max_age; this.maxAge = data.max_age;
this.code = data.code; this.code = data.code;
this.server = chan.server; this.server = chan.server;
this.channel = chan; this.channel = chan;
this.revoked = data.revoked; this.revoked = data.revoked;
this.createdAt = Date.parse(data.created_at); this.createdAt = Date.parse(data.created_at);
this.temporary = data.temporary; this.temporary = data.temporary;
this.uses = data.uses; this.uses = data.uses;
this.maxUses = data.uses; this.maxUses = data.uses;
this.inviter = client.internal.users.get("id", data.inviter.id); this.inviter = client.internal.users.get("id", data.inviter.id);
this.xkcd = data.xkcdpass; this.xkcd = data.xkcdpass;
} }
Invite.prototype.toString = function toString() { Invite.prototype.toString = function toString() {
return "https://discord.gg/" + this.code; return "https://discord.gg/" + this.code;
}; };
return Invite; return Invite;
})(); })();
module.exports = Invite; module.exports = Invite;

2
lib/Structures/Message.js
View File

@@ -60,4 +60,4 @@ var Message = (function () {
return Message; return Message;
})(); })();
module.exports = Message; module.exports = Message;

2
lib/Structures/PMChannel.js
View File

@@ -52,4 +52,4 @@ var PMChannel = (function (_Equality) {
return PMChannel; return PMChannel;
})(Equality); })(Equality);
module.exports = PMChannel; module.exports = PMChannel;

2
lib/Structures/PermissionOverwrite.js
View File

@@ -83,4 +83,4 @@ var PermissionOverwrite = (function () {
return PermissionOverwrite; return PermissionOverwrite;
})(); })();
module.exports = PermissionOverwrite; module.exports = PermissionOverwrite;

2
lib/Structures/Role.js
View File

@@ -136,4 +136,4 @@ var Role = (function () {
return Role; return Role;
})(); })();
module.exports = Role; module.exports = Role;

2
lib/Structures/Server.js
View File

@@ -166,4 +166,4 @@ var Server = (function (_Equality) {
return Server; return Server;
})(Equality); })(Equality);
module.exports = Server; module.exports = Server;

2
lib/Structures/ServerChannel.js
View File

@@ -110,4 +110,4 @@ var ServerChannel = (function (_Channel) {
return ServerChannel; return ServerChannel;
})(Channel); })(Channel);
module.exports = ServerChannel; module.exports = ServerChannel;

2
lib/Structures/TextChannel.js
View File

@@ -57,4 +57,4 @@ var TextChannel = (function (_ServerChannel) {
return TextChannel; return TextChannel;
})(ServerChannel); })(ServerChannel);
module.exports = TextChannel; module.exports = TextChannel;

2
lib/Structures/User.js
View File

@@ -55,4 +55,4 @@ var User = (function (_Equality) {
return User; return User;
})(Equality); })(Equality);
module.exports = User; module.exports = User;

2
lib/Structures/VoiceChannel.js
View File

@@ -18,4 +18,4 @@ var VoiceChannel = (function (_ServerChannel) {
return VoiceChannel; return VoiceChannel;
})(ServerChannel); })(ServerChannel);
module.exports = VoiceChannel; module.exports = VoiceChannel;

2
lib/Util/Cache.js
View File

@@ -95,4 +95,4 @@ var Cache = (function (_Array) {
return Cache; return Cache;
})(Array); })(Array);
module.exports = Cache; module.exports = Cache;

2
lib/Util/Equality.js
View File

@@ -42,4 +42,4 @@ var Equality = (function () {
return Equality; return Equality;
})(); })();
module.exports = Equality; module.exports = Equality;

2
lib/Voice/AudioEncoder.js
View File

@@ -126,4 +126,4 @@ var AudioEncoder = (function () {
return AudioEncoder; return AudioEncoder;
})(); })();
module.exports = AudioEncoder; module.exports = AudioEncoder;

2
lib/Voice/StreamIntent.js
View File

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

2
lib/Voice/VoiceConnection.js
View File

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

2
lib/Voice/VoicePacket.js
View File

@@ -23,4 +23,4 @@ var VoicePacket = function VoicePacket(data, sequence, time, ssrc) {
return returnBuffer; return returnBuffer;
}; };
module.exports = VoicePacket; module.exports = VoicePacket;

2
lib/index.js
View File

@@ -14,4 +14,4 @@ module.exports = {
TextChannel: require("./Structures/TextChannel"), TextChannel: require("./Structures/TextChannel"),
User: require("./Structures/User"), User: require("./Structures/User"),
VoiceChannel: require("./Structures/VoiceChannel") VoiceChannel: require("./Structures/VoiceChannel")
}; };