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

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

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${bannedUser.effectiveName}",
"name": "${bannedUser.effectiveName?js_string}",
"avatar": "${bannedUser.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "ban_log_title">"
"title": "<@safe_include "ban_log_title"/>"
},
"color" : {
"r": 200,
@@ -13,20 +13,20 @@
},
"fields": [
{
"name": "<#include "ban_log_banned_user_field_title">",
"value": "${bannedUser.effectiveName} ${bannedUser.asMention} (${bannedUser.idLong?c})"
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
"value": "${bannedUser.effectiveName?js_string} ${bannedUser.asMention?js_string} (${bannedUser.idLong?c})"
},
{
"name": "<#include "ban_log_banning_user_field_title">",
"value": "${banningUser.effectiveName} ${banningUser.asMention} (${banningUser.idLong?c})"
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})"
},
{
"name": "<#include "ban_log_jump_link_field_title">",
"value": "[${messageChannel.name}](${message.jumpUrl})"
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
"value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
},
{
"name": "<#include "ban_log_reason_field_title">",
"value": "${reason}"
"name": "<@safe_include "ban_log_reason_field_title"/>",
"value": "${reason?js_string}"
}
]
}

View File

@@ -1,6 +1,6 @@
{
"title": {
"title": "<#include "ban_log_title">"
"title": "<@safe_include "ban_log_title"/>"
},
"color" : {
"r": 200,
@@ -9,20 +9,20 @@
},
"fields": [
{
"name": "<#include "ban_log_banned_user_field_title">",
"name": "<@safe_include "ban_log_banned_user_field_title"/>",
"value": "${bannedUserId?c}"
},
{
"name": "<#include "ban_log_banning_user_field_title">",
"value": "${banningUser.effectiveName} ${banningUser.asMention} (${banningUser.idLong?c})"
"name": "<@safe_include "ban_log_banning_user_field_title"/>",
"value": "${banningUser.effectiveName?js_string} ${banningUser.asMention?js_string} (${banningUser.idLong?c})"
},
{
"name": "<#include "ban_log_jump_link_field_title">",
"value": "[${messageChannel.name}](${message.jumpUrl})"
"name": "<@safe_include "ban_log_jump_link_field_title"/>",
"value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
},
{
"name": "<#include "ban_log_reason_field_title">",
"value": "${reason}"
"name": "<@safe_include "ban_log_reason_field_title"/>",
"value": "${reason?js_string}"
}
]
}

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${kickedUser.effectiveName}",
"name": "${kickedUser.effectiveName?js_string}",
"avatar": "${kickedUser.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "kick_log_title">"
"title": "<@safe_include "kick_log_title"/>"
},
"color" : {
"r": 200,
@@ -13,20 +13,20 @@
},
"fields": [
{
"name": "<#include "kick_log_kicked_user_field_title">",
"value": "${kickedUser.effectiveName} ${kickedUser.asMention} (${kickedUser.idLong?c})"
"name": "<@safe_include "kick_log_kicked_user_field_title"/>",
"value": "${kickedUser.effectiveName?js_string} ${kickedUser.asMention?js_string} (${kickedUser.idLong?c})"
},
{
"name": "<#include "kick_log_kicking_user_field_title">",
"value": "${kickingUser.effectiveName} ${kickingUser.asMention} (${kickingUser.idLong?c})"
"name": "<@safe_include "kick_log_kicking_user_field_title"/>",
"value": "${kickingUser.effectiveName?js_string} ${kickingUser.asMention?js_string} (${kickingUser.idLong?c})"
},
{
"name": "<#include "kick_log_jump_link_field_title">",
"value": "[${messageChannel.name}](${message.jumpUrl})"
"name": "<@safe_include "kick_log_jump_link_field_title"/>",
"value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
},
{
"name": "<#include "kick_log_reason_field_title">",
"value": "${reason}"
"name": "<@safe_include "kick_log_reason_field_title"/>",
"value": "${reason?js_string}"
}
]
}

View File

@@ -1,19 +1,19 @@
{
"author": {
<#if specifiedUser??>
"name": "${specifiedUser.member.effectiveName}",
"name": "${specifiedUser.member.effectiveName?js_string}",
"avatar": "${specifiedUser.member.user.effectiveAvatarUrl}"
<#else>
"name": "${member.effectiveName}",
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
</#if>
},
"title": {
<#if specifiedUser??>
<#assign user>${specifiedUser.member.effectiveName}</#assign>
"title": "<#include "user_notes_embed_user_title">"
<#assign user>${specifiedUser.member.effectiveName?js_string}</#assign>
"title": "<@safe_include "user_notes_embed_user_title"/>"
<#else>
"title": "<#include "user_notes_embed_title">"
"title": "<@safe_include "user_notes_embed_title"/>"
</#if>
},
"color" : {
@@ -21,11 +21,11 @@
"g": 0,
"b": 255
},
"description": "<#list userNotes as note>
<#assign user>${note.fullUser.member.asMention}</#assign>
<#assign noteText>${note.note.note}</#assign>
"description": "<#list userNotes as note><#assign note=note/>
<#assign user>${note.fullUser.member.asMention?js_string}</#assign>
<#assign noteText>${note.note.note?js_string}</#assign>
<#assign noteId>${note.note.id}</#assign>
<#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss")}</#assign>
<#include "user_notes_note_entry"><#else><#include "user_notes_no_notes">
<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>"
}

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

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

View File

@@ -1,6 +1,6 @@
{
"author": {
"name": "${member.effectiveName}",
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"color" : {
@@ -8,7 +8,7 @@
"g": 0,
"b": 255
}
<#assign userMention>${member.effectiveName}</#assign>
,"description" :"<#include "myWarnings_with_decay_embed_description">"
<#assign userMention>${member.effectiveName?js_string}</#assign>
,"description" :"<@safe_include "myWarnings_with_decay_embed_description"/>"
</#if>
}

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${warnedUser.effectiveName}",
"name": "${warnedUser.effectiveName?js_string}",
"avatar": "${warnedUser.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "warn_log_title">"
"title": "<@safe_include "warn_log_title"/>"
},
"color" : {
"r": 200,
@@ -13,29 +13,29 @@
},
"fields": [
{
"name": "<#include "warn_log_warned_user_field_title">",
"value": "${warnedUser.effectiveName} ${warnedUser.asMention} (${warnedUser.idLong?c})"
"name": "<@safe_include "warn_log_warned_user_field_title"/>",
"value": "${warnedUser.effectiveName?js_string} ${warnedUser.asMention?js_string} (${warnedUser.idLong?c})"
},
<#if warningUser?has_content>
{
"name": "<#include "warn_log_warning_user_field_title">",
"value": "${warningUser.effectiveName} ${warningUser.asMention} (${warningUser.idLong?c})"
"name": "<@safe_include "warn_log_warning_user_field_title"/>",
"value": "${warningUser.effectiveName?js_string} ${warningUser.asMention?js_string} (${warningUser.idLong?c})"
},
</#if>
<#if warning?has_content>
{
"name": "<#include "warn_log_warn_location_field_title">",
"value": "[${messageChannel.name}](${message.jumpUrl})"
"name": "<@safe_include "warn_log_warn_location_field_title"/>",
"value": "[${messageChannel.name?js_string}](${message.jumpUrl})"
},
</#if>
{
"name": "<#include "warn_log_warn_reason_field_title">",
"value": "${reason}"
"name": "<@safe_include "warn_log_warn_reason_field_title"/>",
"value": "${reason?js_string}"
}
],
"footer": {
<#if warningUser?has_content>
"text": "<#include "warn_log_warn_id_footer"> #${warning.id}"
"text": "<@safe_include "warn_log_warn_id_footer"/> #${warning.id}"
</#if>
}
}

View File

@@ -1,7 +1,7 @@
{
<#assign warnCount>${warnings?size}</#assign>
"headerText": "<#include "warnings_header_text">",
"headerText": "<@safe_include "warnings_header_text"/>",
"items": [
<#list warnings as warning>"<#include "warnings_warn_entry">"<#sep>,</#list>
<#list warnings as warning><#assign warning=warning/>"<@safe_include "warnings_warn_entry"/>"<#sep>,</#list>
]
}

View File

@@ -2,11 +2,11 @@
"imageUrl": "${imageUrl}",
"fields": [
{
"name": "<#include "messageDeleted_attachment_link_field_title">",
"value": "[<#include "messageDeleted_attachment_link_display_text">](${imageUrl})"
"name": "<@safe_include "messageDeleted_attachment_link_field_title"/>",
"value": "[<@safe_include "messageDeleted_attachment_link_display_text"/>](${imageUrl})"
}
],
"footer": {
"text": "<#include "messageDeleted_attachment_footer"> #${counter}"
"text": "<@safe_include "messageDeleted_attachment_footer"/> #${counter}"
}
}

View File

@@ -1,9 +1,9 @@
{
"author": {
"name": "${member.effectiveName}#${member.user.discriminator}",
"name": "${member.effectiveName?js_string}#${member.user.discriminator}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"description": "<#include "messageDeleted_description_text">",
"description": "<@safe_include "messageDeleted_description_text"/>",
"color" : {
"r": 200,
"g": 0,
@@ -11,12 +11,12 @@
},
"fields": [
{
"name": "<#include "messageDeleted_original_message_field_title">",
"value": "${cachedMessage.content}"
"name": "<@safe_include "messageDeleted_original_message_field_title"/>",
"value": "${cachedMessage.content?js_string}"
},
{
"name": "<#include "messageDeleted_message_link_field_title">",
"value": "[${messageChannel.name}](${cachedMessage.messageUrl})"
"name": "<@safe_include "messageDeleted_message_link_field_title"/>",
"value": "[${messageChannel.name?js_string}](${cachedMessage.messageUrl})"
}
]
}

View File

@@ -1,9 +1,9 @@
{
"author": {
"name": "${member.effectiveName}#${member.user.discriminator}",
"name": "${member.effectiveName?js_string}#${member.user.discriminator}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"description": "<#include "messageEdited_description_text">",
"description": "<@safe_include "messageEdited_description_text"/>",
"color" : {
"r": 200,
"g": 0,
@@ -11,16 +11,16 @@
},
"fields": [
{
"name": "<#include "messageEdited_original_message_field_title">",
"value": "${messageBefore.content}"
"name": "<@safe_include "messageEdited_original_message_field_title"/>",
"value": "${messageBefore.content?js_string}"
},
{
"name": "<#include "messageEdited_new_message_field_title">",
"value": "${messageAfter.contentRaw}"
"name": "<@safe_include "messageEdited_new_message_field_title"/>",
"value": "${messageAfter.contentRaw?js_string}"
},
{
"name": "<#include "messageEdited_link_field_title">",
"value": "[${messageChannel.name}](${messageBefore.messageUrl})"
"name": "<@safe_include "messageEdited_link_field_title"/>",
"value": "[${messageChannel.name?js_string}](${messageBefore.messageUrl})"
}
]
}

View File

@@ -1,15 +1,15 @@
{
"title": {
"title": "<#include "warnDecay_title">"
"title": "<@safe_include "warnDecay_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
"description": "<#list warnings as warning>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention} (${warning.warnedMember.id})</#assign><#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c}</#assign></#if> <#include "warnDecay_log_warn_entry">
"description": "<#list warnings as warning><#assign warning=warning/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id})</#assign><#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c}</#assign></#if> <@safe_include "warnDecay_log_warn_entry"/>
<#else>
<#include "warnDecay_log_no_warnings">
<@safe_include "warnDecay_log_no_warnings"/>
</#list>"
}