Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-10 16:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: new node features (#5132)

Browse Source 
Co-authored-by: Antonio Román <kyradiscord@gmail.com>
This commit is contained in:
Sugden
2021-06-30 21:40:33 +01:00
committed by GitHub
parent f108746c15
commit 1e8f01253e
68 changed files with 305 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/structures/Guild.js
View File

@@ -147,13 +147,13 @@ class Guild extends AnonymousGuild {
* The full amount of members in this guild
* @type {number}
*/
this.memberCount = data.member_count || this.memberCount;
this.memberCount = data.member_count ?? this.memberCount;
/**
* Whether the guild is "large" (has more than large_threshold members, 50 by default)
* @type {boolean}
*/
this.large = Boolean('large' in data ? data.large : this.large);
this.large = Boolean(data.large ?? this.large);
/**
* An array of enabled guild features, here are the possible values:
@@ -282,7 +282,7 @@ class Guild extends AnonymousGuild {
* <info>You will need to fetch the guild using {@link Guild#fetch} if you want to receive this parameter</info>
* @type {?number}
*/
this.maximumPresences = data.max_presences || 25000;
this.maximumPresences = data.max_presences ?? 25000;
} else if (typeof this.maximumPresences === 'undefined') {
this.maximumPresences = null;
}
@@ -406,8 +406,7 @@ class Guild extends AnonymousGuild {
* @returns {?string}
*/
bannerURL({ format, size } = {}) {
if (!this.banner) return null;
return this.client.rest.cdn.Banner(this.id, this.banner, format, size);
return this.banner && this.client.rest.cdn.Banner(this.id, this.banner, format, size);
}
/**
@@ -425,8 +424,7 @@ class Guild extends AnonymousGuild {
* @returns {?string}
*/
splashURL({ format, size } = {}) {
if (!this.splash) return null;
return this.client.rest.cdn.Splash(this.id, this.splash, format, size);
return this.splash && this.client.rest.cdn.Splash(this.id, this.splash, format, size);
}
/**
@@ -435,8 +433,7 @@ class Guild extends AnonymousGuild {
* @returns {?string}
*/
discoverySplashURL({ format, size } = {}) {
if (!this.discoverySplash) return null;
return this.client.rest.cdn.DiscoverySplash(this.id, this.discoverySplash, format, size);
return this.discoverySplash && this.client.rest.cdn.DiscoverySplash(this.id, this.discoverySplash, format, size);
}
/**
@@ -462,7 +459,7 @@ class Guild extends AnonymousGuild {
* @readonly
*/
get afkChannel() {
return this.client.channels.cache.get(this.afkChannelID) || null;
return this.client.channels.resolve(this.afkChannelID);
}
/**
@@ -471,7 +468,7 @@ class Guild extends AnonymousGuild {
* @readonly
*/
get systemChannel() {
return this.client.channels.cache.get(this.systemChannelID) || null;
return this.client.channels.resolve(this.systemChannelID);
}
/**
@@ -480,7 +477,7 @@ class Guild extends AnonymousGuild {
* @readonly
*/
get widgetChannel() {
return this.client.channels.cache.get(this.widgetChannelID) || null;
return this.client.channels.resolve(this.widgetChannelID);
}
/**
@@ -489,7 +486,7 @@ class Guild extends AnonymousGuild {
* @readonly
*/
get rulesChannel() {
return this.client.channels.cache.get(this.rulesChannelID) || null;
return this.client.channels.resolve(this.rulesChannelID);
}
/**
@@ -498,7 +495,7 @@ class Guild extends AnonymousGuild {
* @readonly
*/
get publicUpdatesChannel() {
return this.client.channels.cache.get(this.publicUpdatesChannelID) || null;
return this.client.channels.resolve(this.publicUpdatesChannelID);
}
/**
@@ -508,7 +505,7 @@ class Guild extends AnonymousGuild {
*/
get me() {
return (
this.members.cache.get(this.client.user.id) ||
this.members.resolve(this.client.user.id) ??
(this.client.options.partials.includes(PartialTypes.GUILD_MEMBER)
? this.members.add({ user: { id: this.client.user.id } }, true)
: null)
@@ -917,7 +914,7 @@ class Guild extends AnonymousGuild {
const welcome_channels = welcomeChannels?.map(welcomeChannelData => {
const emoji = this.emojis.resolve(welcomeChannelData.emoji);
return {
emoji_id: emoji?.id ?? null,
emoji_id: emoji && emoji.id,
emoji_name: emoji?.name ?? welcomeChannelData.emoji,
channel_id: this.channels.resolveID(welcomeChannelData.channel),
description: welcomeChannelData.description,