From c52dbbb1f3a77a80e031335bac4555ee73276fc9 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Thu, 2 Dec 2021 00:03:22 +0100
Subject: [PATCH] [AB-338] fixing messages without content not properly handled
 by modmail fixing mutes and warnings paginator template

---
 .../mutes/mutes_display_response_paginator_en_US.ftl |  2 +-
 .../warnings_display_response_paginator_en_US.ftl    |  2 +-
 .../modmail_user_message_embed_en_US.ftl             | 12 ++++++------
 .../modmail_no_message_provided_en_US.ftl            |  1 +
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 translations/modmail/src/main/resources/en_US/threadContent/modmail_no_message_provided_en_US.ftl

diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl
index e6fa44cc..9274250f 100644
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/mutes/mutes_display_response_paginator_en_US.ftl
@@ -4,7 +4,7 @@
     <#assign chunks=innerModel.mutes?chunk(5)>
     <#-- we have to separate the chunk, so we can re-use it to disable the last buttons, and also we have to assign the for loop value, -->
     <#-- so it available in sub templates, also the counter needs to be defined, else it doesnt the detect its a loop variable it seems  -->
-    <#list chunks as row><#assign row=row><#include "mutes_response_entry"><#sep>,</#list>
+    <#list chunks as row><#assign counter=row?index><#assign row=row><#include "mutes_response_entry"><#sep>,</#list>
  ],
  "timeoutSeconds": 120,
  "restrictUser": true
diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
index c0f7cad6..982beca0 100644
--- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
+++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_display_response_paginator_en_US.ftl
@@ -2,7 +2,7 @@
 <#assign exitOnly=innerModel.warnings?size lt 6/>
  "embedConfigs": [
     <#assign chunks=innerModel.warnings?chunk(5)>
-    <#list chunks as row><#assign counter=row?counter><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
+    <#list chunks as row><#assign counter=row?index><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
  ],
  "timeoutSeconds": 120,
  "restrictUser": true
diff --git a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
index d07ecf46..93437367 100644
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
@@ -5,15 +5,15 @@
     "title": "<@safe_include "modmail_thread_user_message_title"/>"
   },
   <#include "modmail_color">,
+  <#if subscribers?size gt 0>
+   "additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>",
+  </#if>
   <#if postedMessage.contentRaw?has_content>
     "description": "${postedMessage.contentRaw?json_string}"
+  <#else>
+    "description": "<@safe_include "modmail_no_message_provided"/>"
   </#if>
    <#if postedMessage.attachments?size gt 0>
-   <#if postedMessage.contentRaw?has_content>,</#if>
-   "imageUrl": "${postedMessage.attachments[0].proxyUrl}"
-   </#if>
-   <#if subscribers?size gt 0>
-   <#if postedMessage.contentRaw?has_content || postedMessage.attachments?size gt 0>,</#if>
-   "additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"
+   ,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
    </#if>
 }
\ No newline at end of file
diff --git a/translations/modmail/src/main/resources/en_US/threadContent/modmail_no_message_provided_en_US.ftl b/translations/modmail/src/main/resources/en_US/threadContent/modmail_no_message_provided_en_US.ftl
new file mode 100644
index 00000000..48bbb34d
--- /dev/null
+++ b/translations/modmail/src/main/resources/en_US/threadContent/modmail_no_message_provided_en_US.ftl
@@ -0,0 +1 @@
+No message provided.
\ No newline at end of file