discord.js 15.0.0-dev.1742688832-73f2ef9c8 → 15.0.0-dev.1743249921-646ecae47

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "discord.js",
-  "version": "15.0.0-dev.1742688832-73f2ef9c8",
+  "version": "15.0.0-dev.1743249921-646ecae47",
   "description": "A powerful library for interacting with the Discord API",
   "main": "./src/index.js",
   "types": "./typings/index.d.ts",
@@ -60,10 +60,10 @@
     "tslib": "^2.8.1",
     "undici": "6.21.1",
     "@discordjs/builders": "^1.9.0",
+    "@discordjs/collection": "^2.1.1",
     "@discordjs/formatters": "^0.5.0",
-    "@discordjs/rest": "^2.4.0",
     "@discordjs/util": "^1.1.1",
-    "@discordjs/collection": "^2.1.1",
+    "@discordjs/rest": "^2.4.0",
     "@discordjs/ws": "^2.0.0"
   },
   "devDependencies": {
@@ -82,8 +82,8 @@
     "turbo": "^2.3.3",
     "typescript": "~5.5.4",
     "@discordjs/api-extractor": "^7.38.1",
-    "@discordjs/scripts": "^0.1.0",
-    "@discordjs/docgen": "^0.12.1"
+    "@discordjs/docgen": "^0.12.1",
+    "@discordjs/scripts": "^0.1.0"
   },
   "engines": {
     "node": ">=22.12.0"

package/src/structures/Message.js

@@ -788,6 +788,7 @@ class Message extends Base {
     return Boolean(
       channel?.type === ChannelType.GuildAnnouncement &&
         !this.flags.has(MessageFlags.Crossposted) &&
+        this.reference?.type !== MessageReferenceType.Forward &&
         this.type === MessageType.Default &&
         !this.poll &&
         channel.viewable &&

package/src/structures/Poll.js

@@ -43,10 +43,27 @@ class Poll extends Base {
 
     Object.defineProperty(this, 'message', { value: message });
 
+    /**
+     * The answers of this poll
+     * @type {Collection<number, PollAnswer|PartialPollAnswer>}
+     */
+    this.answers = new Collection();
+
     this._patch(data);
   }
 
   _patch(data) {
+    if (data.answers) {
+      for (const answer of data.answers) {
+        const existing = this.answers.get(answer.answer_id);
+        if (existing) {
+          existing._patch(answer);
+        } else {
+          this.answers.set(answer.answer_id, new PollAnswer(this.client, answer, this));
+        }
+      }
+    }
+
     if (data.results) {
       /**
        * Whether this poll's results have been precisely counted
@@ -111,23 +128,6 @@ class Poll extends Base {
         text: null,
       };
     }
-
-    /**
-     * The answers of this poll
-     * @type {Collection<number, PollAnswer|PartialPollAnswer>}
-     */
-    this.answers ??= new Collection();
-
-    if (data.answers) {
-      for (const answer of data.answers) {
-        const existing = this.answers.get(answer.answer_id);
-        if (existing) {
-          existing._patch(answer);
-        } else {
-          this.answers.set(answer.answer_id, new PollAnswer(this.client, answer, this));
-        }
-      }
-    }
   }
 
   /**

package/src/structures/PollAnswer.js

@@ -39,7 +39,7 @@ class PollAnswer extends Base {
      * @type {?APIPartialEmoji}
      * @private
      */
-    Object.defineProperty(this, '_emoji', { value: null });
+    Object.defineProperty(this, '_emoji', { value: null, writable: true });
 
     this._patch(data);
   }
@@ -63,7 +63,7 @@ class PollAnswer extends Base {
     this.text ??= data.poll_media?.text ?? null;
 
     if (data.poll_media?.emoji) {
-      Object.defineProperty(this, '_emoji', { value: data.poll_media.emoji });
+      this._emoji = data.poll_media.emoji;
     }
   }