[AB-281] adapting templates for ban rework

abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl

@@ -0,0 +1 @@
+<#macro user_detail user>${user.name?json_string}#${user.discriminator} (${user.idLong?c})</#macro>

abstracto-modules/core/src/main/resources/en_US/exceptions/no_user_found_exception_en_US.ftl

@@ -0,0 +1 @@
+<#include "no_user_found_exception_text">

abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl

@@ -1,7 +1,6 @@
 {
+  <#include "user_detail">
   <#include "full_member_info">
-  <#include "member_author">
-  <@member_author member=bannedUser/>,
   "title": {
     "title": "<@safe_include "ban_log_title"/>"
   },
@@ -9,15 +8,15 @@
   "fields": [
     {
       "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-      "value": "<@full_member_info member=bannedUser/>"
+      "value": "<@user_detail user=bannedUser/>"
     },
     {
         "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-        "value": "<@full_member_info member=banningUser/>"
+        "value": "<@full_member_info member=banningMember/>"
     },
     {
         "name": "<@safe_include "ban_log_jump_link_field_title"/>",
-        "value": "[${messageChannel.name?json_string}](${message.jumpUrl})"
+        "value": "[${commandMessage.channel.name?json_string}](${commandMessage.jumpUrl})"
     },
     {
         "name": "<@safe_include "ban_log_reason_field_title"/>",

abstracto-modules/moderation/src/main/resources/en_US/command/banId/banId_log_embed_en_US.ftl

@@ -1,25 +0,0 @@
-{
-  <#include "full_member_info">
-  "title": {
-    "title": "<@safe_include "ban_log_title"/>"
-  },
-  <#include "moderation_action_color">,
-  "fields": [
-    {
-      "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-      "value": "${bannedUserId?c}"
-    },
-    {
-        "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-        "value": "<@full_member_info member=banningUser/>"
-    },
-    {
-        "name": "<@safe_include "ban_log_jump_link_field_title"/>",
-        "value": "[${messageChannel.name?json_string}](${message.jumpUrl})"
-    },
-    {
-        "name": "<@safe_include "ban_log_reason_field_title"/>",
-        "value": "${reason?json_string}"
-    }
-  ]
-}

abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl

@@ -0,0 +1,18 @@
+{
+  <#include "user_detail">
+  <#include "full_member_info">
+  "title": {
+    "title": "<@safe_include "ban_log_title"/>"
+  },
+  <#include "moderation_action_color">,
+  "fields": [
+    {
+      "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
+      "value": "<@user_detail user=bannedUser/>"
+    },
+    {
+        "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
+        "value": "<@full_member_info member=unBanningMember/>"
+    }
+  ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl

@@ -0,0 +1,11 @@
+{
+  <#include "abstracto_color">,
+  <#assign messageLink=reportedMessage.messageUrl>
+  "description" : "<@safe_include "reactionReport_notification_embed_description"/>",
+  "fields": [
+    {
+      "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
+      "value": "${reportCount}"
+    }
+  ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl

@@ -0,0 +1,25 @@
+{
+  <#include "user_detail">
+  <#include "abstracto_color">,
+  "description" : "User was banned.",
+  "fields": [
+    {
+      "name": "Banned user",
+      "value": ""<@user_detail user=unBannedUser/>"
+    }
+    <#if banningUser??>
+    ,
+    {
+        "name": "Banning user",
+        "value": "<@user_detail user=banningUser/>"
+    }
+    </#if>
+    <#if reason??>
+    ,
+    {
+        "name": "reason",
+        "value": "${reason}"
+    }
+    </#if>
+  ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/userUnBanned/userUnBanned_listener_notification_embed_en_US.ftl

@@ -0,0 +1,18 @@
+{
+  <#include "user_detail">
+  <#include "abstracto_color">,
+  "description" : "User was un-banned.",
+  "fields": [
+    {
+      "name": "Un-Banned user",
+      "value": "<@user_detail user=unBannedUser/>"
+    }
+    <#if unBanningUser??>
+    ,
+    {
+        "name": "Un-banning user",
+        "value": "<@user_detail user=unBanningUser/>"
+    }
+    </#if>
+  ]
+}

translations/core/src/main/resources/en_US/exception/no_user_found_exception_text_en_US.ftl

@@ -0,0 +1 @@
+No user found.

translations/moderation/src/main/resources/en_US/commands/ban/ban_log_banned_user_field_title_en_US.ftl

@@ -1 +1 @@
-Banned user
+Unbanned user

translations/moderation/src/main/resources/en_US/commands/banId/help/banId_description_en_US.ftl

@@ -1 +0,0 @@
-Bans the user with the given reason

translations/moderation/src/main/resources/en_US/commands/banId/help/banId_example_en_US.ftl

@@ -1 +0,0 @@
-`banId 1234 bad` in order to ban the user with ID `1234` with the reason `bad`

translations/moderation/src/main/resources/en_US/commands/banId/help/banId_long_help_en_US.ftl

@@ -1 +0,0 @@
-Bans the user by ID. This is necessary, if the user already left the server for example.

translations/moderation/src/main/resources/en_US/commands/banId/help/banId_parameter_reason_en_US.ftl

@@ -1 +0,0 @@
-The reason which should be used for the ban.

translations/moderation/src/main/resources/en_US/commands/banId/help/banId_parameter_user_en_US.ftl

@@ -1 +0,0 @@
-The id of the user to ban.

translations/moderation/src/main/resources/en_US/commands/unBan/help/unBan_description_en_US.ftl

@@ -0,0 +1 @@
+Un-bans users via ID

translations/moderation/src/main/resources/en_US/commands/unBan/help/unBan_long_help_en_US.ftl

@@ -0,0 +1,2 @@
+This command can be used to un-ban users via ID. If they are not banned currently, an error message is displayed.
+The un-ban is logged.

translations/moderation/src/main/resources/en_US/commands/unBan/help/unBan_parameter_user_en_US.ftl

@@ -0,0 +1 @@
+The ID of the user to unban.

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_title_en_US.ftl

@@ -0,0 +1 @@
+User has been unbanned

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banned_user_field_title_en_US.ftl

@@ -0,0 +1 @@
+Unbanned user

translations/moderation/src/main/resources/en_US/commands/unBan/unBan_log_un_banning_user_field_title_en_US.ftl

@@ -0,0 +1 @@
+Un banning user

translations/moderation/src/main/resources/en_US/config/feature_reportReactions_en_US.ftl

@@ -0,0 +1 @@
+Report reactions

translations/moderation/src/main/resources/en_US/config/feature_setup_config_reactionReportCooldownSeconds_en_US.ftl

@@ -0,0 +1 @@
+The amount of seconds a report will not be re-created, but the report count incremented. Default: ${defaultValue}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_banLog_en_US.ftl

@@ -1 +1 @@
-The channel in which where bans should be logged to. Currently: ${currentTarget}
+The channel to which bans should be logged to. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_decayLog_en_US.ftl

@@ -1 +1 @@
-The channel in which decayed warnings should be logged to. Currently: ${currentTarget}
+The channel to which decayed warnings should be logged to. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_kickLog_en_US.ftl

@@ -1 +1 @@
-The channel in which kicks should be logged to. Currently: ${currentTarget}
+The channel to which kicks should be logged to. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_muteLog_en_US.ftl

@@ -1 +1 @@
-The channel where mutes should be logged to. Un-mutes will also be in this channel. Currently: ${currentTarget}
+The channel to which mutes should be logged to. Un-mutes will also be in this channel. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_reactionReports_en_US.ftl

@@ -0,0 +1 @@
+The channel to which report reactions notifications should be posted to. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/config/feature_setup_posttarget_unBanLog_en_US.ftl

@@ -0,0 +1 @@
+The channel to which un-bans should be logged to. Currently: ${currentTarget}

translations/moderation/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_description_en_US.ftl

@@ -0,0 +1 @@
+[Message](${messageLink}) has been reported. There might be multiple reports. The counter below will contain the amount of reports concerning this user in recent time.

translations/moderation/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_report_counter_field_title_en_US.ftl

@@ -0,0 +1 @@
+Number of reports