fix(ClientPresence): produce valid activities for set presences (#5799)

discordjs · Jun 10, 2021 · ea0e06f · ea0e06f
1 parent 68f7aeb
commit ea0e06f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/structures/ClientPresence.js b/src/structures/ClientPresence.js
@@ -35,11 +35,7 @@ class ClientPresence extends Presence {
       since: typeof since === 'number' && !Number.isNaN(since) ? since : null,
       status: status || this.status,
     };
-    if (activities === null) {
-      data.activities = null;
-      return data;
-    }
-    if (activities && activities.length) {
+    if (activities?.length) {
       for (const [i, activity] of activities.entries()) {
         if (typeof activity.name !== 'string') throw new TypeError('INVALID_TYPE', `activities[${i}].name`, 'string');
         if (!activity.type) activity.type = 0;
@@ -50,8 +46,14 @@ class ClientPresence extends Presence {
           url: activity.url,
         });
       }
-    } else if ((status || afk || since) && this.activities.length) {
-      data.activities.push(...this.activities);
+    } else if (!activities && (status || afk || since) && this.activities.length) {
+      data.activities.push(
+        ...this.activities.map(a => ({
+          name: a.name,
+          type: ActivityTypes.indexOf(a.type),
+          url: a.url ?? undefined,
+        })),
+      );
     }
 
     return data;

diff --git a/src/structures/ClientUser.js b/src/structures/ClientUser.js
@@ -161,7 +161,7 @@ class ClientUser extends Structures.get('User') {
    * client.user.setActivity('discord.js', { type: 'WATCHING' });
    */
   setActivity(name, options = {}) {
-    if (!name) return this.setPresence({ activities: null, shardID: options.shardID });
+    if (!name) return this.setPresence({ activities: [], shardID: options.shardID });
 
     const activity = Object.assign({}, options, typeof name === 'object' ? name : { name });
     return this.setPresence({ activities: [activity], shardID: activity.shardID });