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

fix(User): fix bot and system properties being incorrect in some cases (#5923)

Browse Source
This commit is contained in:
Rodry
2021-06-27 12:46:24 +01:00
committed by GitHub
parent 985d4d6a43
commit e44ae96100
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/structures/User.js
View File

@@ -27,7 +27,10 @@ class User extends Base {
*/
this.id = data.id;
this.bot = null;
this.system = null;
this.flags = null;
/**
@@ -56,12 +59,14 @@ class User extends Base {
this.username = null;
}
if ('bot' in data || typeof this.bot !== 'boolean') {
if ('bot' in data) {
/**
* Whether or not the user is a bot
* @type {boolean}
* @type {?boolean}
*/
this.bot = Boolean(data.bot);
} else if (!this.partial && typeof this.bot !== 'boolean') {
this.bot = false;
}
if ('discriminator' in data) {
@@ -90,6 +95,8 @@ class User extends Base {
* @type {?boolean}
*/
this.system = Boolean(data.system);
} else if (!this.partial && typeof this.system !== 'boolean') {
this.system = false;
}
if ('public_flags' in data) {

6
typings/index.d.ts vendored
View File

@@ -1977,7 +1977,7 @@ declare module 'discord.js' {
public lastMessageID: Snowflake | null;
public readonly partial: false;
public readonly presence: Presence;
public system: boolean | null;
public system: boolean;
public readonly tag: string;
public username: string;
public avatarURL(options?: ImageURLOptions): string | null;
@@ -4024,9 +4024,9 @@ declare module 'discord.js' {
type PartialTypes = 'USER' | 'CHANNEL' | 'GUILD_MEMBER' | 'MESSAGE' | 'REACTION';
interface PartialUser extends Omit<Partialize<User, 'bot' | 'flags' | 'system' | 'tag' | 'username'>, 'deleted'> {
bot: User['bot'];
bot: null;
flags: User['flags'];
system: User['system'];
system: null;
readonly tag: null;
username: null;
}