Built internal changes

.vscode/settings.json

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

lib/Client/Client.js

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

lib/Client/ConnectionState.js

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

lib/Client/InternalClient.js

@@ -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;

lib/Client/Resolver/Resolver.js

@@ -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;

lib/Constants.js

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

lib/Structures/Channel.js

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

lib/Structures/ChannelPermissions.js

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

lib/Structures/Invite.js

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

lib/Structures/Message.js

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

lib/Structures/PMChannel.js

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

lib/Structures/PermissionOverwrite.js

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

lib/Structures/Role.js

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

lib/Structures/Server.js

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

lib/Structures/ServerChannel.js

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

lib/Structures/TextChannel.js

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

lib/Structures/User.js

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

lib/Structures/VoiceChannel.js

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

lib/Util/Cache.js

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

lib/Util/Equality.js

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

lib/Voice/AudioEncoder.js

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

lib/Voice/StreamIntent.js

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

lib/Voice/VoiceConnection.js

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

lib/Voice/VoicePacket.js

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

lib/index.js

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