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 @@
{
<#macro userDisplay user>
${user.rank} ${user.member.effectiveName} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount}
${user.rank} ${user.member.effectiveName?js_string} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount}
</#macro>
"author": {
"name": "${member.effectiveName}",
"avatar": "${member.user.effectiveAvatarUrl}"
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl?js_string}"
},
"color" : {
"r": 200,
@@ -12,7 +12,7 @@
"b": 255
},
"description": "
<#include "leaderboard_rank_column"> | <#include "leaderboard_name_column"> | <#include "leaderboard_experience_column"> | <#include "leaderboard_level_column"> | <#include "leaderboard_messages_column">
<@safe_include "leaderboard_rank_column"/> | <@safe_include "leaderboard_name_column"/> | <@safe_include "leaderboard_experience_column"/> | <@safe_include "leaderboard_level_column"/> | <@safe_include "leaderboard_messages_column"/>
<#list userExperiences as user>
<@userDisplay user=user />
</#list>

View File

@@ -1,10 +1,10 @@
{
"author": {
"name": "${member.effectiveName}",
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"title": {
"title": "<#include "list_disabled_experience_roles_embed_title">"
"title": "<@safe_include "list_disabled_experience_roles_embed_title"/>"
},
"color" : {
"r": 200,
@@ -13,9 +13,9 @@
},
"description": "
<#list roles as role>
${role.role.asMention}
${role.role.asMention?js_string}
<#else>
<#include "list_disabled_experience_roles_embed_no_roles">
<@safe_include "list_disabled_experience_roles_embed_no_roles"/>
</#list>
"
}

View File

@@ -1,6 +1,6 @@
{
"author": {
"name": "${member.effectiveName}",
"name": "${member.effectiveName?js_string}",
"avatar": "${member.user.effectiveAvatarUrl}"
},
"color" : {
@@ -10,27 +10,27 @@
},
"fields": [
{
"name": "<#include "rank_xp_field_title">",
"name": "<@safe_include "rank_xp_field_title"/>",
"value": "${rankUser.experience.experience}",
"inline": "true"
},
{
"name": "<#include "rank_level_field_title">",
"name": "<@safe_include "rank_level_field_title"/>",
"value": "${rankUser.experience.currentLevel.level}",
"inline": "true"
},
{
"name": "<#include "rank_messages_field_title">",
"name": "<@safe_include "rank_messages_field_title"/>",
"value": "${rankUser.experience.messageCount}",
"inline": "true"
},
{
"name": "<#include "rank_to_next_level_field_title">",
"name": "<@safe_include "rank_to_next_level_field_title"/>",
"value": "${experienceToNextLevel}",
"inline": "true"
},
{
"name": "<#include "rank_rank_field_title">",
"name": "<@safe_include "rank_rank_field_title"/>",
"value": "${rankUser.rank}",
"inline": "true"
}

View File

@@ -1,3 +1,3 @@
{
"additionalMessage": "<#include "syncExpRoles_updating_users_label">: ${currentCount}/${totalUserCount}."
"additionalMessage": "<@safe_include "syncExpRoles_updating_users_label"/>: ${currentCount}/${totalUserCount}."
}