More rewrites

src/Client/Client.js

@@ -9,7 +9,8 @@ class Client extends EventEmitter{
 		client.
 	*/
 	constructor(options){
-		super(options);
+		super();
+		this.options = options || {};
 		this.internal = new InternalClient(this);
 	}
 	

src/Client/InternalClient.js

@@ -2,9 +2,21 @@
 
 var EventEmitter = require("events");
 var request = require("superagent");
+var WebSocket = require("ws");
 var ConnectionState = require("./ConnectionState.js");
+
 var Constants = require("../Constants.js"),
-	Endpoints = Constants.Endpoints;
+	Endpoints = Constants.Endpoints,
+	PacketType = Constants.PacketType;
+	
+var Cache = require("../Util/Cache.js");
+
+var User = require("../Structures/User.js"),
+	Channel = require("../Structures/Channel.js"),
+	TextChannel = require("../Structures/TextChannel.js"),
+	VoiceChannel = require("../Structures/VoiceChannel.js"),
+	PMChannel = require("../Structures/PMChannel.js"),
+	Server = require("../Structures/Server.js");
 
 var zlib;
 
@@ -17,6 +29,12 @@ class InternalClient {
 		if (this.client.options.compress) {
 			zlib = require("zlib");
 		}
+		
+		// creates 4 caches with discriminators based on ID
+		this.users = new Cache();
+		this.channels = new Cache();
+		this.servers = new Cache();
+		this.private_channels = new Cache();
 	}
 
 	login(email, password) {
@@ -85,6 +103,7 @@ class InternalClient {
 
 	createWS(url) {
 		var self = this;
+		var client = self.client;
 
 		if (this.websocket)
 			return false;
@@ -113,12 +132,13 @@ class InternalClient {
 		this.websocket.onclose = () => {
 			self.websocket = null;
 			self.state = ConnectionState.DISCONNECTED;
-			self.client.emit("disconnected");
+			client.emit("disconnected");
 		}
 
 		this.websocket.onmessage = (e) => {
 
 			if (e.type === "Binary") {
+				if(!zlib) zlib = require("zlib");
 				e.data = zlib.inflateSync(e.data).toString();
 			}
 
@@ -127,17 +147,28 @@ class InternalClient {
 				packet = JSON.parse(e.data);
 				data = packet.d;
 			} catch (e) {
-				self.client.emit("error", e);
+				client.emit("error", e);
+				return;
 			}
-			
-			self.emit("raw", packet);
-			
-			switch(packet.t){
-				
-			}
-			
-		}
 
+			client.emit("raw", packet);
+
+			switch (packet.t) {
+
+				case PacketType.READY:
+					
+					self.users.add(new User(data.user, client));
+					
+					data.guilds.forEach((server) => {
+						self.servers.add(new Server(server, client));
+					});
+					
+					console.log(self.servers);
+					
+					break;
+
+			}
+		}
 	}
 }
 

src/Constants.js

@@ -1,12 +1,12 @@
 var API = "https://discordapp.com/api";
 var Endpoints = {
-	
 	// general endpoints
 	LOGIN: `${API}/auth/login`,
 	LOGOUT: `${API}/auth/logout`,
 	ME: `${API}/users/@me`,
 	GATEWAY: `${API}/gateway`,
 	USER_CHANNELS: (userID) => `${API}/users/${userID}/channels`,
+	AVATAR : (userID, avatar) => `${API}/users/${userID}/avatars/${avatar}.jpg`,
 	
 	// servers
 	SERVERS: `${API}/guilds`,
@@ -28,8 +28,12 @@ var Endpoints = {
 	CHANNEL_INVITES: (channelID) => `${Endpoints.CHANNEL(channelID) }/invites`,
 	CHANNEL_TYPING: (channelID) => `${Endpoints.CHANNEL(channelID) }/typing`,
 	CHANNEL_PERMISSIONS: (channelID) => `${Endpoints.CHANNEL(channelID) }/permissions`,
+};
 
+var PacketType = {
+	READY : "READY"
 }
 
 exports.API_ENDPOINT = API;
-exports.Endpoints = Endpoints;
+exports.Endpoints = Endpoints;
+exports.PacketType = PacketType;

src/Structures/Channel.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var Equality = require("../Util/Equality.js");
+
+class Channel extends Equality{
+	
+	constructor(data, client){
+		super();
+		this.type = data.type || "text";
+		this.id = data.id;
+		this.client = client;	
+	}
+	
+}
+
+module.exports = Channel;

src/Structures/Member.js

@@ -0,0 +1,16 @@
+"use strict";
+
+var User = require("./User.js");
+
+class Member extends User{
+	constructor(data, client, server){
+		super(data, client);
+		this.serverID = server;
+	}
+	
+	get server(){
+		return this.client.internal.servers.get("id", this.serverID);
+	}
+}
+
+module.exports = Member;

src/Structures/PMChannel.js

@@ -0,0 +1,12 @@
+"use strict";
+
+var Channel = require("./Channel.js");
+var Equality = require("../Util/Equality.js");
+
+class PMChannel extends Channel{
+	constructor(data, client){
+		super(data, client);
+	}
+}
+
+module.exports = PMChannel;

src/Structures/Server.js

@@ -0,0 +1,74 @@
+"use strict";
+
+var Equality = require("../Util/Equality.js");
+var Endpoints = require("../Constants.js").Endpoints;
+var Cache = require("../Util/Cache.js");
+var User = require("./User.js");
+var Member = require("./Member.js");
+var TextChannel = require("./TextChannel.js");
+var VoiceChannel = require("./VoiceChannel.js");
+
+class Server extends Equality {
+	constructor(data, client) {
+		
+		super();
+
+		var self = this;
+		this.client = client;
+
+		this.region = data.region;
+		this.ownerID = data.owner_id;
+		this.name = data.name;
+		this.id = data.id;
+		this.members = new Cache();
+		this.channels = new Cache();
+		this.roles = new Cache();
+		this.icon = data.icon;
+		this.afkTimeout = data.afkTimeout;
+		this.afkChannelID = data.afk_channel_id;
+		
+		data.members.forEach( (dataUser) => {
+			var user = client.internal.users.add(new User(dataUser, client));
+			this.members.add( new Member(dataUser, client, self) );
+		} );
+		
+		data.channels.forEach( (dataChannel) => {
+			
+			if(dataChannel.type === "text"){
+				var channel = client.internal.channels.add(new TextChannel(dataChannel, client));
+				this.channels.add(channel);
+			}else{
+				var channel = client.internal.channels.add(new VoiceChannel(dataChannel, client));
+				this.channels.add(channel);
+			}
+			
+		} );
+	}
+
+	get iconURL() {
+		if (!this.icon) {
+			return null;
+		} else {
+			return Endpoints.SERVER_ICON(this.id, this.icon);
+		}
+	}
+	
+	get afkChannel() {
+		return this.channels.get("id", this.afkChannelID);
+	}
+	
+	get defaultChannel() {
+		return this.channels.get("id", this.id);
+	}
+	
+	get owner() {
+		return this.members.get("id", this.ownerID);
+	}
+	
+	toString() {
+		return this.name;
+	}
+	
+}
+
+module.exports = Server;

src/Structures/TextChannel.js

@@ -0,0 +1,15 @@
+"use strict";
+
+var Channel = require("./Channel.js");
+var Cache = require("../Util/Cache.js");
+
+class TextChannel extends Channel{
+	constructor(data, client){
+		
+		super(data, client);
+		this.messages = new Cache("id", client.options.maximumMessages);
+	
+	}
+}
+
+module.exports = TextChannel;

src/Structures/User.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var Equality = require("../Util/Equality.js");
+var Endpoints = require("../Constants.js").Endpoints;
+
+class User extends Equality{
+	constructor(data, client){
+		super();
+		this.client = client;
+		this.username = data.username;
+		this.discriminator = data.discriminator;
+		this.id = data.id;
+		this.avatar = data.avatar;
+		this.status = data.status || "offline";
+		this.gameID = data.game_id || null;
+	}
+	
+	get avatarURL(){
+		if(!this.avatar){
+			return null;
+		}else{
+			return Endpoints.AVATAR(this.id, this.avatar);
+		}
+	}
+	
+	mention(){
+		return `<@${this.id}>`;
+	}
+	
+	toString(){
+		return this.mention();
+	}
+}
+
+module.exports = User;

src/Structures/VoiceChannel.js

@@ -0,0 +1,11 @@
+"use strict";
+
+var Channel = require("./Channel.js");
+
+class VoiceChannel extends Channel{
+	constructor(data, client){
+		super(data, client);
+	}
+}
+
+module.exports = VoiceChannel;

src/Util/Cache.js

@@ -0,0 +1,51 @@
+"use strict";
+
+class Cache extends Array{
+	constructor(discrim, limit){
+		super();
+		this.discrim = discrim || "id";
+	}
+	
+	get(key, value){
+		var found = null;
+		this.forEach( (val, index, array) => {
+			if(val.hasOwnProperty(key) && val[key] == value){
+				found = val;
+				return;
+			}
+		} );
+		return found;
+	}
+	
+	getAll(key, value){
+		var found = [];
+		this.forEach( (val, index, array) => {
+			if(val.hasOwnProperty(key) && val[key] == value){
+				found.push(val);
+				return;
+			}
+		} );
+		return found;
+	}
+	
+	add(data){
+		var exit = false;
+		for(var item of this){
+			if(item[this.discrim] === data[this.discrim]){
+				exit = item;
+				break;
+			}
+		}
+		if(exit){
+			return exit;
+		}else{
+			if(this.limit && this.length >= this.limit){
+				this.splice(0, 1);
+			}
+			this.push(data);
+			return data;
+		}
+	}
+}
+
+module.exports = Cache;

src/Util/Equality.js

@@ -0,0 +1,29 @@
+/*
+	The Equality Class is just used to show
+	that a Class has an ID that can be used to
+	check for equality.
+	
+	Never use == or === when comparing
+	objects in discord.js, they will be different
+	instances sometimes.
+	
+	Instead, use objectThatExtendsEquality.equals()
+*/
+class Equality{
+	constructor(){
+		
+	}
+	
+	get eqDiscriminator(){
+		return "id";
+	}
+	
+	equals(object){
+		if(object && object[this.eqDiscriminator] == this[this.eqDiscriminator]){
+			return true;
+		}
+		return false;
+	}
+}
+
+module.exports = Equality;

src/index.js

@@ -3,4 +3,4 @@ module.exports = {
 }
 
 var a = new module.exports.Client();
-a.login("email", "password").catch((e)=>console.log(e));
+a.login(process.env["discordEmail"], process.env["discordPass"]).catch((e)=>console.log(e));