Similar to PR discord-net#2742 but this now fixes the UpdateAsync att…

…achments bug.
supitsmike · Aug 21, 2023 · 4e16a43 · 4e16a43
1 parent 171f95d
commit 4e16a43
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Discord.Net.Rest/API/Common/InteractionCallbackData.cs b/src/Discord.Net.Rest/API/Common/InteractionCallbackData.cs
@@ -30,5 +30,8 @@ internal class InteractionCallbackData
 
         [JsonProperty("custom_id")]
         public Optional<string> CustomId { get; set; }
+
+        [JsonProperty("attachments")]
+        public Optional<FileAttachment[]> Attachments { get; set; }
     }
 }
diff --git a/src/Discord.Net.Rest/Entities/Interactions/Modals/RestModal.cs b/src/Discord.Net.Rest/Entities/Interactions/Modals/RestModal.cs
@@ -523,7 +523,8 @@ public async Task UpdateAsync(Action<MessageProperties> func, RequestOptions opt
                     Components = args.Components.IsSpecified
                         ? args.Components.Value?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() ?? Array.Empty<API.ActionRowComponent>()
                         : Optional<API.ActionRowComponent[]>.Unspecified,
-                    Flags = args.Flags.IsSpecified ? args.Flags.Value ?? Optional<MessageFlags>.Unspecified : Optional<MessageFlags>.Unspecified
+                    Flags = args.Flags.IsSpecified ? args.Flags.Value ?? Optional<MessageFlags>.Unspecified : Optional<MessageFlags>.Unspecified,
+                    Attachments = args.Attachments.Value?.ToArray() ?? Array.Empty<FileAttachment>()
                 }
             };
 

diff --git a/src/Discord.Net.WebSocket/Entities/Interaction/Modals/SocketModal.cs b/src/Discord.Net.WebSocket/Entities/Interaction/Modals/SocketModal.cs
@@ -269,7 +269,8 @@ public async Task UpdateAsync(Action<MessageProperties> func, RequestOptions opt
                     Components = args.Components.IsSpecified
                         ? args.Components.Value?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() ?? Array.Empty<API.ActionRowComponent>()
                         : Optional<API.ActionRowComponent[]>.Unspecified,
-                    Flags = args.Flags.IsSpecified ? args.Flags.Value ?? Optional<MessageFlags>.Unspecified : Optional<MessageFlags>.Unspecified
+                    Flags = args.Flags.IsSpecified ? args.Flags.Value ?? Optional<MessageFlags>.Unspecified : Optional<MessageFlags>.Unspecified,
+                    Attachments = args.Attachments.Value?.ToArray() ?? Array.Empty<FileAttachment>()
                 }
             };