Sheldan/abstracto-templates
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto-templates.git synced 2026-03-30 15:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-139] aligning templates with new models, fixing star stats template not being valid

Browse Source
This commit is contained in:
Sheldan
2020-10-12 01:13:46 +02:00
parent 777ea212f7
commit ab244aca8d
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_notification_message_embed_en_US.ftl
View File

@@ -1,11 +1,11 @@
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=threadUser.member/>, <@member_author member=member/>,
"title": { "title": {
"title": "<@safe_include "modmail_notification_message_title"/>" "title": "<@safe_include "modmail_notification_message_title"/>"
}, },
<#include "modmail_color">, <#include "modmail_color">,
<#assign user><@member_user_name member=threadUser.member/>(${threadUser.member.user.id})</#assign> <#assign user><@member_user_name member=member/>(${member.user.id})</#assign>
"description": "<@safe_include "modmail_notification_message_description"/>" "description": "<@safe_include "modmail_notification_message_description"/>"
<#if roles?size gt 0> <#if roles?size gt 0>
,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>,</#list>" ,"additionalMessage": "<#list roles as role>${role.role.asMention?js_string}<#sep>,</#list>"

2
abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_user_message_embed_en_US.ftl
View File

@@ -1,6 +1,6 @@
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=threadUser.member/>, <@member_author member=member/>,
"title": { "title": {
"title": "<@safe_include "modmail_thread_user_message_title"/>" "title": "<@safe_include "modmail_thread_user_message_title"/>"
}, },

2
abstracto-modules/modmail/src/main/resources/en_US/modmail/closing/logging/modmail_close_logged_message_embed_en_US.ftl
View File

@@ -1,6 +1,6 @@
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=author.member/>, <@member_author member=author/>,
<#include "modmail_color"> <#include "modmail_color">
<#if message.embeds[0].description?has_content> <#if message.embeds[0].description?has_content>
,"description": "${message.embeds[0].description?js_string}" ,"description": "${message.embeds[0].description?js_string}"

8
abstracto-modules/modmail/src/main/resources/en_US/modmail/modmail_thread_header_embed_en_US.ftl
View File

@@ -1,9 +1,9 @@
{ {
<#include "member_author"> <#include "member_author">
<@member_author member=threadUser.member/>, <@member_author member=member/>,
<#include "modmail_color">, <#include "modmail_color">,
<#assign user><@member_user_name member=threadUser.member/> (${threadUser.member.user.id})</#assign> <#assign user><@member_user_name member=member/> (${member.user.id})</#assign>
<#assign joinDate>${threadUser.member.timeJoined}</#assign> <#assign joinDate>${member.timeJoined}</#assign>
<#assign roles><#list threadUser.member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign> <#assign roles><#list member.roles as role>${role.asMention?js_string}<#sep>,<#else><@safe_include "modmail_thread_header_no_roles"/></#list></#assign>
"description": "<@safe_include "modmail_thread_header_embed_description"/>" "description": "<@safe_include "modmail_thread_header_embed_description"/>"
} }

7
abstracto-modules/utility/src/main/resources/en_US/commands/starStats/starStats_response_embed_en_US.ftl
View File

@@ -9,8 +9,7 @@
"name": "<@safe_include "starStats_top_starred_field_title"/>", "name": "<@safe_include "starStats_top_starred_field_title"/>",
"value": " "value": "
<#list topPosts as post><#assign post=post/> <#list topPosts as post><#assign post=post/>
<#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/> <#assign badge>${badgeEmotes[post?index]}</#assign><#assign count>${post.starCount}</#assign><#assign link>${post.messageUrl}</#assign> <@safe_include "starStats_starred_entry"/><#else>
<#else>
<@safe_include "starStats_no_starred_messages"/> <@safe_include "starStats_no_starred_messages"/>
</#list> </#list>
" "
@@ -19,7 +18,7 @@
"name": "<@safe_include "starStats_top_starrer_field_title"/>", "name": "<@safe_include "starStats_top_starrer_field_title"/>",
"value": " "value": "
<#list starGiver as starrer><#assign starrer=starrer/> <#list starGiver as starrer><#assign starrer=starrer/>
<#assign badge>${badgeEmotes[starrer?index]}</#assign><#assign count>${starrer.starCount}</assign> <#assign badge>${badgeEmotes[starrer?index]}</#assign><#assign count>${starrer.starCount}</#assign>
<#if starrer.member?has_content> <#if starrer.member?has_content>
<#assign user>${starrer.member.asMention?js_string}</#assign> <@safe_include "starStats_starrer_entry"/> <#assign user>${starrer.member.asMention?js_string}</#assign> <@safe_include "starStats_starrer_entry"/>
<#else> <#else>
@@ -34,7 +33,7 @@
"name": "<@safe_include "starStats_top_receiver_field_title"/>", "name": "<@safe_include "starStats_top_receiver_field_title"/>",
"value": " "value": "
<#list starReceiver as starred><#assign starred=starred/> <#list starReceiver as starred><#assign starred=starred/>
<#assign badge>${badgeEmotes[starred?index]}</#assign><#assign count>${starred.starCount}</assign> <#assign badge>${badgeEmotes[starred?index]}</#assign><#assign count>${starred.starCount}</#assign>
<#if starred.member?has_content> <#if starred.member?has_content>
<#assign user>${starred.member.asMention?js_string}</#assign> <@safe_include "starStats_receiver_entry"/> <#assign user>${starred.member.asMention?js_string}</#assign> <@safe_include "starStats_receiver_entry"/>
<#else> <#else>