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

This commit is contained in:
Sheldan
2020-09-22 00:43:31 +02:00
parent b82b3301ed
commit e44712c48d
23 changed files with 52 additions and 40 deletions

View File

@@ -1 +1 @@
"description": "<@safe_include "assignable_role_place_emote_already_defined_exception/>"
"description": "<@safe_include "assignable_role_place_emote_already_defined_exception"/>"

View File

@@ -8,6 +8,7 @@
<#assign postTargetName>${postTarget.postTarget.name?js_string}</#assign>
<#assign channelMention><#if postTarget.channel?has_content>${postTarget.channel.asMention?js_string}<#else><@safe_include "posttarget_no_channel"/></#if></#assign>
<@safe_include "posttarget_post_target_text"/>
<#else>
<@safe_include "posttarget_no_post_targets_found"/>
</#list>

View File

@@ -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"/>",

View File

@@ -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}"
}

View File

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

View File

@@ -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}"
}
}

View File

@@ -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>

View File

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

View File

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

View File

@@ -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"/>",

View File

@@ -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"/>",

View File

@@ -1 +1 @@
"<#include "modmail_close_failed_to_delete_text_channel_exception_text"/>"
<#include "modmail_close_failed_to_delete_text_channel_exception_text"/>

View File

@@ -1,7 +1,7 @@
{
<#include "member_author">
<@member_author member=author.member/>,
<#include "modmail_color">,
<#include "modmail_color">
<#if message.embeds[0].description?has_content>
,"description": "${message.embeds[0].description?js_string}"
</#if>

View File

@@ -4,7 +4,7 @@
"title": {
"title": "<@safe_include "modmail_thread_staff_message_title"/>"
},
<#include "modmail_color">,
<#include "modmail_color">
<#if text?has_content>
, "description": "${text?js_string}"
</#if>

View File

@@ -7,22 +7,36 @@
"name": "${suggesterUser.userReference.id}"
</#if>
},
<#include "abstracto_color">,
<#assign user><@member_user_name member=member/></#assign>
<#assign id>${suggestion.id}</#assign>
<#if suggestion.state = "ACCEPTED">
"description": "~~${text?js_string}~~ \n✅ ${reason} - <@safe_include "suggest_accepted_by"/>",
<#elseif suggestion.state = "REJECTED">
"description": "~~${text?js_string}~~ \n❌ ${reason} - <@safe_include "suggest_rejected_by"/>",
<#else>
"description": "${text?js_string}",
<#if state = "ACCEPTED">
"title": {
"title": "<@safe_include "suggest_accepted_by"/>"
},
<#elseif state = "REJECTED">
"title": {
"title": "<@safe_include "suggest_rejected_by"/>"
},
</#if>
<#if suggestion.state = "ACCEPTED" || suggestion.state = "REJECTED">
<#include "abstracto_color">,
<#assign id>${suggestionId}</#assign>
<#if state = "ACCEPTED" || state = "REJECTED">
"description": "~~${text?js_string}~~",
<#else>
"description": "${text?js_string}",
</#if>
<#if state = "ACCEPTED" || state = "REJECTED">
"fields": [
{
"name": "<@safe_include "suggest_link_field_title"/>",
"value": "[<@safe_include "suggest_link_display_value"/>](${originalMessageUrl})"
}
<#if reason?has_content>
,
{
"name": "<@safe_include "suggest_reason_field_title"/>",
"value": "${reason?js_string}"
}
</#if>
],
</#if>
"footer": {