Finished most of structure

src/Structures/Channel.js

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

src/Structures/Member.js

@@ -1,16 +0,0 @@
-"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/Message.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var Cache = require("../Util/Cache.js");
+var User = require("./User.js");
+
+class Message{
+	constructor(data, channel, client){
+		this.channel = channel;
+		this.client = client;
+		
+		this.nonce = data.nonce;
+		this.attachments = data.attachments;
+		this.tts = data.tts;
+		this.embeds = data.embeds;
+		this.timestamp = Date.parse(data.timestamp);
+		this.everyoneMentioned = data.mention_everyone;
+		this.id = data.id;
+		
+		if(data.edited_timestamp)
+			this.editedTimestamp = Date.parse(data.edited_timestamp);
+		this.author = client.internal.users.add(new User(data.author, client));
+		this.content = data.content;
+		this.mentions = new Cache();
+		
+		data.mentions.forEach((mention) => {
+			// this is .add and not .get because it allows the bot to cache
+			// users from messages from logs who may have left the server and were
+			// not previously cached.
+			console.log(mention);
+			this.mentions.add(client.internal.users.add(new User(mention, client)));
+		});
+	}
+}
+
+module.exports = Message;

src/Structures/PMChannel.js

@@ -3,9 +3,20 @@
 var Channel = require("./Channel.js");
 var Equality = require("../Util/Equality.js");
 
-class PMChannel extends Channel{
+class PMChannel extends Equality{
 	constructor(data, client){
-		super(data, client);
+		super();
+		this.client = client;
+		
+		this.type = data.type || "text";
+		this.id = data.id;
+		this.lastMessageId = data.last_message_id;
+		this.recipient = this.client.internal.users.add(data.recipient);
+	}
+	
+	/* warning! may return null */
+	get lastMessage(){
+		return this.messages.get("id", this.lastMessageID);
 	}
 }
 

src/Structures/Server.js

@@ -4,7 +4,6 @@ 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");
 var Role = require("./Role.js");
@@ -27,10 +26,17 @@ class Server extends Equality {
 		this.icon = data.icon;
 		this.afkTimeout = data.afkTimeout;
 		this.afkChannelID = data.afk_channel_id;
+		this.memberMap = {};
 		
 		data.members.forEach( (dataUser) => {
-			var user = client.internal.users.add(new User(dataUser, client));
-			this.members.add( new Member(dataUser, client, self) );
+			this.memberMap[dataUser.user.id] = {
+				roles : dataUser.roles,
+				mute : dataUser.mute,
+				deaf : dataUser.deaf,
+				joinedAt : Date.parse(dataUser.joined_at)	
+			};
+			var user = client.internal.users.add(new User(dataUser.user, client));
+			this.members.add( user );
 		} );
 		
 		data.channels.forEach( (dataChannel) => {

src/Structures/ServerChannel.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var Channel = require("./Channel.js");
+var Cache = require("../Util/Cache.js");
+var PermissionOverwrite = require("./PermissionOverwrite.js");
+
+class ServerChannel extends Channel{
+	constructor(data, client){
+		super(data, client);
+		this.type = data.type;
+		this.permissionOverwrites = new Cache();
+		data.permission_overwrites.forEach((permission) => {
+			this.permissionOverwrites.add( new PermissionOverwrite(permission) );
+		});
+	}
+}
+
+module.exports = ServerChannel;

src/Structures/TextChannel.js

@@ -1,10 +1,9 @@
 "use strict";
 
-var Channel = require("./Channel.js");
+var ServerChannel = require("./ServerChannel.js");
 var Cache = require("../Util/Cache.js");
-var PermissionOverwrite = require("./PermissionOverwrite.js");
 
-class TextChannel extends Channel{
+class TextChannel extends ServerChannel{
 	constructor(data, client){
 		super(data, client);
 		
@@ -13,11 +12,6 @@ class TextChannel extends Channel{
 		this.position = data.position;
 		this.lastMessageID = data.last_message_id;
 		this.messages = new Cache("id", client.options.maximumMessages);
-		
-		this.permissionOverwrites = new Cache();
-		data.permission_overwrites.forEach((permission) => {
-			this.permissionOverwrites.add( new PermissionOverwrite(permission) );
-		});
 	}
 	
 	/* warning! may return null */

src/Structures/VoiceChannel.js

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