[AB-57] changed some templates to match the changed models for new transaction handling

abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl

@@ -13,11 +13,11 @@
     },
     {
         "name": "<@safe_include "kick_log_kicking_user_field_title"/>",
-        "value": "<@full_member_info member=kickingUser/>"
+        "value": "<@full_member_info member=member/>"
     },
     {
         "name": "<@safe_include "kick_log_jump_link_field_title"/>",
-        "value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
+        "value": "[${channel.name?js_string}](${message.jumpUrl})"
     },
     {
         "name": "<@safe_include "kick_log_reason_field_title"/>",

abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl

@@ -17,11 +17,11 @@
     },
     {
         "name": "<@safe_include "mute_log_mute_location_field_title"/>",
-        "value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
+        "value": "[${contextChannel.name?js_string}](${message.jumpUrl})"
     },
     {
         "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
-        "value": "${mute.reason?js_string}"
+        "value": "${reason?js_string}"
     },
     {
         "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
@@ -29,12 +29,11 @@
     },
     {
         "name": "<@safe_include "mute_log_muted_until_field_title"/>",
-        "value": "${formatDate(mute.muteTargetDate, "yyyy-MM-dd HH:mm:ss")}"
+        "value": "${formatDate(muteTargetDate, "yyyy-MM-dd HH:mm:ss")}"
     }
   ],
   "footer": {
-   <#assign muteId=mute.id/>
     "text": "<@safe_include "mute_log_mute_id_footer"/>"
   },
-  "timeStamp": "${mute.muteDate}"
+  "timeStamp": "${muteDate}"
 }

abstracto-modules/moderation/src/main/resources/en_US/command/unMute/unMute_has_no_active_mute_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl

@@ -1,7 +1,7 @@
 {
   <#include "full_member_info">
   <#include "member_author">
-  <@member_author member=warnedUser/>,
+  <@member_author member=warnedMember/>,
   "title": {
     "title": "<@safe_include "warn_log_title"/>"
   },
@@ -9,28 +9,24 @@
   "fields": [
     {
       "name": "<@safe_include "warn_log_warned_user_field_title"/>",
-      "value": "<@full_member_info member=warnedUser/>"
+      "value": "<@full_member_info member=warnedMember/>"
     },
-    <#if warningUser?has_content>
+    <#if member?has_content>
     {
         "name": "<@safe_include "warn_log_warning_user_field_title"/>",
-        "value": "<@full_member_info member=warningUser/>"
+        "value": "<@full_member_info member=member/>"
     },
     </#if>
-     <#if warning?has_content>
     {
         "name": "<@safe_include "warn_log_warn_location_field_title"/>",
-        "value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
+        "value": "[${channel.name?js_string}](${message.jumpUrl})"
     },
-    </#if>
     {
         "name": "<@safe_include "warn_log_warn_reason_field_title"/>",
         "value": "${reason?js_string}"
     }
   ],
   "footer": {
-    <#if warningUser?has_content>
-    "text": "<@safe_include "warn_log_warn_id_footer"/> #${warning.id}"
-    </#if>
+    "text": "<@safe_include "warn_log_warn_id_footer"/> #${warnId}"
   }
 }

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl

@@ -1,4 +1,4 @@
-<#assign warnId>${warning.warning.id}</#assign>
+<#assign warnId>${warning.warning.warnId.id}</#assign>
 <#assign reason>${warning.warning.reason}</#assign>
 <#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id}</#if></#assign>
 <#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id}</#if></#assign>

abstracto-modules/moderation/src/main/resources/en_US/exception/embedded/unMute_has_no_active_mute_embedded_en_US.ftl

@@ -0,0 +1 @@
+"description": "<@safe_include "unMute_has_no_active_mute_exception"/>"

abstracto-modules/moderation/src/main/resources/en_US/exception/unMute_has_no_active_mute_exception_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/message_deleted/message_deleted_embed_en_US.ftl

@@ -2,7 +2,7 @@
   <#include "member_author">
   <@member_author member=member/>,
   "description": "<@safe_include "messageDeleted_description_text"/>",
-  <@safe_include "abstracto_color"/>,
+  <#include "abstracto_color"/>,
   "fields": [
     {
       "name": "<@safe_include "messageDeleted_original_message_field_title"/>",

abstracto-modules/moderation/src/main/resources/en_US/listener/message_edited/message_edited_embed_en_US.ftl

@@ -1,8 +1,8 @@
 {
   <#include "member_author">
   <@member_author member=member/>,
+  <#include "abstracto_color"/>,
   "description": "<@safe_include "messageEdited_description_text"/>",
-  <@safe_include "abstracto_color"/>,
   "fields": [
     {
       "name": "<@safe_include "messageEdited_original_message_field_title"/>",