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,6 +1,6 @@
{
"author": {
"name": "${member.effectiveName}",
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"color" : {
@@ -8,11 +8,11 @@
"g": 0,
"b": 255
},
"description": "<#include "modmail_thread_already_exists">",
"description": "<@safe_include "modmail_thread_already_exists"/>",
"fields": [
{
"name": "<#include "modmail_existing_thread_link_field_title">",
"value": "[<#include "modmail_existing_thread_link_content_display_text">](${threadUrl})"
"name": "<@safe_include "modmail_existing_thread_link_field_title"/>",
"value": "[<@safe_include "modmail_existing_thread_link_content_display_text"/>](${threadUrl})"
}
]
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
<#include "server_chooser_server_list_description">
<@safe_include "server_chooser_server_list_description"/>
<#list commonGuilds as guild>
${guild.reactionEmote} ${guild.guild.guild.name}

View File

@@ -4,5 +4,5 @@
"g": 0,
"b": 255
},
"description": "<#include "modmail_no_server_available">"
"description": "<@safe_include "modmail_no_server_available"/>"
}

View File

@@ -1,19 +1,19 @@
{
"author": {
"name": "${threadUser.member.effectiveName}",
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "modmail_notification_message_title">"
"title": "<@safe_include "modmail_notification_message_title"/>"
},
"color" : {
"r": 200,
"g": 0,
"b": 255
},
<#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator}(${threadUser.member.user.id})</#assign>
"description": "<#include "modmail_notification_message_description">"
<#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator}(${threadUser.member.user.id})</#assign>
"description": "<@safe_include "modmail_notification_message_description"/>"
<#if roles?size gt 0>
,"additionalMessage": "<#list roles as role>${role.role.asMention}<#sep>,</#list>"
,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>,</#list>"
</#if>
}

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${threadUser.member.effectiveName}",
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "modmail_thread_user_message_title">"
"title": "<@safe_include "modmail_thread_user_message_title"/>"
},
"color" : {
"r": 200,
@@ -12,12 +12,12 @@
"b": 255
},
<#if postedMessage.contentRaw?has_content>
"description": "${postedMessage.contentRaw}"
"description": "${postedMessage.contentRaw?js_string}"
</#if>
<#if postedMessage.attachments?size gt 0>
,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"
</#if>
<#if subscribers?size gt 0>
,"additionalMessage": "<#list subscribers as subscriber>${subscriber.member.asMention}<#sep>,</#list>"
,"additionalMessage": "<#list subscribers as subscriber>${subscriber.member.asMention?js_string}<#sep>,</#list>"
</#if>
}

View File

@@ -1,6 +1,6 @@
{
"title": {
"title": "<#include "modmail_closing_notification_title">"
"title": "<@safe_include "modmail_closing_notification_title"/>"
},
"color" : {
"r": 200,
@@ -11,5 +11,5 @@
<#assign user>user</#assign>
<#assign startDate>${formatDate(closedThread.created,"yyyy-MM-dd HH:mm:ss")}</#assign>
<#assign duration>${fmtDuration(duration)}</#assign>
"description": "<#include "close_closing_description">"
"description": "<@safe_include "close_closing_description"/>"
}

View File

@@ -1,6 +1,6 @@
{
"author": {
"name": "${author.member.effectiveName}",
"name": "${author.member.effectiveName?js_string}",
"avatar": "${author.member.user.effectiveAvatarUrl}"
},
"color" : {
@@ -9,13 +9,13 @@
"b": 255
}
<#if message.embeds[0].description?has_content>
,"description": "${message.embeds[0].description}"
,"description": "${message.embeds[0].description?js_string}"
</#if>
<#if message.attachments?size gt 0>
,"imageUrl": "${message.embeds[0].image.proxyUrl}"
</#if>
<#if modMailMessage.anonymous>
, "additionalMessage": "<#include "modmail_anonymous_message_note">"
, "additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>"
</#if>
,"timeStamp": "${message.timeCreated}"
}

View File

@@ -4,5 +4,5 @@
"g": 0,
"b": 255
},
"description": "${closingMessage}"
"description": "${closingMessage?js_string}"
}

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${moderator.effectiveName}",
"name": "${moderator.effectiveName?js_string}",
"avatar": "${moderator.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "modmail_thread_staff_message_title">"
"title": "<@safe_include "modmail_thread_staff_message_title"/>"
},
"color" : {
"r": 200,
@@ -12,7 +12,7 @@
"b": 255
}
<#if text?has_content>
, "description": "${text}"
, "description": "${text?js_string}"
</#if>
<#if postedMessage.attachments?size gt 0>
,"imageUrl": "${postedMessage.attachments[0].proxyUrl}"

View File

@@ -1,6 +1,6 @@
{
"author": {
"name": "${threadUser.member.effectiveName}",
"name": "${threadUser.member.effectiveName?js_string}",
"avatar": "${threadUser.member.user.effectiveAvatarUrl}"
},
"color" : {
@@ -8,8 +8,8 @@
"g": 0,
"b": 255
},
<#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator} (${threadUser.member.user.id})</#assign>
<#assign user>${threadUser.member.effectiveName?js_string}#${threadUser.member.user.discriminator} (${threadUser.member.user.id})</#assign>
<#assign joinDate>${threadUser.member.timeJoined}</#assign>
<#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else><#include "modmail_thread_header_no_roles"></#list></#assign>
"description": "<#include "modmail_thread_header_embed_description">"
<#assign roles><#list threadUser.member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign>
"description": "<@safe_include "modmail_thread_header_embed_description"/>"
}