Compare commits

...

4 Commits

Author SHA1 Message Date
Sheldan
afb1ec3368 [AB-xxx] updating remind templates for user installable support 2024-07-08 19:20:20 +02:00
Sheldan
8af4609d82 [AB-xxx] removing member author from exceptions 2024-07-08 19:20:20 +02:00
Sheldan
c291ceeb7b [AB-xxx] refactoring avatar template
adding more info and reducing some information from userInfo command
2024-07-08 19:20:20 +02:00
Sheldan
4b68d082a2 [AB-xxx] making user info template able to handle partial members 2024-07-08 19:20:20 +02:00
10 changed files with 47 additions and 32 deletions

View File

@@ -1,8 +1,6 @@
{ {
"embeds": [ "embeds": [
{ {
<#include "member_author">
<@member_author member=member/>,
<#include "exception_color">, <#include "exception_color">,
"metaConfig" : { "metaConfig" : {
"preventEmptyEmbed": "true" "preventEmptyEmbed": "true"

View File

@@ -1,10 +1,10 @@
{ {
"embeds": [ "embeds": [
{ {
<#include "member_author"> <#include "user_author">
<#include "member_avatar"> <@user_detail_author user=userDisplay/>,
<@member_display_author member=memberNameDisplay/>,
<#include "abstracto_color">, <#include "abstracto_color">,
<#assign reminderId=reminderDisplay.id>
"description": "<@safe_include "remind_reminder_description"/>", "description": "<@safe_include "remind_reminder_description"/>",
"fields": [ "fields": [
{ {
@@ -13,18 +13,22 @@
}, },
{ {
"name": "<@safe_include "remind_reminder_note_field_title"/>", "name": "<@safe_include "remind_reminder_note_field_title"/>",
"value": "${reminder.text?json_string}" "value": "${reminderDisplay.text?json_string}"
}, }
<#if messageUrl?has_content>,
{ {
"name": "<@safe_include "remind_reminder_link_field_title"/>", "name": "<@safe_include "remind_reminder_link_field_title"/>",
"value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})" "value": "[<@safe_include "remind_reminder_link_content_display_text"/>](${messageUrl})"
} }
</#if>
] ]
} }
], ]
<#assign participantsMentions><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#assign> <#if !reminderDisplay.userCommand>,
"additionalMessage": "${memberNameDisplay.memberMention?json_string} 🔔 <#assign participantsMentions><#if reminderParticipants?has_content><#list reminderParticipants as participant>${participant.memberMention}<#sep>, </#list></#if></#assign>
"additionalMessage": "${userDisplay.userMention?json_string} 🔔
${participantsMentions} ${participantsMentions}
" "
</#if>
} }

View File

@@ -3,9 +3,8 @@
"embeds": [ "embeds": [
{ {
<#assign id>${reminder.id}</#assign> <#assign id>${reminder.id}</#assign>
<#include "member_author"> <#include "user_author">
<#include "member_avatar"> <@user_detail_author user=userDisplay/>,
<@member_display_author member=memberDisplay/>,
<#include "abstracto_color">, <#include "abstracto_color">,
<#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign> <#assign reminderTargetDate><@format_instant_date_time instant=reminder.targetDate/></#assign>
<#if message?has_content> <#if message?has_content>
@@ -17,8 +16,11 @@
</#if> </#if>
} }
], ]
"additionalMessage": "${memberDisplay.memberMention?json_string}", <#if !reminder.userCommand>,
"additionalMessage": "${userDisplay.userMention?json_string}"
</#if>
<#if joinButtonId?has_content>,
"buttons": [ "buttons": [
{ {
"label": "<@safe_include "remind_reminder_join_button_label"/>", "label": "<@safe_include "remind_reminder_join_button_label"/>",
@@ -29,4 +31,5 @@
} }
} }
] ]
</#if>
} }

View File

@@ -2,8 +2,8 @@
{ {
"embeds": [ "embeds": [
{ {
<#include "member_author"> <#include "user_author">
<@member_author member=member/>, <@user_detail_author user=userDisplay/>,
<#include "abstracto_color">, <#include "abstracto_color">,
"title": { "title": {
"title": "<@safe_include "reminders_reminders_embed_title"/>" "title": "<@safe_include "reminders_reminders_embed_title"/>"
@@ -17,7 +17,7 @@
<#assign id>${reminderDisplay.id}</#assign> <#assign id>${reminderDisplay.id}</#assign>
<#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign> <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
<#assign reminderText=reminderDisplay.text/> <#assign reminderText=reminderDisplay.text/>
<#assign messageLink=reminderDisplay.message.jumpUrl/> <#if !reminderDisplay.userCommand><#assign messageLink=reminderDisplay.message.jumpUrl/></#if>
<#assign joined=reminderDisplay.joined/> <#assign joined=reminderDisplay.joined/>
<#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign> <#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign>
"name": "<@safe_include "reminders_reminder_field_title"/>", "name": "<@safe_include "reminders_reminder_field_title"/>",

View File

@@ -1,20 +1,12 @@
{ {
"embeds": [ "embeds": [
{ {
<#include "member_author">
<@member_author member=memberInfo/>,
<#include "abstracto_color">, <#include "abstracto_color">,
"imageUrl": "${memberInfo.user.effectiveAvatarUrl}", "imageUrl": "${avatarUrl}",
"fields": [ "fields": [
{
<#include "member_user_name">
"name": "<@safe_include "showAvatar_response_embed_user_field_title"/>",
"value": "<@member_member_name member=memberInfo/>",
"inline": "true"
},
{ {
"name": "<@safe_include "showAvatar_response_embed_image_field_title"/>", "name": "<@safe_include "showAvatar_response_embed_image_field_title"/>",
"value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${memberInfo.user.effectiveAvatarUrl})", "value": "[<@safe_include "showAvatar_response_embed_image_field_value_display"/>](${avatarUrl})",
"inline": "true" "inline": "true"
} }
] ]

View File

@@ -8,6 +8,18 @@
<#include "member_avatar"> <#include "member_avatar">
"thumbnail": "<@member_display_avatar member=memberDisplay/>", "thumbnail": "<@member_display_avatar member=memberDisplay/>",
"fields": [ "fields": [
{
"name": "<@safe_include "userInfo_response_embed_user_name_field_title"/>",
"value": "${memberDisplay.userName}",
"inline": "true"
},
<#if memberDisplay.displayName?has_content>
{
"name": "<@safe_include "userInfo_response_embed_global_name_field_title"/>",
"value": "${memberDisplay.displayName}",
"inline": "true"
},
</#if>
{ {
"name": "<@safe_include "userInfo_response_embed_id_field_title"/>", "name": "<@safe_include "userInfo_response_embed_id_field_title"/>",
"value": "${id?c}", "value": "${id?c}",
@@ -20,22 +32,26 @@
"inline": "true" "inline": "true"
}, },
</#if> </#if>
<#if onlineStatus?has_content>
{ {
"name": "<@safe_include "userInfo_response_embed_status_field_title"/>", "name": "<@safe_include "userInfo_response_embed_status_field_title"/>",
"value": "${onlineStatus?json_string}", "value": "${onlineStatus?json_string}",
"inline": "true" "inline": "true"
}, },
</#if>
<#if joinDate?has_content>
{ {
"name": "<@safe_include "userInfo_response_embed_joined_field_title"/>", "name": "<@safe_include "userInfo_response_embed_joined_field_title"/>",
"value": "<@format_instant_date_time instant=joinDate/>", "value": "<@format_instant_date_time instant=joinDate/>",
"inline": "true" "inline": "true"
}, },
</#if>
{ {
"name": "<@safe_include "userInfo_response_embed_registered_field_title"/>", "name": "<@safe_include "userInfo_response_embed_registered_field_title"/>",
"value": "<@format_instant_date_time instant=creationDate/>", "value": "<@format_instant_date_time instant=creationDate/>",
"inline": "true" "inline": "true"
} }
<#if roles?size gt 0> <#if roles?has_content && roles?size gt 0>
, ,
{ {
"name": "<@safe_include "userInfo_response_embed_roles_field_title"/>", "name": "<@safe_include "userInfo_response_embed_roles_field_title"/>",
@@ -44,7 +60,7 @@
"valueSplitLength": 250 "valueSplitLength": 250
} }
</#if> </#if>
<#if activities?size gt 0> <#if activities?has_content && activities?size gt 0>
, ,
{ {
"name": "<@safe_include "userInfo_response_embed_activity_field_title"/>", "name": "<@safe_include "userInfo_response_embed_activity_field_title"/>",

View File

@@ -1 +1 @@
Reminder ID ${reminder.id?c} Reminder ID ${reminderId?c}

View File

@@ -1 +1 @@
Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink}) ${joinedText} Due on ${reminderTargetDate} with text `${reminderText}`<#if messageLink?has_content> started [here](${messageLink})</#if> ${joinedText}