From 5a00f213daf144066b7a815d1edaaf035160162a Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 24 Dec 2023 23:25:52 +0100
Subject: [PATCH] [AB-xxx] adding templates necessary for modmail thread
 support  adding validation message to enableFeature response

---
 .../enableFeature/enableFeature_response_embed_en_US.ftl     | 2 +-
 .../en_US/command/contact/contact_response_embed_en_US.ftl   | 5 +----
 .../modmail_notification_message_embed_en_US.ftl             | 4 +++-
 ...eature_setup_modmail_thread_container_not_setup_en_US.ftl | 1 +
 .../feature_setup_posttarget_modmailContainer_en_US.ftl      | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 translations/modmail/src/main/resources/en_US/config/feature_setup_modmail_thread_container_not_setup_en_US.ftl
 create mode 100644 translations/modmail/src/main/resources/en_US/config/feature_setup_posttarget_modmailContainer_en_US.ftl

diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_response_embed_en_US.ftl
index fd65074a..199e659a 100644
--- a/abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_response_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_response_embed_en_US.ftl
@@ -1,5 +1,5 @@
 {
-    "additionalMessage": "<@safe_include "enableFeature_response_text"/>",
+    "additionalMessage": "<@safe_include "enableFeature_response_text"/><#if validationText?has_content>${validationText}</#if>",
     "messageConfig": {
         "ephemeral": true
     }
diff --git a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/contact_response_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/contact_response_embed_en_US.ftl
index fcdb3f4a..ff0ad64f 100644
--- a/abstracto-modules/modmail/src/main/resources/en_US/command/contact/contact_response_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/command/contact/contact_response_embed_en_US.ftl
@@ -1,6 +1,3 @@
 {
-    "additionalMessage": "<@safe_include "contact_response_text"/>",
-    "messageConfig": {
-        "ephemeral": true
-    }
+    "additionalMessage": "<@safe_include "contact_response_text"/>"
 }
\ No newline at end of file
diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
index 60082bad..99256ac3 100644
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
@@ -8,13 +8,15 @@
             },
             <#include "modmail_color">,
             <#assign user><@member_user_name member=member/>(${member.user.id})</#assign>
-            "description": "<@safe_include "modmail_notification_message_description"/>",
+            "description": "<@safe_include "modmail_notification_message_description"/>"
+            <#if channel?has_content>,
             "fields": [
                 {
                     "name": "<@safe_include "modmail_notification_field_title_channel"/>",
                     "value": "${channel.asMention}"
                 }
             ]
+            </#if>
         }
     ],
     "messageConfig": {
diff --git a/translations/modmail/src/main/resources/en_US/config/feature_setup_modmail_thread_container_not_setup_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/feature_setup_modmail_thread_container_not_setup_en_US.ftl
new file mode 100644
index 00000000..a5622847
--- /dev/null
+++ b/translations/modmail/src/main/resources/en_US/config/feature_setup_modmail_thread_container_not_setup_en_US.ftl
@@ -0,0 +1 @@
+The thread container for modmail is not correctly setup.
\ No newline at end of file
diff --git a/translations/modmail/src/main/resources/en_US/config/feature_setup_posttarget_modmailContainer_en_US.ftl b/translations/modmail/src/main/resources/en_US/config/feature_setup_posttarget_modmailContainer_en_US.ftl
new file mode 100644
index 00000000..4c7596ef
--- /dev/null
+++ b/translations/modmail/src/main/resources/en_US/config/feature_setup_posttarget_modmailContainer_en_US.ftl
@@ -0,0 +1 @@
+The channel which should contain the modmail threads. (In the appropriate mode). This must be a channel that can contain threads. Currently: ${currentTarget}
\ No newline at end of file