From 50e23bbea6397552ef9f761e122b83e4d97c1596 Mon Sep 17 00:00:00 2001 From: Khaazz Date: Sat, 23 Nov 2019 20:16:29 +0100 Subject: [PATCH 1/4] Switch ternary to if statement to prevent reassigning --- lib/structures/ExtendedUser.js | 8 +++--- lib/structures/GroupChannel.js | 6 ++--- lib/structures/Guild.js | 46 +++++++++++++++++----------------- lib/structures/GuildChannel.js | 8 +++--- lib/structures/Member.js | 8 +++--- lib/structures/Message.js | 14 +++++------ lib/structures/Role.js | 14 +++++------ lib/structures/TextChannel.js | 4 +-- lib/structures/User.js | 6 ++--- lib/structures/VoiceChannel.js | 4 +-- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/lib/structures/ExtendedUser.js b/lib/structures/ExtendedUser.js index 68d22ca6e..e18486c73 100644 --- a/lib/structures/ExtendedUser.js +++ b/lib/structures/ExtendedUser.js @@ -17,10 +17,10 @@ class ExtendedUser extends User { update(data) { super.update(data); - this.email = data.email !== undefined ? data.email : this.email; - this.verified = data.verified !== undefined ? data.verified : this.verified; - this.mfaEnabled = data.mfa_enabled !== undefined ? data.mfa_enabled : this.mfaEnabled; - this.premium = data.premium !== undefined ? data.premium : this.premium; + if(data.email !== undefined) this.email = data.email; + if(data.verified !== undefined) this.verified = data.verified; + if(data.mfaEnabled !== undefined) this.mfaEnabled = data.mfa_enabled; + if(data.premium !== undefined) this.premium = data.premium; } toJSON() { diff --git a/lib/structures/GroupChannel.js b/lib/structures/GroupChannel.js index b5a0c3816..2e381305d 100644 --- a/lib/structures/GroupChannel.js +++ b/lib/structures/GroupChannel.js @@ -30,9 +30,9 @@ class GroupChannel extends PrivateChannel { // (╯°□°）╯︵ ┻━┻ } update(data) { - this.name = data.name !== undefined ? data.name : this.name; - this.ownerID = data.owner_id !== undefined ? data.owner_id : this.ownerID; - this.icon = data.icon !== undefined ? data.icon : this.icon; + if(data.name !== undefined) this.name = data.name; + if(data.ownerID !== undefined) this.ownerID = data.owner_id; + if(data.icon !== undefined) this.icon = data.icon; } /** diff --git a/lib/structures/Guild.js b/lib/structures/Guild.js index 0d065ded2..a1b59f137 100644 --- a/lib/structures/Guild.js +++ b/lib/structures/Guild.js @@ -132,29 +132,29 @@ class Guild extends Base { } update(data) { - this.name = data.name !== undefined ? data.name : this.name; - this.verificationLevel = data.verification_level !== undefined ? data.verification_level : this.verificationLevel; - this.splash = data.splash !== undefined ? data.splash : this.splash; - this.banner = data.banner !== undefined ? data.banner : this.banner; - this.region = data.region !== undefined ? data.region : this.region; - this.ownerID = data.owner_id !== undefined ? data.owner_id : this.ownerID; - this.icon = data.icon !== undefined ? data.icon : this.icon; - this.features = data.features !== undefined ? data.features : this.features; - this.emojis = data.emojis !== undefined ? data.emojis : this.emojis; - this.afkChannelID = data.afk_channel_id !== undefined ? data.afk_channel_id : this.afkChannelID; - this.afkTimeout = data.afk_timeout !== undefined ? data.afk_timeout : this.afkTimeout; - this.defaultNotifications = data.default_message_notifications !== undefined ? data.default_message_notifications : this.defaultNotifications; - this.mfaLevel = data.mfa_level !== undefined ? data.mfa_level : this.mfaLevel; - this.large = data.large !== undefined ? data.large : this.large; - this.maxPresences = data.max_presences !== undefined ? data.max_presences : this.maxPresences; - this.explicitContentFilter = data.explicit_content_filter !== undefined ? data.explicit_content_filter : this.explicitContentFilter; - this.systemChannelID = data.system_channel_id !== undefined ? data.system_channel_id : this.systemChannelID; - this.premiumTier = data.premium_tier !== undefined ? data.premium_tier : this.premiumTier; - this.premiumSubscriptionCount = data.premium_subscription_count !== undefined ? data.premium_subscription_count : this.premiumSubscriptionCount; - this.vanityURL = data.vanity_url_code !== undefined ? data.vanity_url_code : this.vanityURL; - this.preferredLocale = data.preferred_locale !== undefined ? data.preferred_locale : this.preferredLocale; - this.description = data.description !== undefined ? data.description : this.description; - this.maxMembers = data.max_members !== undefined ? data.max_members : this.maxMembers; + if(data.name !== undefined) this.name = data.name; + if(data.verificationLevel !== undefined) this.verificationLevel = data.verification_level; + if(data.splash !== undefined) this.splash = data.splash; + if(data.banner !== undefined) this.banner = data.banner; + if(data.region !== undefined) this.region = data.region; + if(data.ownerID !== undefined) this.ownerID = data.owner_id; + if(data.icon !== undefined) this.icon = data.icon; + if(data.features !== undefined) this.features = data.features; + if(data.emojis !== undefined) this.emojis = data.emojis; + if(data.afkChannelID !== undefined) this.afkChannelID = data.afk_channel_id; + if(data.afkTimeout !== undefined) this.afkTimeout = data.afk_timeout; + if(data.defaultNotifications !== undefined) this.defaultNotifications = data.default_message_notifications; + if(data.mfaLevel !== undefined) this.mfaLevel = data.mfa_level; + if(data.large !== undefined) this.large = data.large; + if(data.maxPresences !== undefined) this.maxPresences = data.max_presences; + if(data.explicitContentFilter !== undefined) this.explicitContentFilter = data.explicit_content_filter; + if(data.systemChannelID !== undefined) this.systemChannelID = data.system_channel_id; + if(data.premiumTier !== undefined) this.premiumTier = data.premium_tier; + if(data.premiumSubscriptionCount !== undefined) this.premiumSubscriptionCount = data.premium_subscription_count; + if(data.vanityURL !== undefined) this.vanityURL = data.vanity_url_code; + if(data.preferredLocale !== undefined) this.preferredLocale = data.preferred_locale; + if(data.description !== undefined) this.description = data.description; + if(data.maxMembers !== undefined) this.maxMembers = data.max_members; } /** diff --git a/lib/structures/GuildChannel.js b/lib/structures/GuildChannel.js index 39ae80c8a..242e5bf99 100644 --- a/lib/structures/GuildChannel.js +++ b/lib/structures/GuildChannel.js @@ -34,10 +34,10 @@ class GuildChannel extends Channel { } update(data) { - this.type = data.type !== undefined ? data.type : this.type; - this.name = data.name !== undefined ? data.name : this.name; - this.position = data.position !== undefined ? data.position : this.position; - this.parentID = data.parent_id !== undefined ? data.parent_id : this.parentID; + if(data.type !== undefined) this.type = data.type; + if(data.name !== undefined) this.name = data.name; + if(data.position !== undefined) this.position = data.position; + if(data.parentID !== undefined) this.parentID = data.parent_id; this.nsfw = (this.name.length === 4 ? this.name === "nsfw" : this.name.startsWith("nsfw-")) || data.nsfw; if(data.permission_overwrites) { this.permissionOverwrites = new Collection(PermissionOverwrite); diff --git a/lib/structures/Member.js b/lib/structures/Member.js index e79a14894..f1bc79ea0 100644 --- a/lib/structures/Member.js +++ b/lib/structures/Member.js @@ -60,10 +60,10 @@ class Member extends Base { update(data) { this.status = data.status !== undefined ? data.status : this.status || "offline"; this.game = data.game !== undefined ? data.game : this.game || null; - this.joinedAt = data.joined_at !== undefined ? Date.parse(data.joined_at) : this.joinedAt; - this.clientStatus = data.client_status !== undefined ? Object.assign({web: "offline", desktop: "offline", mobile: "offline"}, data.client_status) : this.clientStatus; - this.activities = data.activities !== undefined ? data.activities : this.activities; - this.premiumSince = data.premium_since !== undefined ? data.premium_since : this.premiumSince; + if(data.joined_at !== undefined) this.joinedAt = Date.parse(data.joined_at); + if(data.client_status !== undefined) this.clientStatus = Object.assign({web: "offline", desktop: "offline", mobile: "offline"}, data.client_status); + if(data.activities !== undefined) this.activities = data.activities; + if(data.premiumSince !== undefined) this.premiumSince = data.premium_since; if("mute" in data) { const state = this.guild.voiceStates.get(this.id); diff --git a/lib/structures/Message.js b/lib/structures/Message.js index 6fd787457..924ee3bd9 100644 --- a/lib/structures/Message.js +++ b/lib/structures/Message.js @@ -150,13 +150,13 @@ class Message extends Base { this.roleMentions = data.mention_roles; } - this.pinned = data.pinned !== undefined ? !!data.pinned : this.pinned; - this.editedTimestamp = data.edited_timestamp != undefined ? Date.parse(data.edited_timestamp) : this.editedTimestamp; - this.tts = data.tts !== undefined ? data.tts : this.tts; - this.attachments = data.attachments !== undefined ? data.attachments : this.attachments; - this.embeds = data.embeds !== undefined ? data.embeds : this.embeds; - this.activity = data.activity !== undefined ? data.activity : this.activity; - this.application = data.application !== undefined ? data.application : this.application; + if(data.pinned !== undefined) this.pinned = !!data.pinned; + if(data.edited_timestamp != undefined) this.editedTimestamp = Date.parse(data.edited_timestamp); + if(data.tts !== undefined) this.tts = data.tts; + if(data.attachments !== undefined) this.attachments = data.attachments; + if(data.embeds !== undefined) this.embeds = data.embeds; + if(data.activity !== undefined) this.activity = data.activity; + if(data.application !== undefined) this.application = data.application; if(data.reactions) { data.reactions.forEach((reaction) => { diff --git a/lib/structures/Role.js b/lib/structures/Role.js index e3e804129..fe5da13ce 100644 --- a/lib/structures/Role.js +++ b/lib/structures/Role.js @@ -26,13 +26,13 @@ class Role extends Base { } update(data) { - this.name = data.name !== undefined ? data.name : this.name; - this.mentionable = data.mentionable !== undefined ? data.mentionable : this.mentionable; - this.managed = data.managed !== undefined ? data.managed : this.managed; - this.hoist = data.hoist !== undefined ? data.hoist : this.hoist; - this.color = data.color !== undefined ? data.color : this.color; - this.position = data.position !== undefined ? data.position : this.position; - this.permissions = data.permissions !== undefined ? new Permission(data.permissions) : this.permissions; + if(data.name !== undefined) this.name = data.name; + if(data.mentionable !== undefined) this.mentionable = data.mentionable; + if(data.managed !== undefined) this.managed = data.managed; + if(data.hoist !== undefined) this.hoist = data.hoist; + if(data.color !== undefined) this.color = data.color; + if(data.position !== undefined) this.position = data.position; + if(data.permissions !== undefined) this.permissions = new Permission(data.permissions); } /** diff --git a/lib/structures/TextChannel.js b/lib/structures/TextChannel.js index fdcc242d2..4799d1eca 100644 --- a/lib/structures/TextChannel.js +++ b/lib/structures/TextChannel.js @@ -37,8 +37,8 @@ class TextChannel extends GuildChannel { update(data) { super.update(data); - this.rateLimitPerUser = data.rate_limit_per_user !== undefined ? data.rate_limit_per_user : this.rateLimitPerUser; - this.topic = data.topic !== undefined ? data.topic : this.topic; + if(data.rateLimitPerUser !== undefined) this.rateLimitPerUser = data.rate_limit_per_user; + if(data.topic !== undefined) this.topic = data.topic; } /** diff --git a/lib/structures/User.js b/lib/structures/User.js index 710d1bd15..d0fbd8e34 100644 --- a/lib/structures/User.js +++ b/lib/structures/User.js @@ -31,9 +31,9 @@ class User extends Base { } update(data) { - this.avatar = data.avatar !== undefined ? data.avatar : this.avatar; - this.username = data.username !== undefined ? data.username : this.username; - this.discriminator = data.discriminator !== undefined ? data.discriminator : this.discriminator; + if(data.avatar !== undefined) this.avatar = data.avatar; + if(data.username !== undefined) this.username = data.username; + if(data.discriminator !== undefined) this.discriminator = data.discriminator; } get mention() { diff --git a/lib/structures/VoiceChannel.js b/lib/structures/VoiceChannel.js index a6ec646ed..352fe241e 100644 --- a/lib/structures/VoiceChannel.js +++ b/lib/structures/VoiceChannel.js @@ -30,8 +30,8 @@ class VoiceChannel extends GuildChannel { update(data) { super.update(data); - this.bitrate = data.bitrate !== undefined ? data.bitrate : this.bitrate; - this.userLimit = data.user_limit !== undefined ? data.user_limit : this.userLimit; + if(data.bitrate !== undefined) this.bitrate = data.bitrate; + if(data.userLimit !== undefined) this.userLimit = data.user_limit; } /** From 0908d7ca24c75b53f326434188feb3cd479e2ff2 Mon Sep 17 00:00:00 2001 From: Khaazz Date: Sat, 23 Nov 2019 20:55:34 +0100 Subject: [PATCH 2/4] Fixes undescoresm --- lib/structures/ExtendedUser.js | 2 +- lib/structures/GroupChannel.js | 2 +- lib/structures/GuildChannel.js | 2 +- lib/structures/Member.js | 2 +- lib/structures/TextChannel.js | 2 +- lib/structures/VoiceChannel.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/structures/ExtendedUser.js b/lib/structures/ExtendedUser.js index e18486c73..427fb5935 100644 --- a/lib/structures/ExtendedUser.js +++ b/lib/structures/ExtendedUser.js @@ -19,7 +19,7 @@ class ExtendedUser extends User { super.update(data); if(data.email !== undefined) this.email = data.email; if(data.verified !== undefined) this.verified = data.verified; - if(data.mfaEnabled !== undefined) this.mfaEnabled = data.mfa_enabled; + if(data.mfa_Enabled !== undefined) this.mfaEnabled = data.mfa_enabled; if(data.premium !== undefined) this.premium = data.premium; } diff --git a/lib/structures/GroupChannel.js b/lib/structures/GroupChannel.js index 2e381305d..3f942ca0f 100644 --- a/lib/structures/GroupChannel.js +++ b/lib/structures/GroupChannel.js @@ -31,7 +31,7 @@ class GroupChannel extends PrivateChannel { // (╯°□°）╯︵ ┻━┻ update(data) { if(data.name !== undefined) this.name = data.name; - if(data.ownerID !== undefined) this.ownerID = data.owner_id; + if(data.owner_id !== undefined) this.ownerID = data.owner_id; if(data.icon !== undefined) this.icon = data.icon; } diff --git a/lib/structures/GuildChannel.js b/lib/structures/GuildChannel.js index 242e5bf99..8e5871c75 100644 --- a/lib/structures/GuildChannel.js +++ b/lib/structures/GuildChannel.js @@ -37,7 +37,7 @@ class GuildChannel extends Channel { if(data.type !== undefined) this.type = data.type; if(data.name !== undefined) this.name = data.name; if(data.position !== undefined) this.position = data.position; - if(data.parentID !== undefined) this.parentID = data.parent_id; + if(data.parent_id !== undefined) this.parentID = data.parent_id; this.nsfw = (this.name.length === 4 ? this.name === "nsfw" : this.name.startsWith("nsfw-")) || data.nsfw; if(data.permission_overwrites) { this.permissionOverwrites = new Collection(PermissionOverwrite); diff --git a/lib/structures/Member.js b/lib/structures/Member.js index f1bc79ea0..f17bec8eb 100644 --- a/lib/structures/Member.js +++ b/lib/structures/Member.js @@ -63,7 +63,7 @@ class Member extends Base { if(data.joined_at !== undefined) this.joinedAt = Date.parse(data.joined_at); if(data.client_status !== undefined) this.clientStatus = Object.assign({web: "offline", desktop: "offline", mobile: "offline"}, data.client_status); if(data.activities !== undefined) this.activities = data.activities; - if(data.premiumSince !== undefined) this.premiumSince = data.premium_since; + if(data.premium_since !== undefined) this.premiumSince = data.premium_since; if("mute" in data) { const state = this.guild.voiceStates.get(this.id); diff --git a/lib/structures/TextChannel.js b/lib/structures/TextChannel.js index 4799d1eca..80355ba81 100644 --- a/lib/structures/TextChannel.js +++ b/lib/structures/TextChannel.js @@ -37,7 +37,7 @@ class TextChannel extends GuildChannel { update(data) { super.update(data); - if(data.rateLimitPerUser !== undefined) this.rateLimitPerUser = data.rate_limit_per_user; + if(data.rate_limit_per_user !== undefined) this.rateLimitPerUser = data.rate_limit_per_user; if(data.topic !== undefined) this.topic = data.topic; } diff --git a/lib/structures/VoiceChannel.js b/lib/structures/VoiceChannel.js index 352fe241e..863bff081 100644 --- a/lib/structures/VoiceChannel.js +++ b/lib/structures/VoiceChannel.js @@ -31,7 +31,7 @@ class VoiceChannel extends GuildChannel { super.update(data); if(data.bitrate !== undefined) this.bitrate = data.bitrate; - if(data.userLimit !== undefined) this.userLimit = data.user_limit; + if(data.user_limit !== undefined) this.userLimit = data.user_limit; } /** From 57b1952e89f4985c1d987b34cef0016f10548380 Mon Sep 17 00:00:00 2001 From: Khaazz Date: Sat, 23 Nov 2019 20:58:31 +0100 Subject: [PATCH 3/4] Fixes guild update method (incorrect data. ) --- lib/structures/Guild.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/structures/Guild.js b/lib/structures/Guild.js index a1b59f137..4b37d2382 100644 --- a/lib/structures/Guild.js +++ b/lib/structures/Guild.js @@ -133,28 +133,28 @@ class Guild extends Base { update(data) { if(data.name !== undefined) this.name = data.name; - if(data.verificationLevel !== undefined) this.verificationLevel = data.verification_level; + if(data.verification_level !== undefined) this.verificationLevel = data.verification_level; if(data.splash !== undefined) this.splash = data.splash; if(data.banner !== undefined) this.banner = data.banner; if(data.region !== undefined) this.region = data.region; - if(data.ownerID !== undefined) this.ownerID = data.owner_id; + if(data.owner_id !== undefined) this.ownerID = data.owner_id; if(data.icon !== undefined) this.icon = data.icon; if(data.features !== undefined) this.features = data.features; if(data.emojis !== undefined) this.emojis = data.emojis; - if(data.afkChannelID !== undefined) this.afkChannelID = data.afk_channel_id; - if(data.afkTimeout !== undefined) this.afkTimeout = data.afk_timeout; - if(data.defaultNotifications !== undefined) this.defaultNotifications = data.default_message_notifications; - if(data.mfaLevel !== undefined) this.mfaLevel = data.mfa_level; + if(data.afk_channel_id !== undefined) this.afkChannelID = data.afk_channel_id; + if(data.afk_timeout !== undefined) this.afkTimeout = data.afk_timeout; + if(data.default_message_notifications !== undefined) this.defaultNotifications = data.default_message_notifications; + if(data.mfa_level !== undefined) this.mfaLevel = data.mfa_level; if(data.large !== undefined) this.large = data.large; - if(data.maxPresences !== undefined) this.maxPresences = data.max_presences; - if(data.explicitContentFilter !== undefined) this.explicitContentFilter = data.explicit_content_filter; - if(data.systemChannelID !== undefined) this.systemChannelID = data.system_channel_id; - if(data.premiumTier !== undefined) this.premiumTier = data.premium_tier; - if(data.premiumSubscriptionCount !== undefined) this.premiumSubscriptionCount = data.premium_subscription_count; - if(data.vanityURL !== undefined) this.vanityURL = data.vanity_url_code; - if(data.preferredLocale !== undefined) this.preferredLocale = data.preferred_locale; + if(data.max_presences !== undefined) this.maxPresences = data.max_presences; + if(data.explicit_content_filter !== undefined) this.explicitContentFilter = data.explicit_content_filter; + if(data.system_channel_id !== undefined) this.systemChannelID = data.system_channel_id; + if(data.premium_tier !== undefined) this.premiumTier = data.premium_tier; + if(data.premium_subscription_count !== undefined) this.premiumSubscriptionCount = data.premium_subscription_count; + if(data.vanity_url_code !== undefined) this.vanityURL = data.vanity_url_code; + if(data.preferred_locale !== undefined) this.preferredLocale = data.preferred_locale; if(data.description !== undefined) this.description = data.description; - if(data.maxMembers !== undefined) this.maxMembers = data.max_members; + if(data.max_members !== undefined) this.maxMembers = data.max_members; } /** From b3b51d230a73d9eeb9b00faa78b24057d0182e08 Mon Sep 17 00:00:00 2001 From: Khaazz Date: Sat, 23 Nov 2019 21:12:47 +0100 Subject: [PATCH 4/4] typo --- lib/structures/ExtendedUser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/structures/ExtendedUser.js b/lib/structures/ExtendedUser.js index 427fb5935..bc06d89d5 100644 --- a/lib/structures/ExtendedUser.js +++ b/lib/structures/ExtendedUser.js @@ -19,7 +19,7 @@ class ExtendedUser extends User { super.update(data); if(data.email !== undefined) this.email = data.email; if(data.verified !== undefined) this.verified = data.verified; - if(data.mfa_Enabled !== undefined) this.mfaEnabled = data.mfa_enabled; + if(data.mfa_enabled !== undefined) this.mfaEnabled = data.mfa_enabled; if(data.premium !== undefined) this.premium = data.premium; }