From 59e3a90049ce6686d9e8f3f90e074567d315d922 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Tue, 9 Mar 2021 21:42:00 +0100 Subject: [PATCH] [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 --- .../listChannelGroups_response_embed_en_US.ftl | 2 +- .../setupFeature/feature_setup_post_target_message_en_US.ftl | 3 ++- .../commands/leaderboard/leaderboard_post_embed_en_US.ftl | 2 +- .../command/listNotes/user_notes_response_embed_en_US.ftl | 2 +- .../en_US/command/warnings/warnings_warn_entry_en_US.ftl | 4 ++-- .../en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl | 2 +- .../commands/starStats/starStats_response_embed_en_US.ftl | 4 ++-- .../en_US/commands/suggest/suggest_log_embed_en_US.ftl | 2 +- .../help/createChannelGroup_parameter_groupType_en_US.ftl | 1 + .../config/feature_setup_post_target_no_channel_set_en_US.ftl | 2 +- .../startStats/starStats_receiver_entry_left_guild_en_US.ftl | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 translations/core/src/main/resources/en_US/commands/createChannelGroup/help/createChannelGroup_parameter_groupType_en_US.ftl diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl index 39ceab00..1a740be5 100644 --- a/abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/commands/listChannelGroups/listChannelGroups_response_embed_en_US.ftl @@ -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 group.channels as channel><#if channel.discordChannel??>${channel.discordChannel.asMention?js_string}<#else>${channel.channel.id?c}<#sep>,<#else> <@safe_include "listChannelGroups_no_channels"/> " }<#sep>, diff --git a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl index 6af60af8..6b688436 100644 --- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl +++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_message_en_US.ftl @@ -1 +1,2 @@ -<#assign currentTarget><#if currentTextChannel?has_content>${currentTextChannel.asMention}<#else><@safe_include "feature_setup_post_target_no_channel_set"/><@safe_include "feature_setup_posttarget_${postTargetKey}"/> \ No newline at end of file +<#assign currentTarget><#if currentTextChannel??>${currentTextChannel.asMention}<#else><@safe_include "feature_setup_post_target_no_channel_set"/> +<@safe_include "feature_setup_posttarget_${postTargetKey}"/> \ No newline at end of file diff --git a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl index a03dc4f6..032fde52 100644 --- a/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl +++ b/abstracto-modules/experience-tracking/src/main/resources/en_US/commands/leaderboard/leaderboard_post_embed_en_US.ftl @@ -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} ${user.experience.experience} ${user.experience.currentLevel.level} ${user.experience.messageCount} <#include "member_author"> <@member_author member=member/>, diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl index dc8fc49e..6e4b6913 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/listNotes/user_notes_response_embed_en_US.ftl @@ -18,7 +18,7 @@ }, <#include "success_color">, "description": "<#list userNotes as note><#assign note=note/> - <#assign user>${note.fullUser.member.asMention?js_string} + <#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?js_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c} <#assign noteText>${note.note.note?js_string} <#assign noteId>${note.note.userNoteId.id} <#assign date>${formatDate(note.note.created, "yyyy-MM-dd HH:mm:ss")} diff --git a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl index 87b640e7..a295eb21 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl @@ -1,7 +1,7 @@ <#assign warnId>${warning.warning.warnId.id} <#assign reason>${warning.warning.reason} -<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id} -<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id} +<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.aUserInAServer.id?c} +<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.aUserInAServer.id?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")} <#include "warnings_warn_entry_text"> diff --git a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl index 1c178c7b..ebc6af26 100644 --- a/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl +++ b/abstracto-modules/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl @@ -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})<#else><#assign warnedUser> ${warning.warning.warnedUser.userReference.id?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warning.warningUser.userReference.id?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}<#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})<#else><#assign warnedUser> ${warning.warnedUser.userId?c} <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?js_string} (${warning.warningMember.id})<#else><#assign warningUser>${warning.warningUser.warningUser.userId?c} <#assign warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss")}<#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/> <#else> <@safe_include "warnDecay_log_no_warnings"/> " diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl index 439276e2..d395ec15 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl @@ -22,7 +22,7 @@ <#if starrer.member?has_content> <#assign user>${starrer.member.asMention?js_string} <@safe_include "starStats_starrer_entry"/> <#else> - <#assign user>${starrer.user.id?c} <@safe_include "starStats_starrer_entry_left_guild"/> + <#assign user>${starrer.user.userReference.id?c} <@safe_include "starStats_starrer_entry_left_guild"/> <#else> <@safe_include "starStats_no_starred_messages"/> @@ -37,7 +37,7 @@ <#if starred.member?has_content> <#assign user>${starred.member.asMention?js_string} <@safe_include "starStats_receiver_entry"/> <#else> - <#assign user>${starred.user.id?c} <@safe_include "starStats_receiver_entry_left_guild"/> + <#assign user>${starred.user.userReference.id?c} <@safe_include "starStats_receiver_entry_left_guild"/> <#else> <@safe_include "starStats_no_starred_messages"/> diff --git a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl index 1b20ab91..3cdc7c93 100644 --- a/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl +++ b/abstracto-modules/utility/src/main/resources/en_US/commands/suggest/suggest_log_embed_en_US.ftl @@ -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"/>)" }, <#assign user><@member_user_name member=member/> diff --git a/translations/core/src/main/resources/en_US/commands/createChannelGroup/help/createChannelGroup_parameter_groupType_en_US.ftl b/translations/core/src/main/resources/en_US/commands/createChannelGroup/help/createChannelGroup_parameter_groupType_en_US.ftl new file mode 100644 index 00000000..b2461a49 --- /dev/null +++ b/translations/core/src/main/resources/en_US/commands/createChannelGroup/help/createChannelGroup_parameter_groupType_en_US.ftl @@ -0,0 +1 @@ +The type of the channel group \ No newline at end of file diff --git a/translations/core/src/main/resources/en_US/config/feature_setup_post_target_no_channel_set_en_US.ftl b/translations/core/src/main/resources/en_US/config/feature_setup_post_target_no_channel_set_en_US.ftl index baef6758..d1515038 100644 --- a/translations/core/src/main/resources/en_US/config/feature_setup_post_target_no_channel_set_en_US.ftl +++ b/translations/core/src/main/resources/en_US/config/feature_setup_post_target_no_channel_set_en_US.ftl @@ -1 +1 @@ -No channel set \ No newline at end of file +No channel set or does not exist anymore \ No newline at end of file diff --git a/translations/utility/src/main/resources/en_US/commands/startStats/starStats_receiver_entry_left_guild_en_US.ftl b/translations/utility/src/main/resources/en_US/commands/startStats/starStats_receiver_entry_left_guild_en_US.ftl index 2d580f15..27ced98b 100644 --- a/translations/utility/src/main/resources/en_US/commands/startStats/starStats_receiver_entry_left_guild_en_US.ftl +++ b/translations/utility/src/main/resources/en_US/commands/startStats/starStats_receiver_entry_left_guild_en_US.ftl @@ -1 +1 @@ -${badge} - ${count} :star: [Jump!](${link}) <#include "user_left_server"> +${badge} - ${count} :star: ${user} <#include "user_left_server">