Add prefill for tag modals

Naamloos · Feb 27, 2024 · 754b815 · 754b815
1 parent b7fc324
commit 754b815
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/ModCore/Commands/Tags.cs b/ModCore/Commands/Tags.cs
@@ -54,7 +54,10 @@ public class Tags : ApplicationCommandModule
                 exists? "Update global tag contents" : "Create new global tag", new Dictionary<string, string>()
                 {
                     { "n", name }
-                });
+                }, exists ? new Dictionary<string, string>()
+                {
+                    { nameof(SetTagModal.Content), tag.Contents }
+                } : null);
         }
 
         [SlashCommand("override", "Creates a channel-specific override for a tag.")]
@@ -75,7 +78,10 @@ public class Tags : ApplicationCommandModule
                 exists ? "Update channel tag contents" : "Create new channel tag", new Dictionary<string, string>()
                 {
                     { "n", name }
-                });
+                }, exists? new Dictionary<string, string>()
+                {
+                    { nameof(OverrideTagModal.Content), tag.Contents } 
+                } : null);
         }
 
         [SlashCommand("remove", "Removes a tag.")]

diff --git a/ModCore/Extensions/Handlers/ModalHandler.cs b/ModCore/Extensions/Handlers/ModalHandler.cs
@@ -40,7 +40,7 @@ public ModalHandler(Type type, ModalAttribute info)
                 fields.TryAdd(property.GetCustomAttribute<ModalFieldAttribute>(), property);
         }
 
-        public async Task CreateAsync(DiscordInteraction interaction, string title, IDictionary<string, string> hiddenValues)
+        public async Task CreateAsync(DiscordInteraction interaction, string title, IDictionary<string, string> hiddenValues, IDictionary<string, string> prefill = null)
         {
             var modalString = ExtensionStatics.GenerateIdString(Info.ModalId, hiddenValues);
 
@@ -51,9 +51,14 @@ public async Task CreateAsync(DiscordInteraction interaction, string title, IDic
             foreach (var field in fields)
             {
                 var attr = field.Key;
+                string prefillValue = null;
+                if(prefill != null && prefill.Keys.Contains(field.Value.Name))
+                {
+                    prefillValue = prefill[field.Value.Name];
+                }
                 interactionResp.AddComponents(
                     new TextInputComponent(attr.DisplayText, attr.FieldName,
-                    attr.Placeholder, attr.Prefill, attr.Required, attr.InputStyle, attr.MinLength, attr.MaxLength));
+                    attr.Placeholder, attr.Prefill ?? prefillValue ?? null, attr.Required, attr.InputStyle, attr.MinLength, attr.MaxLength));
             }
 
             await interaction.CreateResponseAsync(InteractionResponseType.Modal, interactionResp);

diff --git a/ModCore/Extensions/InteractionExtension.cs b/ModCore/Extensions/InteractionExtension.cs
@@ -31,12 +31,12 @@ public InteractionExtension(IServiceProvider services)
         }
 
         public async Task RespondWithModalAsync<T>(DiscordInteraction interaction, string title,
-            IDictionary<string, string> hiddenValues = null) where T : IModal
+            IDictionary<string, string> hiddenValues = null, IDictionary<string, string> prefill = null) where T : IModal
         {
             // Cache for next call :^)
             var handler = modalHandlers.FirstOrDefault(x => x.Type == typeof(T)) ?? registerModalHandler(typeof(T));
 
-            await handler.CreateAsync(interaction, title, hiddenValues);
+            await handler.CreateAsync(interaction, title, hiddenValues, prefill);
         }
 
         public string GenerateId(string id, params (string Key, string Value)[] values)