replaced includes with safe includes, so that the json syntax is not broken

abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_reminder_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "author": {
-    "name": "${member.effectiveName}",
+    "name": "${member.effectiveName?js_string}",
     "avatar":  "${member.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -8,20 +8,20 @@
     "g": 0,
     "b": 255
   },
-  "description": "<#include "remind_reminder_description">",
+  "description": "<@safe_include "remind_reminder_description"/>",
   "fields": [
     {
-        "name": "<#include "remind_reminder_duration_field_title">",
+        "name": "<@safe_include "remind_reminder_duration_field_title"/>",
         "value": "${fmtDuration(duration)}"
     },
     {
-        "name": "<#include "remind_reminder_note_field_title">",
-        "value": "${reminder.text}"
+        "name": "<@safe_include "remind_reminder_note_field_title"/>",
+        "value": "${reminder.text?js_string}"
     },
     {
-        "name": "<#include "remind_reminder_link_field_title">",
-        "value": "[<#include "remind_reminder_link_content_display_text">](${messageUrl})"
+        "name": "<@safe_include "remind_reminder_link_field_title"/>",
+        "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
     }
   ],
-  "additionalMessage": "${member.asMention}"
+  "additionalMessage": "${member.asMention?js_string}"
 }

abstracto-modules/utility/src/main/resources/en_US/commands/remind/remind_response_embed_en_US.ftl

@@ -2,7 +2,7 @@
     <#assign id>${reminder.id}</#assign>
     <#assign messageUrl>${message.jumpUrl}</#assign>
   "author": {
-    "name": "${member.effectiveName}",
+    "name": "${member.effectiveName?js_string}",
     "avatar":  "${member.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -10,6 +10,6 @@
     "g": 0,
     "b": 255
   },
-  "description": "<#include "remind_reminding_description_text">",
-  "additionalMessage": "${member.asMention}"
+  "description": "<@safe_include "remind_reminding_description_text"/>",
+  "additionalMessage": "${member.asMention?js_string}"
 }

abstracto-modules/utility/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "author": {
-    "name": "${member.effectiveName}",
+    "name": "${member.effectiveName?js_string}",
     "avatar":  "${member.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -9,14 +9,14 @@
     "b": 255
   },
    "title": {
-      "title": "<#include "reminders_reminders_embed_title">"
+      "title": "<@safe_include "reminders_reminders_embed_title"/>"
     },
    "fields": [
-       <#list reminders as reminder>
+       <#list reminders as reminder><#assign reminder=reminder/>
            {
            <#assign id>${reminder.id}</#assign>
-            "name": "<#include "reminders_reminder_field_title">",
-            "value": "<#include "reminders_due_on">"
+            "name": "<@safe_include "reminders_reminder_field_title"/>",
+            "value": "<@safe_include "reminders_due_on"/>"
            }
        <#sep>,
        </#list>

abstracto-modules/utility/src/main/resources/en_US/commands/serverInfo/serverinfo_response_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "title": {
-    "title": "<#assign name=guild.name><#include "serverinfo_embed_title">"
+    "title": "<#assign name=guild.name><@safe_include "serverinfo_embed_title"/>"
   },
   "color" : {
     "r": 200,
@@ -9,33 +9,33 @@
   },
   "fields": [
       {
-            "name": "<#include "serverinfo_embed_id_field_title">",
+            "name": "<@safe_include "serverinfo_embed_id_field_title"/>",
             "value": "${guild.id}",
             "inline": "true"
       },
       {
-            "name": "<#include "serverinfo_embed_owner_field_title">",
-            "value": "${guild.owner.effectiveName}#${guild.owner.user.discriminator}",
+            "name": "<@safe_include "serverinfo_embed_owner_field_title"/>",
+            "value": "${guild.owner.effectiveName?js_string}#${guild.owner.user.discriminator}",
             "inline": "true"
       },
       {
-            "name": "<#include "serverinfo_embed_members_field_title">",
+            "name": "<@safe_include "serverinfo_embed_members_field_title"/>",
             "value": "${guild.memberCount}",
             "inline": "true"
       },
       {
-            "name": "<#include "serverinfo_embed_role_count_field_title">",
+            "name": "<@safe_include "serverinfo_embed_role_count_field_title"/>",
             "value": "${guild.roles?size}",
             "inline": "true"
       },
       {
-            "name": "<#include "serverinfo_embed_created_field_title">",
+            "name": "<@safe_include "serverinfo_embed_created_field_title">",
             "value": "${guild.timeCreated}",
             "inline": "true"
       },
       ${safeFieldLength(guild.emotes, 'emote_mention', 'serverinfo_embed_emotes_field_title', 'false')},
       {
-            "name": "<#include "serverinfo_embed_features_field_title">",
+            "name": "<@safe_include "serverinfo_embed_features_field_title"/>",
             "value": "<#list guild.features as feature>${feature}<#else>No features</#list>",
             "inline": "true"
       }

abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "author": {
-    "name": "${memberInfo.user.name}#${memberInfo.user.discriminator}",
+    "name": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}",
     "avatar":  "${memberInfo.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -11,13 +11,13 @@
   "imageUrl":  "${memberInfo.user.effectiveAvatarUrl}",
   "fields": [
   {
-        "name": "<#include "showAvatar_response_embed_user_field_title">",
-        "value": "${memberInfo.user.name}#${memberInfo.user.discriminator}",
+        "name": "<@safe_include "showAvatar_response_embed_user_field_title"/>",
+        "value": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}",
         "inline": "true"
   },
   {
-        "name": "<#include "showAvatar_response_embed_image_field_title">",
-        "value": "[<#include "showAvatar_response_embed_image_field_value_display">](${memberInfo.user.effectiveAvatarUrl})",
+        "name": "<@safe_include "showAvatar_response_embed_image_field_title"/>",
+        "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${memberInfo.user.effectiveAvatarUrl})",
         "inline": "true"
   }
   ]

abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl

@@ -1,51 +1,51 @@
 {
   "title": {
-    "title": "<#include "starStats_response_title">"
+    "title": "<@safe_include "starStats_response_title"/>"
   },
   "color" : {
     "r": 200,
     "g": 0,
     "b": 255
   },
-  "description": "<#include "startStats_description">",
+  "description": "<@safe_include "startStats_description"/>",
   "fields": [
       {
-            "name": "<#include "starStats_top_starred_field_title">",
+            "name": "<@safe_include "starStats_top_starred_field_title"/>",
             "value": "
-                <#list topPosts as post>
-                <#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</assign><#assign link>${post.messageUrl}</#assign> <#include "starStats_starred_entry">
+                <#list topPosts as post><#assign post=post/>
+                <#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/>
                 <#else>
-                    <#include "starStats_no_starred_messages">
+                    <@safe_include "starStats_no_starred_messages"/>
                 </#list>
             "
       },
       {
-            "name": "<#include "starStats_top_starrer_field_title">",
+            "name": "<@safe_include "starStats_top_starrer_field_title"/>",
             "value": "
-                <#list starGiver as starrer>
+                <#list starGiver as starrer><#assign starrer=starrer/>
                     <#assign badge>${badgeEmotes[starrer?index]}</#assign><#assign count>${starrer.starCount}</assign>
                     <#if starrer.member?has_content>
-                    <#assign user>${starrer.member.asMention}</#assign> <#include "starStats_starrer_entry">
+                    <#assign user>${starrer.member.asMention?js_string}</#assign> <@safe_include "starStats_starrer_entry"/>
                     <#else>
-                        <#assign user>${starrer.user.id?c}</#assign> <#include "starStats_starrer_entry_left_guild_en_US.ftl">
+                        <#assign user>${starrer.user.id?c}</#assign> <@safe_include "starStats_starrer_entry_left_guild"/>
                     </#if>
                  <#else>
-                     <#include "starStats_no_starred_messages">
+                     <@safe_include "starStats_no_starred_messages"/>
                 </#list>
             "
       },
      {
-             "name": "<#include "starStats_top_receiver_field_title">",
+             "name": "<@safe_include "starStats_top_receiver_field_title"/>",
              "value": "
-                <#list starReceiver as starred>
+                <#list starReceiver as starred><#assign starred=starred/>
                     <#assign badge>${badgeEmotes[starred?index]}</#assign><#assign count>${starred.starCount}</assign>
                     <#if starred.member?has_content>
-                     <#assign user>${starred.member.asMention}</#assign> <#include "starStats_receiver_entry">
+                     <#assign user>${starred.member.asMention?js_string}</#assign> <@safe_include "starStats_receiver_entry"/>
                     <#else>
-                     <#assign user>${starred.user.id?c}</#assign> <#include "starStats_receiver_entry_left_guild">
+                     <#assign user>${starred.user.id?c}</#assign> <@safe_include "starStats_receiver_entry_left_guild"/>
                     </#if>
                 <#else>
-                   <#include "starStats_no_starred_messages">
+                   <@safe_include "starStats_no_starred_messages"/>
                 </#list>
              "
      }

abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl

@@ -1,7 +1,7 @@
 {
   "author": {
     <#if suggester?has_content>
-    "name": "${suggester.effectiveName}",
+    "name": "${suggester.effectiveName?js_string}",
     "avatar":  "${suggester.user.effectiveAvatarUrl}"
     <#else>
     "name": "${suggesterUser.userReference.id}"
@@ -12,24 +12,24 @@
     "g": 0,
     "b": 255
   },
-  <#assign user>${member.effectiveName}</#assign>
+  <#assign user>${member.effectiveName?js_string}</#assign>
   <#assign id>${suggestion.id}</#assign>
   <#if suggestion.state = "ACCEPTED">
-    "description": "~~${text}~~ \n✅ ${reason} - <#include "suggest_accepted_by">",
+    "description": "~~${text?js_string}~~ \n✅ ${reason} - <@safe_include "suggest_accepted_by"/>",
   <#elseif suggestion.state = "REJECTED">
-    "description": "~~${text}~~ \n❌ ${reason} - <#include "suggest_rejected_by">",
+    "description": "~~${text?js_string}~~ \n❌ ${reason} - <@safe_include "suggest_rejected_by"/>",
   <#else>
-    "description": "${text}",
+    "description": "${text?js_string}",
   </#if>
   <#if suggestion.state = "ACCEPTED" || suggestion.state = "REJECTED">
   "fields": [
     {
-        "name": "<#include "suggest_link_field_title">",
-        "value": "[<#include "suggest_link_display_value">](${originalMessageUrl})"
+        "name": "<@safe_include "suggest_link_field_title"/>",
+        "value": "[<@safe_include "suggest_link_display_value"/>](${originalMessageUrl})"
     }
   ],
   </#if>
   "footer": {
-    "text": "<#include "suggest_suggestion_id_footer">"
+    "text": "<@safe_include "suggest_suggestion_id_footer"/>"
   }
 }

abstracto-modules/utility/src/main/resources/en_US/commands/userInfo/userInfo_response_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "author": {
-    "name": "${memberInfo.user.name}#${memberInfo.user.discriminator}",
+    "name": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}",
     "avatar":  "${memberInfo.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -11,37 +11,37 @@
   "thumbnail":  "${memberInfo.user.effectiveAvatarUrl}",
   "fields": [
   {
-        "name": "<#include "userInfo_response_embed_id_field_title">",
+        "name": "<@safe_include "userInfo_response_embed_id_field_title"/>",
         "value": "${memberInfo.user.id}",
         "inline": "true"
   },
   <#if memberInfo.nickname?has_content>
   {
-        "name": "<#include "userInfo_response_embed_nickname_field_title">",
-        "value": "${memberInfo.nickname}",
+        "name": "<@safe_include "userInfo_response_embed_nickname_field_title"/>",
+        "value": "${memberInfo.nickname?js_string}",
         "inline": "true"
   },
   </#if>
   {
-        "name": "<#include "userInfo_response_embed_status_field_title">",
+        "name": "<@safe_include "userInfo_response_embed_status_field_title"/>",
         "value": "${memberInfo.onlineStatus.key}",
         "inline": "true"
   },
   {
-        "name": "<#include "userInfo_response_embed_joined_field_title">",
+        "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
         "value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss")}",
         "inline": "true"
   },
   {
-        "name": "<#include "userInfo_response_embed_registered_field_title">",
+        "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
         "value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss")}",
         "inline": "true"
   }
   <#if memberInfo.activities?size gt 0>
   ,
   {
-        "name": "<#include "userInfo_response_embed_activity_field_title">",
-        "value": "<#list memberInfo.activities as activity>${activity.type}<#sep>, </#list>",
+        "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>",
+        "value": "<#list memberInfo.activities as activity>${activity.type?js_string}<#sep>, </#list>",
         "inline": "true"
   }
   </#if>

abstracto-modules/utility/src/main/resources/en_US/listener/embed/message_embed_embed_en_US.ftl

@@ -1,6 +1,6 @@
 {
   "author": {
-    "name": "${author.effectiveName}",
+    "name": "${author.effectiveName?js_string}",
     "avatar": "${author.user.effectiveAvatarUrl}"
   },
   "color" : {
@@ -9,11 +9,11 @@
     "b": 255
   },
   <#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0>
-   "description": "${embeddedMessage.content}
+   "description": "${embeddedMessage.content?js_string}
    <#list embeddedMessage.embeds>
-        <#include "message_embed_embed_embeds_name">:
-        <#items as embed>
-            <#include "message_embed_embed_description">: <#if embed.description?has_content >${embed.description}</#if> <#if embed.imageUrl?has_content> <#include "message_embed_embed_image_url">: ${embed.imageUrl} </#if>
+        <@safe_include "message_embed_embed_embeds_name"/>:
+        <#items as embed><#assign embed=embed/>
+            <@safe_include "message_embed_embed_description"/>: <#if embed.description?has_content >${embed.description?js_string}</#if> <#if embed.imageUrl?has_content> <@safe_include "message_embed_embed_image_url"/>: ${embed.imageUrl} </#if>
         </#items>
    </#list>
    ",
@@ -23,11 +23,11 @@
   </#if>
   "fields": [
     {
-      "name": "<#include "message_embed_embed_quoted_by_field_title">",
-      <#assign user>${embeddingUser.asMention}</#assign>
-      <#assign channelName>${sourceChannel.name}</#assign>
+      "name": "<@safe_include "message_embed_embed_quoted_by_field_title"/>",
+      <#assign user>${embeddingUser.asMention?js_string}</#assign>
+      <#assign channelName>${sourceChannel.name?js_string}</#assign>
       <#assign messageLink>${embeddedMessage.messageUrl}</#assign>
-      "value": "<#include "message_embed_embed_quoted_by_field_value">"
+      "value": "<@safe_include "message_embed_embed_quoted_by_field_value"/>"
     }
   ],
   "timeStamp": "${embeddedMessage.timeCreated}"

abstracto-modules/utility/src/main/resources/en_US/listener/starboard/starboard_post_embed_en_US.ftl

@@ -4,7 +4,7 @@
     "name": "${author.effectiveName}",
     "avatar": "${author.user.effectiveAvatarUrl}"
   <#else>
-    "name": "${user.id?c} (<#include "user_left_server">)"
+    "name": "${user.id?c} (<@safe_include "user_left_server"/>)"
   </#if>
   },
   "color" : {
@@ -13,11 +13,11 @@
     "b": 255
   }
   <#if message.content?has_content || message.embeds?size gt 0>
-   ,"description": "${message.content}
+   ,"description": "${message.content?js_string}
    <#list message.embeds>
-        <#include "starboard_post_embed_embeds_name">:
+        <@safe_include "starboard_post_embed_embeds_name"/>:
         <#items as embed>
-            <#include "starboard_post_embed_description">: ${embed.description} <#if embed.imageUrl?has_content> <#include "starboard_post_embed_image_url">: ${embed.imageUrl} </#if>
+            <@safe_include "starboard_post_embed_description"/>: ${embed.description?js_string} <#if embed.imageUrl?has_content> <@safe_include "starboard_post_embed_image_url"/>: ${embed.imageUrl} </#if>
         </#items>
    </#list>
    "
@@ -26,20 +26,20 @@
   <#assign count>${starCount}</#assign>
   <#assign messageId>${message.messageId?c}</#assign>
   <#if channel?has_content>
-  <#assign channelMention>${channel.asMention}</#assign>
-  ,"additionalMessage": "<#include "starboard_post_embed_additional_message">"
+  <#assign channelMention>${channel.asMention?js_string}</#assign>
+  ,"additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
   <#else>
   <#assign channelMention>${aChannel.id?c}</#assign>
-  ,"additionalMessage": "<#include "starboard_post_embed_additional_message">"
+  ,"additionalMessage": "<@safe_include "starboard_post_embed_additional_message"/>"
   </#if>
   <#if message.attachmentUrls?size gt 0>
   ,"imageUrl": "${message.attachmentUrls[0]}"
   </#if>
   ,"fields": [
     {
-      "name": "<#include "starboard_post_embed_original_field_title">"
+      "name": "<@safe_include "starboard_post_embed_original_field_title"/>"
       <#if channel?has_content>
-      ,"value": "[${channel.name}](${message.messageUrl})"
+      ,"value": "[${channel.name?js_string}](${message.messageUrl})"
       <#else>
       ,"value": "[${aChannel.id?c}](${message.messageUrl})"
       </#if>