From d7aeb8f5b92490fe4af1ee49c79ed4e5c101ec74 Mon Sep 17 00:00:00 2001 From: Eejit <76887639+Eejit43@users.noreply.github.com> Date: Wed, 16 Nov 2022 18:03:05 -0500 Subject: [PATCH 1/5] Fix presence updating --- packages/discord.js/src/structures/Presence.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/Presence.js b/packages/discord.js/src/structures/Presence.js index 825bc01029de..2300f62c6ae3 100644 --- a/packages/discord.js/src/structures/Presence.js +++ b/packages/discord.js/src/structures/Presence.js @@ -254,7 +254,8 @@ class Activity { this.type === activity.type && this.url === activity.url && this.state === activity.state && - this.details === activity.details) + this.details === activity.details && + this.emoji === activity.emoji) ); } From 9feac62129787f2eb69f6ab21d1d70b86faee7d3 Mon Sep 17 00:00:00 2001 From: Eejit <76887639+Eejit43@users.noreply.github.com> Date: Wed, 16 Nov 2022 18:18:27 -0500 Subject: [PATCH 2/5] Update packages/discord.js/src/structures/Presence.js Co-authored-by: Almeida --- packages/discord.js/src/structures/Presence.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/Presence.js b/packages/discord.js/src/structures/Presence.js index 2300f62c6ae3..9d3915e38d8d 100644 --- a/packages/discord.js/src/structures/Presence.js +++ b/packages/discord.js/src/structures/Presence.js @@ -255,7 +255,7 @@ class Activity { this.url === activity.url && this.state === activity.state && this.details === activity.details && - this.emoji === activity.emoji) + this.emoji?.id === activity.emoji?.id) ); } From 63054174a3877a5f38795fd2b17b84dfc3d700ff Mon Sep 17 00:00:00 2001 From: Eejit <76887639+Eejit43@users.noreply.github.com> Date: Wed, 16 Nov 2022 19:39:12 -0500 Subject: [PATCH 3/5] Update Presence.js --- packages/discord.js/src/structures/Presence.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/Presence.js b/packages/discord.js/src/structures/Presence.js index 9d3915e38d8d..b642f0ab9ffc 100644 --- a/packages/discord.js/src/structures/Presence.js +++ b/packages/discord.js/src/structures/Presence.js @@ -255,7 +255,8 @@ class Activity { this.url === activity.url && this.state === activity.state && this.details === activity.details && - this.emoji?.id === activity.emoji?.id) + this.emoji?.id === activity.emoji?.id && + this.emoji?.name === activity.emoji?.name) ); } From 44d52bfde8d24e2fce30318d51a40766ef85e73c Mon Sep 17 00:00:00 2001 From: Eejit <76887639+Eejit43@users.noreply.github.com> Date: Wed, 16 Nov 2022 21:06:05 -0500 Subject: [PATCH 4/5] Better emoji checking --- packages/discord.js/src/structures/Presence.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/discord.js/src/structures/Presence.js b/packages/discord.js/src/structures/Presence.js index b642f0ab9ffc..7c37f306354d 100644 --- a/packages/discord.js/src/structures/Presence.js +++ b/packages/discord.js/src/structures/Presence.js @@ -255,8 +255,7 @@ class Activity { this.url === activity.url && this.state === activity.state && this.details === activity.details && - this.emoji?.id === activity.emoji?.id && - this.emoji?.name === activity.emoji?.name) + (this.emoji?.id ? this.emoji.id === activity.emoji?.id : this.emoji?.name === activity.emoji?.name)) ); } From dfc455df7020145445c0285956a2c3705fe35a44 Mon Sep 17 00:00:00 2001 From: Eejit <76887639+Eejit43@users.noreply.github.com> Date: Thu, 17 Nov 2022 14:07:10 -0500 Subject: [PATCH 5/5] Revert "Better emoji checking" This reverts commit 44d52bfde8d24e2fce30318d51a40766ef85e73c. --- packages/discord.js/src/structures/Presence.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/discord.js/src/structures/Presence.js b/packages/discord.js/src/structures/Presence.js index 7c37f306354d..b642f0ab9ffc 100644 --- a/packages/discord.js/src/structures/Presence.js +++ b/packages/discord.js/src/structures/Presence.js @@ -255,7 +255,8 @@ class Activity { this.url === activity.url && this.state === activity.state && this.details === activity.details && - (this.emoji?.id ? this.emoji.id === activity.emoji?.id : this.emoji?.name === activity.emoji?.name)) + this.emoji?.id === activity.emoji?.id && + this.emoji?.name === activity.emoji?.name) ); }