Added Guild Deletion

TODO.md

@@ -5,8 +5,8 @@
 - [ ] updating user details
 - [x] deleting messages
 - [x] updating messages
-- [ ] leaving guilds
-- [ ] deleting guilds
+- [x] leaving guilds
+- [x] deleting guilds
 - [ ] _joining guilds_
 - [x] creating channels
 - [x] updating channels

src/client/actions/ActionsManager.js

@@ -12,6 +12,7 @@ class ActionsManager {
 		this.register('ChannelCreate');
 		this.register('ChannelDelete');
 		this.register('ChannelUpdate');
+		this.register('GuildDelete');
 	}
 
 	register(name) {

src/client/actions/ChannelDelete.js

@@ -8,6 +8,8 @@ class ChannelDeleteAction extends Action {
 
 	constructor(client) {
 		super(client);
+		this.timeouts = [];
+		this.deleted = {};
 	}
 
 	handle(data) {
@@ -15,13 +17,28 @@ class ChannelDeleteAction extends Action {
 		let channel = client.store.get('channels', data.id);
 
 		if (channel) {
+
 			client.store.KillChannel(channel);
+			this.deleted[channel.id] = channel;
+			this.scheduleForDeletion(channel.id);
+
+		} else if (this.deleted[data.id]) {
+
+			channel = this.deleted[data.id];
+
 		}
 
 		return {
 			channel,
 		};
 	}
+
+	scheduleForDeletion(id) {
+		this.timeouts.push(
+			setTimeout(() => delete this.deleted[id],
+			this.client.options.rest_ws_bridge_timeout)
+		);
+	}
 };
 
 module.exports = ChannelDeleteAction;

src/client/actions/GuildDelete.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const Action = require('./Action');
+const Constants = require('../../util/Constants');
+const Message = require('../../structures/Message');
+
+class GuildDeleteAction 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) {
+			if (guild.available && data.unavailable) {
+				// guild is unavailable
+				guild.available = false;
+				client.emit(Constants.Events.GUILD_UNAVAILABLE, guild);
+
+				// stops the GuildDelete packet thinking a guild was actually deleted,
+				// handles emitting of event itself
+				return {
+					guild: null,
+				};
+			} else {
+				// delete guild
+				client.store.remove('guilds', guild);
+				this.deleted[guild.id] = guild;
+				this.scheduleForDeletion(guild.id);
+			}
+		} else if (this.deleted[data.id]) {
+			guild = this.deleted[data.id];
+		}
+
+		return {
+			guild,
+		};
+	}
+
+	scheduleForDeletion(id) {
+		this.timeouts.push(
+			setTimeout(() => delete this.deleted[id],
+			this.client.options.rest_ws_bridge_timeout)
+		);
+	}
+};
+
+module.exports = GuildDeleteAction;

src/client/actions/MessageDelete.js

@@ -9,6 +9,7 @@ class MessageDeleteAction extends Action {
 	constructor(client) {
 		super(client);
 		this.timeouts = [];
+		this.deleted = {};
 	}
 
 	handle(data) {
@@ -16,9 +17,17 @@ class MessageDeleteAction extends Action {
 		let channel = client.store.get('channels', data.channel_id);
 		if (channel) {
 			let message = channel.store.get('messages', data.id);
-			if (message && !message._deleted) {
-				message._deleted = true;
-				this.scheduleForDeletion(channel, message.id);
+
+			if (message) {
+
+				channel.store.remove('messages', message.id);
+				this.deleted[channel.id + message.id] = message;
+				this.scheduleForDeletion(channel.id, message.id);
+
+			} else if (this.deleted[channel.id + data.id]) {
+
+				message = this.deleted[channel.id + data.id];
+
 			}
 
 			return {
@@ -31,9 +40,9 @@ class MessageDeleteAction extends Action {
 		};
 	}
 
-	scheduleForDeletion(channel, id) {
+	scheduleForDeletion(channelID, messageID) {
 		this.timeouts.push(
-			setTimeout(() => channel.store.remove('messages', id),
+			setTimeout(() => delete this.deleted[channelID + messageID],
 			this.client.options.rest_ws_bridge_timeout)
 		);
 	}

src/client/rest/RESTMethods.js

@@ -111,6 +111,27 @@ class RESTMethods{
 			.catch(reject);
 		});
 	}
+
+	LeaveGuild(guild) {
+		return new Promise((resolve, reject) => {
+			this.rest.makeRequest('del', Constants.Endpoints.ME_GUILD(guild.id), true)
+				.then(() => {
+					resolve(this.rest.client.actions.GuildDelete.handle({ id:guild.id }).guild);
+				})
+				.catch(reject);
+		});
+	}
+
+	// untested but probably will work
+	DeleteGuild(guild) {
+		return new Promise((resolve, reject) => {
+			this.rest.makeRequest('del', Constants.Endpoints.GUILD(guild.id), true)
+				.then(() => {
+					resolve(this.rest.client.actions.GuildDelete.handle({ id:guild.id }).guild);
+				})
+				.catch(reject);
+		});
+	}
 }
 
 module.exports = RESTMethods;

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

@@ -19,7 +19,7 @@ class ChannelDeleteHandler extends AbstractHandler {
 		let data = packet.d;
 		let client = this.packetManager.client;
 
-		let response = client.actions.ChannelCreate.handle(data);
+		let response = client.actions.ChannelDelete.handle(data);
 
 		if (response.channel) {
 			client.emit(Constants.Events.CHANNEL_DELETE, response.channel);

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

@@ -18,21 +18,10 @@ class GuildDeleteHandler extends AbstractHandler {
 		let data = packet.d;
 		let client = this.packetManager.client;
 
-		let guild = client.store.get('guilds', data.id);
+		let response = client.actions.GuildDelete.handle(data);
 
-		if (guild) {
-			if (guild.available && data.unavailable) {
-				// guild is unavailable
-				guild.available = false;
-				client.emit(Constants.Events.GUILD_UNAVAILABLE, guild);
-			} else {
-				// delete guild
-				client.store.KillGuild(guild);
-				this.packetManager.ws.checkIfReady();
-			}
-		} else {
-			// it's not there! :(
-			client.emit('warn', 'guild deleted but not cached in first place. missed packet?');
+		if (response.guild) {
+			client.emit(Constants.Events.GUILD_DELETE, response.guild);
 		}
 
 	}

src/structures/Guild.js

@@ -135,6 +135,14 @@ class Guild {
 		return this.client.rest.methods.CreateChannel(this, name, type);
 	}
 
+	leave() {
+		return this.client.rest.methods.LeaveGuild(this);
+	}
+
+	delete() {
+		return this.client.rest.methods.DeleteGuild(this);
+	}
+
 	get channels() { return this.store.getAsArray('channels'); }
 
 	get $channels() { return this.store.data.channels; }

src/structures/ServerChannel.js

@@ -9,6 +9,7 @@ function arraysEqual(a, b) {
 	if (a === b) return true;
 
 	for (let itemInd in a) {
+		let item = a[itemInd];
 		let ind = b.indexOf(item);
 		if (ind) {
 			b.splice(ind, 1);

src/structures/datastore/ClientDataStore.js

@@ -82,7 +82,6 @@ class ClientDataStore extends AbstractDataStore{
 	}
 
 	KillChannel(channel) {
-		let already = this.get('channels', channel.id);
 		this.remove('channels', channel);
 		if (channel instanceof ServerChannel) {
 			channel.guild.store.remove('channels', channel);

test/random.js

@@ -14,7 +14,7 @@ client.on('guildCreate', (guild) => {
 	console.log(guild);
 });
 client.on('guildDelete', (guild) => {
-	console.log(guild);
+	console.log('guilddel', guild.name);
 });
 client.on('guildUpdate', (old, guild) => {
 	console.log(old.name, guild.name);
@@ -23,7 +23,7 @@ client.on('channelCreate', channel => {
 	// console.log(channel);
 });
 client.on('channelDelete', channel => {
-	console.log('channDel', channel);
+	console.log('channDel', channel.name);
 });
 
 client.on('channelUpdate', (old, chan) => {
@@ -77,12 +77,16 @@ client.on('message', message => {
 		}
 
 		if (message.content === 'delchann') {
-			message.channel.delete();
+			message.channel.delete().then(chan => console.log('selfDelChann', chan.name));
 		}
 
 		if (message.content.startsWith('setname')) {
 			message.channel.setName(message.content.substr(8)).then(chanLoop).catch(console.log);
 		}
+
+		if (message.content === 'leave') {
+			message.guild.leave().then(guild => console.log('left guild', guild.name)).catch(console.log);
+		}
 	}
 });