Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-04-18 04:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sheldan
2020-08-15 19:23:21 +02:00
parent 48bc33860d
commit 8a33ff6099
74 changed files with 320 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
{
"author": {
"name": "${mutedUser.effectiveName}",
"name": "${mutedUser.effectiveName?js_string}",
"avatar": "${mutedUser.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "mute_log_title">"
"title": "<@safe_include "mute_log_title"/>"
},
"color" : {
"r": 200,
@@ -13,32 +13,32 @@
},
"fields": [
{
"name": "<#include "mute_log_muted_user_field_title">",
"value": "${mutedUser.effectiveName} ${mutedUser.asMention} (${mutedUser.idLong?c})"
"name": "<@safe_include "mute_log_muted_user_field_title"/>",
"value": "${mutedUser.effectiveName?js_string} ${mutedUser.asMention?js_string} (${mutedUser.idLong?c})"
},
{
"name": "<#include "mute_log_muting_user_field_title">",
"value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})"
"name": "<@safe_include "mute_log_muting_user_field_title"/>",
"value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})"
},
{
"name": "<#include "mute_log_mute_location_field_title">",
"value": "[${messageChannel.name}](${message.jumpUrl})"
"name": "<@safe_include "mute_log_mute_location_field_title"/>",
"value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
},
{
"name": "<#include "mute_log_mute_reason_field_title">",
"value": "${mute.reason}"
"name": "<@safe_include "mute_log_mute_reason_field_title"/>",
"value": "${mute.reason?js_string}"
},
{
"name": "<#include "mute_log_mute_duration_field_title">",
"name": "<@safe_include "mute_log_mute_duration_field_title"/>",
"value": "${fmtDuration(muteDuration)}"
},
{
"name": "<#include "mute_log_muted_until_field_title">",
"name": "<@safe_include "mute_log_muted_until_field_title"/>",
"value": "${formatDate(mute.muteTargetDate, "yyyy-MM-dd HH:mm:ss")}"
}
],
"footer": {
"text": "<#include "mute_log_mute_id_footer"> #${mute.id}"
"text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}"
},
"timeStamp": "${mute.muteDate}"
}

28
abstracto-modules/moderation/src/main/resources/en_US/command/mute/unmute_log_embed_en_US.ftl
View File

@@ -1,12 +1,12 @@
{
<#if unMutedUser?has_content>
"author": {
"name": "${unMutedUser.effectiveName}",
"name": "${unMutedUser.effectiveName?js_string}",
"avatar": "${unMutedUser.user.effectiveAvatarUrl}"
},
</#if>
"title": {
"title": "<#include "unMute_log_title">"
"title": "<@safe_include "unMute_log_title"/>"
},
"color" : {
"r": 200,
@@ -15,41 +15,41 @@
},
"fields": [
{
"name": "<#include "unMute_log_unmuted_user_field_title">",
"name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
<#if unMutedUser?has_content>
"value": "${unMutedUser.effectiveName} ${unMutedUser.asMention} (${unMutedUser.idLong?c})"
"value": "${unMutedUser.effectiveName?js_string} ${unMutedUser.asMention?js_string} (${unMutedUser.idLong?c})"
<#else>
"value": "<#include "user_left_server"> (${mute.mutedUser.userReference.id?c})"
"value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
</#if>
},
{
"name": "<#include "mute_log_muting_user_field_title">",
"name": "<@safe_include "mute_log_muting_user_field_title"/>",
<#if mutingUser?has_content>
"value": "${mutingUser.effectiveName} ${mutingUser.asMention} (${mutingUser.idLong?c})"
"value": "${mutingUser.effectiveName?js_string} ${mutingUser.asMention?js_string} (${mutingUser.idLong?c})"
<#else>
"value": "<#include "user_left_server"> (${mute.mutingUser.userReference.id?c})"
"value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
</#if>
},
{
"name": "<#include "mute_log_mute_location_field_title">",
"name": "<@safe_include "mute_log_mute_location_field_title"/>",
"value": "[Link](${messageUrl})"
},
{
"name": "<#include "unMute_log_muted_since_field_title">",
"name": "<@safe_include "unMute_log_muted_since_field_title"/>",
"value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss")}"
},
{
"name": "<#include "mute_log_mute_duration_field_title">",
"name": "<@safe_include "mute_log_mute_duration_field_title"/>",
"value": "${fmtDuration(muteDuration)}"
},
{
"name": "<#include "mute_log_mute_reason_field_title">",
"value": "${mute.reason}"
"name": "<@safe_include "mute_log_mute_reason_field_title"/>",
"value": "${mute.reason?js_string}"
}
],
"footer": {
"text": "<#include "mute_log_mute_id_footer"> #${mute.id}"
"text": "<@safe_include "mute_log_mute_id_footer"/> #${mute.id}"
},
"timeStamp": "${unmuteDate}"
}