mirror of
https://github.com/discordjs/discord.js.git
synced 2026-03-15 11:03:30 +01:00
fix(User): compare flags in #equals (#6750)
This commit is contained in:
@@ -10,7 +10,7 @@ class GuildMemberUpdateAction extends Action {
|
|||||||
const user = client.users.cache.get(data.user.id);
|
const user = client.users.cache.get(data.user.id);
|
||||||
if (!user) {
|
if (!user) {
|
||||||
client.users._add(data.user);
|
client.users._add(data.user);
|
||||||
} else if (!user.equals(data.user)) {
|
} else if (!user._equals(data.user)) {
|
||||||
client.actions.UserUpdate.handle(data.user);
|
client.actions.UserUpdate.handle(data.user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ class PresenceUpdateAction extends Action {
|
|||||||
if (!user) return;
|
if (!user) return;
|
||||||
|
|
||||||
if (data.user?.username) {
|
if (data.user?.username) {
|
||||||
if (!user.equals(data.user)) this.client.actions.UserUpdate.handle(data.user);
|
if (!user._equals(data.user)) this.client.actions.UserUpdate.handle(data.user);
|
||||||
}
|
}
|
||||||
|
|
||||||
const guild = this.client.guilds.cache.get(data.guild_id);
|
const guild = this.client.guilds.cache.get(data.guild_id);
|
||||||
|
|||||||
@@ -247,16 +247,35 @@ class User extends Base {
|
|||||||
* @returns {boolean}
|
* @returns {boolean}
|
||||||
*/
|
*/
|
||||||
equals(user) {
|
equals(user) {
|
||||||
let equal =
|
return (
|
||||||
user &&
|
user &&
|
||||||
this.id === user.id &&
|
this.id === user.id &&
|
||||||
this.username === user.username &&
|
this.username === user.username &&
|
||||||
this.discriminator === user.discriminator &&
|
this.discriminator === user.discriminator &&
|
||||||
this.avatar === user.avatar &&
|
this.avatar === user.avatar &&
|
||||||
|
this.flags?.bitfield === user.flags?.bitfield &&
|
||||||
this.banner === user.banner &&
|
this.banner === user.banner &&
|
||||||
this.accentColor === user.accentColor;
|
this.accentColor === user.accentColor
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return equal;
|
/**
|
||||||
|
* Compares the user with an API user object
|
||||||
|
* @param {APIUser} user The API user object to compare
|
||||||
|
* @returns {boolean}
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
_equals(user) {
|
||||||
|
return (
|
||||||
|
user &&
|
||||||
|
this.id === user.id &&
|
||||||
|
this.username === user.username &&
|
||||||
|
this.discriminator === user.discriminator &&
|
||||||
|
this.avatar === user.avatar &&
|
||||||
|
this.flags?.bitfield === user.public_flags &&
|
||||||
|
('banner' in user ? this.banner === user.banner : true) &&
|
||||||
|
('accent_color' in user ? this.accentColor === user.accent_color : true)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
2
typings/index.d.ts
vendored
2
typings/index.d.ts
vendored
@@ -1982,6 +1982,8 @@ export class Typing extends Base {
|
|||||||
|
|
||||||
export class User extends PartialTextBasedChannel(Base) {
|
export class User extends PartialTextBasedChannel(Base) {
|
||||||
protected constructor(client: Client, data: RawUserData);
|
protected constructor(client: Client, data: RawUserData);
|
||||||
|
private _equals(user: APIUser): boolean;
|
||||||
|
|
||||||
public accentColor: number | null;
|
public accentColor: number | null;
|
||||||
public avatar: string | null;
|
public avatar: string | null;
|
||||||
public banner: string | null;
|
public banner: string | null;
|
||||||
|
|||||||
Reference in New Issue
Block a user