[AB-137] changing templates to handle not existing members/channels

fixing help for createChannelGroup
fixing star stats receiver
changing formatting for long in various places
This commit is contained in:
Sheldan
2021-03-09 21:42:00 +01:00
parent 8ddf5a0ef4
commit 59e3a90049
11 changed files with 14 additions and 12 deletions

View File

@@ -11,7 +11,7 @@
{
"name": "${group.name?js_string} (<@safe_include "channel_group_type_${group.typeKey}_name"/>)",
"value": "
<#list group.channels as channel>${channel.discordChannel.asMention?js_string}<#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/></#list>
<#list group.channels as channel><#if channel.discordChannel??>${channel.discordChannel.asMention?js_string}<#else>${channel.channel.id?c}</#if><#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/></#list>
"
}<#sep>,
</#list>

View File

@@ -1 +1,2 @@
<#assign currentTarget><#if currentTextChannel?has_content>${currentTextChannel.asMention}<#else><@safe_include "feature_setup_post_target_no_channel_set"/></#if></#assign><@safe_include "feature_setup_posttarget_${postTargetKey}"/>
<#assign currentTarget><#if currentTextChannel??>${currentTextChannel.asMention}<#else><@safe_include "feature_setup_post_target_no_channel_set"/></#if></#assign>
<@safe_include "feature_setup_posttarget_${postTargetKey}"/>

View File

@@ -1,6 +1,6 @@
{
<#macro userDisplay user>
${user.rank} <@member_user_name member=user.member/> ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount}
${user.rank} <#if user.member?has_content><@member_user_name member=user.member/> <#else>${user.experience.user.userReference.id?c}</#if> ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount}
</#macro>
<#include "member_author">
<@member_author member=member/>,

View File

@@ -18,7 +18,7 @@
},
<#include "success_color">,
"description": "<#list userNotes as note><#assign note=note/>
<#assign user>${note.fullUser.member.asMention?js_string}</#assign>
<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?js_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign>
<#assign noteText>${note.note.note?js_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#assign>
<#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss")}</#assign>

View File

@@ -1,7 +1,7 @@
<#assign warnId>${warning.warning.warnId.id}</#assign>
<#assign reason>${warning.warning.reason}</#assign>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id}</#if></#assign>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id?c}</#if></#assign>
<#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign>
<#include "warnings_warn_entry_text">

View File

@@ -4,7 +4,7 @@
},
<#include "moderation_action_color">,
"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> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?js_string} (${warning.warnedMember.id?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}</#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
<#else>
<@safe_include "warnDecay_log_no_warnings"/>
</#list>"

View File

@@ -22,7 +22,7 @@
<#if starrer.member?has_content>
<#assign user>${starrer.member.asMention?js_string}</#assign> <@safe_include "starStats_starrer_entry"/>
<#else>
<#assign user>${starrer.user.id?c}</#assign> <@safe_include "starStats_starrer_entry_left_guild"/>
<#assign user>${starrer.user.userReference.id?c}</#assign> <@safe_include "starStats_starrer_entry_left_guild"/>
</#if>
<#else>
<@safe_include "starStats_no_starred_messages"/>
@@ -37,7 +37,7 @@
<#if starred.member?has_content>
<#assign user>${starred.member.asMention?js_string}</#assign> <@safe_include "starStats_receiver_entry"/>
<#else>
<#assign user>${starred.user.id?c}</#assign> <@safe_include "starStats_receiver_entry_left_guild"/>
<#assign user>${starred.user.userReference.id?c}</#assign> <@safe_include "starStats_receiver_entry_left_guild"/>
</#if>
<#else>
<@safe_include "starStats_no_starred_messages"/>

View File

@@ -4,7 +4,7 @@
"name": "<@member_user_name member=suggester/>",
"avatar": "${suggester.user.effectiveAvatarUrl}"
<#else>
"name": "${suggesterUser.userReference.id}"
"name": "${suggesterUser.userReference.id?c} (<@safe_include "user_left_server"/>)"
</#if>
},
<#assign user><@member_user_name member=member/></#assign>

View File

@@ -1 +1 @@
No channel set
No channel set or does not exist anymore

View File

@@ -1 +1 @@
${badge} - ${count} :star: [Jump!](${link}) <#include "user_left_server">
${badge} - ${count} :star: ${user} <#include "user_left_server">