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": "${memberInfo.user.name}#${memberInfo.user.discriminator}",
"name": "${memberInfo.user.name?js_string}#${memberInfo.user.discriminator}",
"avatar": "${memberInfo.user.effectiveAvatarUrl}"
},
"color" : {
@@ -11,37 +11,37 @@
"thumbnail": "${memberInfo.user.effectiveAvatarUrl}",
"fields": [
{
"name": "<#include "userInfo_response_embed_id_field_title">",
"name": "<@safe_include "userInfo_response_embed_id_field_title"/>",
"value": "${memberInfo.user.id}",
"inline": "true"
},
<#if memberInfo.nickname?has_content>
{
"name": "<#include "userInfo_response_embed_nickname_field_title">",
"value": "${memberInfo.nickname}",
"name": "<@safe_include "userInfo_response_embed_nickname_field_title"/>",
"value": "${memberInfo.nickname?js_string}",
"inline": "true"
},
</#if>
{
"name": "<#include "userInfo_response_embed_status_field_title">",
"name": "<@safe_include "userInfo_response_embed_status_field_title"/>",
"value": "${memberInfo.onlineStatus.key}",
"inline": "true"
},
{
"name": "<#include "userInfo_response_embed_joined_field_title">",
"name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
"value": "${formatDate(memberInfo.timeJoined, "yyyy-MM-dd HH:mm:ss")}",
"inline": "true"
},
{
"name": "<#include "userInfo_response_embed_registered_field_title">",
"name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
"value": "${formatDate(memberInfo.timeCreated, "yyyy-MM-dd HH:mm:ss")}",
"inline": "true"
}
<#if memberInfo.activities?size gt 0>
,
{
"name": "<#include "userInfo_response_embed_activity_field_title">",
"value": "<#list memberInfo.activities as activity>${activity.type}<#sep>, </#list>",
"name": "<@safe_include "userInfo_response_embed_activity_field_title"/>",
"value": "<#list memberInfo.activities as activity>${activity.type?js_string}<#sep>, </#list>",
"inline": "true"
}
</#if>