Added GuildUpdate handling, and setting guilds details

src/client/ClientDataResolver.js

@@ -5,6 +5,7 @@ const Structure = name => require(`../structures/${name}`);
 const User = Structure('User');
 const Message = Structure('Message');
 const Guild = Structure('Guild');
+const Channel = Structure('Channel');
 const ServerChannel = Structure('ServerChannel');
 const TextChannel = Structure('TextChannel');
 const VoiceChannel = Structure('VoiceChannel');
@@ -59,8 +60,31 @@ class ClientDataResolver {
 		if (data instanceof Buffer) {
 			return 'data:image/jpg;base64,' + data.toString('base64');
 		}
+
 		return data;
 	}
+
+	ResolveChannel(channel) {
+		if (channel instanceof Channel) {
+			return channel;
+		}
+
+		if ($string(channel)) {
+			return this.client.store.get('channels', channel);
+		}
+	}
+
+	ResolveString(data) {
+		if (data instanceof String) {
+			return data;
+		}
+
+		if (data instanceof Array) {
+			return data.join('\n');
+		}
+
+		return String(data);
+	}
 }
 
 module.exports = ClientDataResolver;

src/client/actions/ActionsManager.js

@@ -13,6 +13,7 @@ class ActionsManager {
 		this.register('ChannelDelete');
 		this.register('ChannelUpdate');
 		this.register('GuildDelete');
+		this.register('GuildUpdate');
 		this.register('UserUpdate');
 	}
 

src/client/actions/GuildUpdate.js

@@ -0,0 +1,42 @@
+'use strict';
+
+const Action = require('./Action');
+const Constants = require('../../util/Constants');
+const CloneObject = require('../../util/CloneObject');
+const Message = require('../../structures/Message');
+
+class GuildUpdateAction extends Action {
+
+	constructor(client) {
+		super(client);
+		this.deleted = {};
+		this.timeouts = [];
+	}
+
+	handle(data) {
+
+		let client = this.client;
+		let guild = client.store.get('guilds', data.id);
+
+		if (guild) {
+			let oldGuild = CloneObject(guild);
+			guild.setup(data);
+
+			if (!oldGuild.equals(data)) {
+				client.emit(Constants.Events.GUILD_UPDATE, oldGuild, guild);
+			}
+
+			return {
+				old: oldGuild,
+				updated: guild,
+			};
+		}
+
+		return {
+			old: null,
+			updated: null,
+		};
+	}
+};
+
+module.exports = GuildUpdateAction;

src/client/rest/RESTMethods.js

@@ -152,6 +152,53 @@ class RESTMethods{
 				.catch(reject);
 		});
 	}
+
+	UpdateGuild(guild, _data) {
+		return new Promise((resolve, reject) => {
+			/*
+				can contain:
+				name, region, verificationLevel, afkChannel, afkTimeout, icon, owner, splash
+			 */
+
+			let data = {};
+
+			if (_data.name) {
+				data.name = _data.name;
+			}
+
+			if (_data.region) {
+				data.region = _data.region;
+			}
+
+			if (_data.verificationLevel) {
+				data.verification_level = Number(_data.verificationLevel);
+			}
+
+			if (_data.afkChannel) {
+				data.afk_channel_id = this.rest.client.resolver.ResolveChannel(_data.afkChannel).id;
+			}
+
+			if (_data.afkTimeout) {
+				data.afk_timeout = Number(_data.afkTimeout);
+			}
+
+			if (_data.icon) {
+				data.icon = this.rest.client.resolver.ResolveBase64(_data.icon);
+			}
+
+			if (_data.owner) {
+				data.owner_id = this.rest.client.resolver.ResolveUser(_data.owner).id;
+			}
+
+			if (_data.splash) {
+				data.splash = this.rest.client.resolver.ResolveBase64(_data.splash);
+			}
+
+			this.rest.makeRequest('patch', Constants.Endpoints.GUILD(guild.id), true, data)
+				.then(data => resolve(this.rest.client.actions.GuildUpdate.handle(data).updated))
+				.catch(reject);
+		});
+	}
 }
 
 module.exports = RESTMethods;

src/client/websocket/packets/handlers/GuildUpdate.js

@@ -19,11 +19,7 @@ class GuildUpdateHandler extends AbstractHandler {
 		let data = packet.d;
 		let client = this.packetManager.client;
 
-		let guild = client.store.get('guilds', data.id);
+		let response = client.actions.GuildUpdate.handle(data);
-
-		if (guild) {
-			client.store.UpdateGuild(guild, data);
-		}
 
 	}
 

src/structures/Guild.js

@@ -8,6 +8,21 @@ const VoiceChannel = require('./VoiceChannel');
 const Constants = require('../Util/Constants');
 const Role = require('./Role');
 
+function arraysEqual(a, b) {
+	if (a === b) return true;
+	if (a.length !== b.length) return false;
+
+	for (let itemInd in a) {
+		let item = a[itemInd];
+		let ind = b.indexOf(item);
+		if (ind) {
+			b.splice(ind, 1);
+		}
+	}
+
+	return b.length === 0;
+}
+
 class Guild {
 	constructor(client, data) {
 		this.client = client;
@@ -64,6 +79,34 @@ class Guild {
 		return this.client.resolver.ResolveGuildMember(this, user);
 	}
 
+	equals(data) {
+		let base =
+			this.id === data.id &&
+			this.available === !data.unavailable &&
+			this.splash === data.splash &&
+			this.region === data.region &&
+			this.name === data.name &&
+			this.memberCount === data.member_count &&
+			this.large === data.large &&
+			this.icon === data.icon &&
+			arraysEqual(this.features, data.features) &&
+			this.owner.id === data.owner_id &&
+			this.verificationLevel === data.verification_level &&
+			this.embedEnabled === data.embed_enabled;
+
+		if (base) {
+			if (this.embedChannel) {
+				if (this.embedChannel.id !== data.embed_channel_id) {
+					base = false;
+				}
+			} else if (data.embed_channel_id) {
+				base = false;
+			}
+		}
+
+		return base;
+	}
+
 	setup(data) {
 		this.id = data.id;
 		this.available = !data.unavailable;
@@ -79,7 +122,6 @@ class Guild {
 		this.afkTimeout = data.afk_timeout;
 		this.afkChannelID = data.afk_channel_id;
 		this.embedEnabled = data.embed_enabled;
-		this.embedChannelID = data.embed_channel_id;
 		this.verificationLevel = data.verification_level;
 		this.features = data.features || [];
 
@@ -99,6 +141,8 @@ class Guild {
 			}
 		}
 
+		this.embedChannel = this.store.get('channels', data.embed_channel_id);
+
 		if (data.roles) {
 			this.store.clear('roles');
 			for (let role of data.roles) {
@@ -143,6 +187,42 @@ class Guild {
 		return this.client.rest.methods.DeleteGuild(this);
 	}
 
+	edit(data) {
+		return this.client.rest.methods.UpdateGuild(this, data);
+	}
+
+	setName(name) {
+		return this.edit({ name, });
+	}
+
+	setRegion(region) {
+		return this.edit({ region, });
+	}
+
+	setVerificationLevel(verificationLevel) {
+		return this.edit({ verificationLevel, });
+	}
+
+	setAFKChannel(afkchannel) {
+		return this.edit({ afkChannel, });
+	}
+
+	setAFKTimeout(afkTimeout) {
+		return this.edit({ afkTimeout, });
+	}
+
+	setIcon(icon) {
+		return this.edit({ icon, });
+	}
+
+	setOwner(owner) {
+		return this.edit({ owner, });
+	}
+
+	setSplash(splash) {
+		return this.edit({ splash, });
+	}
+
 	get channels() { return this.store.getAsArray('channels'); }
 
 	get $channels() { return this.store.data.channels; }

src/structures/ServerChannel.js

@@ -7,6 +7,7 @@ const Constants = require('../util/Constants');
 
 function arraysEqual(a, b) {
 	if (a === b) return true;
+	if (a.length !== b.length) return false;
 
 	for (let itemInd in a) {
 		let item = a[itemInd];
@@ -50,7 +51,7 @@ class ServerChannel extends Channel{
 		);
 
 		if (base) {
-			if (other.permission_overwrites && other.permission_overwrites.length === this.permissionOverwrites.length) {
+			if (other.permission_overwrites) {
 				let thisIDSet = this.permissionOverwrites.map(overwrite => overwrite.id);
 				let otherIDSet = other.permission_overwrites.map(overwrite => overwrite.id);
 				if (arraysEqual(thisIDSet, otherIDSet)) {

test/random.js

@@ -18,7 +18,7 @@ client.on('guildDelete', (guild) => {
 	console.log('guilddel', guild.name);
 });
 client.on('guildUpdate', (old, guild) => {
-	console.log(old.name, guild.name);
+	console.log('guildupdate', old.name, guild.name);
 });
 client.on('channelCreate', channel => {
 	// console.log(channel);
@@ -82,11 +82,11 @@ client.on('message', message => {
 		}
 
 		if (message.content.startsWith('setname')) {
-			message.channel.setName(message.content.substr(8)).then(chanLoop).catch(console.log);
+			message.channel.setName(message.content.substr(8));
 		}
 
 		if (message.content.startsWith('botname')) {
-			client.user.setUsername(message.content.substr(8)).then(nameLoop).catch(console.log);
+			client.user.setUsername(message.content.substr(8));
 		}
 
 		if (message.content.startsWith('botavatar')) {
@@ -98,14 +98,27 @@ client.on('message', message => {
 				});
 		}
 
+		if (message.content.startsWith('gn')) {
+			message.guild.setName(message.content.substr(3))
+				.then(guild => console.log('guild updated to', guild.name))
+				.catch(console.log);
+		}
+
 		if (message.content === 'leave') {
 			message.guild.leave().then(guild => console.log('left guild', guild.name)).catch(console.log);
 		}
+
+		if (message.content === 'stats') {
+			let m = '';
+			m += `I am aware of ${message.guild.channels.length} channels\n`;
+			m += `I am aware of ${message.guild.members.length} members`;
+			message.channel.sendMessage(m);
+		}
 	}
 });
 
 function nameLoop(user) {
-	user.setUsername(user.username + 'a').then(nameLoop).catch(console.log);
+	// user.setUsername(user.username + 'a').then(nameLoop).catch(console.log);
 }
 
 function chanLoop(channel) {