fix: allowedMentions, container, media item toJSON() for components v2

backport #10852 djs

src/structures/BaseMessageComponent.js

@@ -161,6 +161,19 @@ class BaseMessageComponent {
   static resolveType(type) {
     return typeof type === 'string' ? type : MessageComponentTypes[type];
   }
+
+  static extractInteractiveComponents(component) {
+    switch (component.type) {
+      case MessageComponentTypes.ACTION_ROW:
+        return component.components;
+      case MessageComponentTypes.SECTION:
+        return [...component.components, component.accessory];
+      case MessageComponentTypes.CONTAINER:
+        return component.components.flatMap(BaseMessageComponent.extractInteractiveComponents);
+      default:
+        return [component];
+    }
+  }
 }
 
 module.exports = BaseMessageComponent;

src/structures/Message.js

@@ -1003,7 +1003,11 @@ class Message extends Base {
    * @returns {?MessageActionRowComponent}
    */
   resolveComponent(customId) {
-    return this.components.flatMap(row => row.components).find(component => component.customId === customId) ?? null;
+    return (
+      this.components
+        .flatMap(BaseMessageComponent.extractInteractiveComponents)
+        .find(component => (component.customId ?? component.custom_id) === customId) ?? null
+    );
   }
 
   /**

src/structures/MessagePayload.js

@@ -257,7 +257,7 @@ class MessagePayload {
       username,
       avatar_url: avatarURL,
       allowed_mentions:
-        typeof content === 'undefined' && typeof message_reference === 'undefined' ? undefined : allowedMentions,
+        this.isMessage && this.target?.author?.id !== this.target?.client?.user?.id ? undefined : allowedMentions,
       flags,
       message_reference,
       attachments: this.options.attachments,

src/structures/UnfurledMediaItem.js

@@ -12,15 +12,17 @@ class UnfurledMediaItem {
      * @type {string}
      */
     this.url = data.url ?? null;
+    /**
+     * @type {APIUnfurledMediaItem}
+     */
+    this.data = data;
   }
   /**
-   *
+   * Returns the API-compatible JSON for this media item
    * @returns {APIUnfurledMediaItem}
    */
   toJSON() {
-    return {
+    return { ...this.data };
-      url: this.url,
-    };
   }
 }