feat: Add "deleted" property to multiple structures. (#2556)

* Add "deleted" property to "Message" structure

* Add "deleted" property to Multiple structures

Structures edited:
- Channel
- Emoji
- Guild
- Guild Member
- Role

* Update "deletable" getter

* Fix ESLint "no-trailing-spaces" errors

* Requested Change: Mark w/ bulkDelete
This commit is contained in:
Braxton
2018-05-28 18:42:51 -04:00
committed by Isabella
parent 27fcb64187
commit f0c4d0e834
13 changed files with 45 additions and 2 deletions

View File

@@ -13,6 +13,7 @@ class ChannelDeleteAction extends Action {
if (channel) { if (channel) {
client.channels.remove(channel.id); client.channels.remove(channel.id);
channel.deleted = true;
client.emit(Events.CHANNEL_DELETE, channel); client.emit(Events.CHANNEL_DELETE, channel);
} }

View File

@@ -33,6 +33,7 @@ class GuildDeleteAction extends Action {
// Delete guild // Delete guild
client.guilds.remove(guild.id); client.guilds.remove(guild.id);
guild.deleted = true;
client.emit(Events.GUILD_DELETE, guild); client.emit(Events.GUILD_DELETE, guild);
this.deleted.set(guild.id, guild); this.deleted.set(guild.id, guild);
this.scheduleForDeletion(guild.id); this.scheduleForDeletion(guild.id);

View File

@@ -4,6 +4,7 @@ const { Events } = require('../../util/Constants');
class GuildEmojiDeleteAction extends Action { class GuildEmojiDeleteAction extends Action {
handle(emoji) { handle(emoji) {
emoji.guild.emojis.remove(emoji.id); emoji.guild.emojis.remove(emoji.id);
emoji.deleted = true;
this.client.emit(Events.GUILD_EMOJI_DELETE, emoji); this.client.emit(Events.GUILD_EMOJI_DELETE, emoji);
return { emoji }; return { emoji };
} }

View File

@@ -11,6 +11,7 @@ class GuildMemberRemoveAction extends Action {
guild.memberCount--; guild.memberCount--;
if (member) { if (member) {
guild.voiceStates.delete(member.id); guild.voiceStates.delete(member.id);
member.deleted = true;
guild.members.remove(member.id); guild.members.remove(member.id);
if (client.status === Status.READY) client.emit(Events.GUILD_MEMBER_REMOVE, member); if (client.status === Status.READY) client.emit(Events.GUILD_MEMBER_REMOVE, member);
} }

View File

@@ -11,6 +11,7 @@ class GuildRoleDeleteAction extends Action {
role = guild.roles.get(data.role_id); role = guild.roles.get(data.role_id);
if (role) { if (role) {
guild.roles.remove(data.role_id); guild.roles.remove(data.role_id);
role.deleted = true;
client.emit(Events.GUILD_ROLE_DELETE, role); client.emit(Events.GUILD_ROLE_DELETE, role);
} }
} }

View File

@@ -11,6 +11,7 @@ class MessageDeleteAction extends Action {
message = channel.messages.get(data.id); message = channel.messages.get(data.id);
if (message) { if (message) {
channel.messages.delete(message.id); channel.messages.delete(message.id);
message.deleted = true;
client.emit(Events.MESSAGE_DELETE, message); client.emit(Events.MESSAGE_DELETE, message);
} }
} }

View File

@@ -13,6 +13,7 @@ class MessageDeleteBulkAction extends Action {
for (const id of ids) { for (const id of ids) {
const message = channel.messages.get(id); const message = channel.messages.get(id);
if (message) { if (message) {
message.deleted = true;
messages.set(message.id, message); messages.set(message.id, message);
channel.messages.delete(id); channel.messages.delete(id);
} }

View File

@@ -23,6 +23,12 @@ class Channel extends Base {
*/ */
this.type = type ? type.toLowerCase() : 'unknown'; this.type = type ? type.toLowerCase() : 'unknown';
/**
* Whether the channel has been deleted
* @type {boolean}
*/
this.deleted = false;
if (data) this._patch(data); if (data) this._patch(data);
} }

View File

@@ -24,6 +24,12 @@ class Emoji extends Base {
* @type {?Snowflake} * @type {?Snowflake}
*/ */
this.id = emoji.id; this.id = emoji.id;
/**
* Whether this emoji has been deleted
* @type {boolean}
*/
this.deleted = false;
} }
/** /**

View File

@@ -50,6 +50,12 @@ class Guild extends Base {
*/ */
this.presences = new PresenceStore(this.client); this.presences = new PresenceStore(this.client);
/**
* Whether the bot has been removed from the guild
* @type {boolean}
*/
this.deleted = false;
if (!data) return; if (!data) return;
if (data.unavailable) { if (data.unavailable) {
/** /**

View File

@@ -39,6 +39,12 @@ class GuildMember extends Base {
*/ */
this.lastMessageChannelID = null; this.lastMessageChannelID = null;
/**
* Whether the member has been removed from the guild
* @type {boolean}
*/
this.deleted = false;
this._roles = []; this._roles = [];
if (data) this._patch(data); if (data) this._patch(data);
} }

View File

@@ -157,6 +157,12 @@ class Message extends Base {
* @private * @private
*/ */
this._edits = []; this._edits = [];
/**
* Whether this message has been deleted
* @type {boolean}
*/
this.deleted = false;
} }
/** /**
@@ -341,9 +347,9 @@ class Message extends Base {
* @readonly * @readonly
*/ */
get deletable() { get deletable() {
return this.author.id === this.client.user.id || (this.guild && return !this.deleted && (this.author.id === this.client.user.id || (this.guild &&
this.channel.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_MESSAGES) this.channel.permissionsFor(this.client.user).has(Permissions.FLAGS.MANAGE_MESSAGES)
); ));
} }
/** /**

View File

@@ -69,6 +69,12 @@ class Role extends Base {
* @type {boolean} * @type {boolean}
*/ */
this.mentionable = data.mentionable; this.mentionable = data.mentionable;
/**
* Whether the role has been deleted
* @type {boolean}
*/
this.deleted = false;
} }
/** /**