Compare commits

...

11 Commits

Author SHA1 Message Date
Sheldan
e505b181e6 [maven-release-plugin] prepare for next development iteration 2022-05-15 17:50:20 +02:00
Sheldan
ab80220944 [maven-release-plugin] prepare release templates-1.3.2 2022-05-15 17:50:16 +02:00
Sheldan
33bdfd29a1 [AB-xxx] adding macro for defaulting easier in case of null values 2022-05-15 13:08:47 +02:00
Sheldan
6a76cd3c61 [AB-xxx] moving the original link hint 2022-02-12 23:30:07 +01:00
Sheldan
1f449750f8 [AB-xxx] adding hint to show where the original link for a message embed is 2022-02-12 23:08:33 +01:00
Sheldan
f39c25e5fc [maven-release-plugin] prepare for next development iteration 2022-02-12 11:46:32 +01:00
Sheldan
a2d15ea9b1 [maven-release-plugin] prepare release templates-1.3.1 2022-02-12 11:46:28 +01:00
Sheldan
d1657c3b8a [AB-xxx] moving utility module template to core 2022-02-11 18:45:54 +01:00
Sheldan
120d30049a [AB-347] adding multiple and generic attachment support to modmail templates
fixing modmail notification template
2021-12-25 16:30:25 +01:00
Sheldan
6ea28f2424 [AB-352] changed templates for mutes/user notes/warns after models changed
reduced warnings displayed at once
placed reason for warnings at different position
2021-12-24 23:42:31 +01:00
Sheldan
60e37b4ef2 [maven-release-plugin] prepare for next development iteration 2021-12-24 13:50:06 +01:00
56 changed files with 154 additions and 87 deletions

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>

View File

@@ -0,0 +1 @@
<#macro default_template_if_null value="" template_key=""><#if value?has_content>${value}<#else><#include "${template_key}"></#if></#macro>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>experience-tracking</artifactId> <artifactId>experience-tracking</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>moderation</artifactId> <artifactId>moderation</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -21,10 +21,10 @@
}, },
<#include "success_color">, <#include "success_color">,
"description": "<#list userNotes as note><#assign note=note/> "description": "<#list userNotes as note><#assign note=note/>
<#assign user><#if note.fullUser.member?has_content>${note.fullUser.member.asMention?json_string}<#else>${note.fullUser.aUserInAServer.userReference.id?c}</#if></#assign> <#assign user><#if note.member.memberMention?has_content>${note.member.memberMention}<#else>${note.member.userId?c}</#if></#assign>
<#assign noteText>${note.note.note?json_string}</#assign> <#assign noteText>${note.note?json_string}</#assign>
<#assign noteId>${note.note.userNoteId.id}</#assign> <#assign noteId>${note.noteId}</#assign>
<#assign date><@format_instant_date_time instant=note.note.created/></#assign> <#assign date><@format_instant_date_time instant=note.created/></#assign>
<@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/> <@safe_include "user_notes_note_entry"/><#else><@safe_include "user_notes_no_notes"/>
</#list>" </#list>"
} }

View File

@@ -1,10 +1,10 @@
<#include "format_instant"> <#include "format_instant">
<#assign muteId>${mute.mute.muteId.id}</#assign> <#assign muteId>${mute.muteId}</#assign>
<#assign reason>${mute.mute.reason}</#assign> <#assign reason>${mute.reason}</#assign>
<#assign mutedUserText><#if mute.mutedUser.member??>${mute.mutedUser.member.asMention}(${mute.mutedUser.member.user.id})<#else>${mute.mutedUser.userId?c}</#if></#assign> <#assign mutedUserText><#if mute.mutedUser.memberMention??>${mute.mutedUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutedUser.userId?c}</#if></#assign>
<#assign mutingUserText><#if mute.mutingUser.member??>${mute.mutingUser.member.asMention}(${mute.mutingUser.member.user.id})<#else>${mute.mutingUser.userId?c}</#if></#assign> <#assign mutingUserText><#if mute.mutingUser.memberMention??>${mute.mutingUser.memberMention}(${mute.mutedUser.userId?c})<#else>${mute.mutingUser.userId?c}</#if></#assign>
<#assign muteDate><@format_instant_date_time instant=mute.mute.muteDate/></#assign> <#assign muteDate><@format_instant_date_time instant=mute.muteDate/></#assign>
<#assign muteEnded>${mute.mute.muteEnded?string('✅', '❌')}</#assign> <#assign muteEnded>${mute.muteEnded?string('✅', '❌')}</#assign>
<#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign> <#assign muteDuration>${fmtDuration(mute.muteDuration)}</#assign>
<#include "mutes_mute_entry_text"> <#include "mutes_mute_entry_text">

View File

@@ -1,7 +1,7 @@
{ {
<#assign exitOnly=innerModel.warnings?size lt 6/> <#assign exitOnly=innerModel.warnings?size lt 5/>
"embedConfigs": [ "embedConfigs": [
<#assign chunks=innerModel.warnings?chunk(5)> <#assign chunks=innerModel.warnings?chunk(4)>
<#list chunks as row><#assign counter=row?index><#assign row=row><#include "warnings_response_entry"><#sep>,</#list> <#list chunks as row><#assign counter=row?index><#assign row=row><#include "warnings_response_entry"><#sep>,</#list>
], ],
"timeoutSeconds": 120, "timeoutSeconds": 120,

View File

@@ -1,7 +1,7 @@
{ {
"embeds": [ "embeds": [
{ {
"description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/></#list>" "description": "<#list row as warning><#assign warning=warning><@safe_include "warnings_warn_entry"/>\n</#list>"
} }
], ],
"buttons": [ "buttons": [

View File

@@ -1,13 +1,14 @@
<#include "format_instant"> <#include "format_instant">
<#assign decayed=warning.warning.decayed/> <#assign decayed=warning.decayed/>
<#assign warnId>${warning.warning.warnId.id}</#assign> <#assign warnId=warning.warnId/>
<#assign reason>${warning.warning.reason}</#assign> <#assign reason=warning.reason/>
<#assign warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#else>${warning.warnedUser.userId?c}</#if></#assign> <#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warnedUser.userId?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.member??>${warning.warningUser.member.asMention}(${warning.warningUser.member.user.id})<#else>${warning.warningUser.userId?c}</#if></#assign> <#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warningUser.userId?c}</#if></#assign>
<#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign> <#assign warnDate><@format_instant_date_time instant=warning.warnDate/></#assign>
<#include "warnings_warn_entry_text"> <#include "warnings_warn_entry_text">
<#if warning.warning.decayed>
<#assign decayDate><@format_instant_date_time instant=warning.warning.decayDate/></#assign> <#if decayed>
<#assign decayDate><@format_instant_date_time instant=warning.decayDate/></#assign>
<#include "warnings_warn_is_decayed"> <#include "warnings_warn_is_decayed">
</#if> </#if>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>modmail</artifactId> <artifactId>modmail</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -19,7 +19,7 @@
], ],
"messageConfig": { "messageConfig": {
"allowsRoleMention": true "allowsRoleMention": true
}, }
<#if roles?size gt 0> <#if roles?size gt 0>
,"additionalMessage": "<#list roles as role>${role.role.asMention?json_string}<#sep>,</#list>" ,"additionalMessage": "<#list roles as role>${role.role.asMention?json_string}<#sep>,</#list>"
</#if> </#if>

View File

@@ -12,10 +12,31 @@
<#else> <#else>
"description": "<@safe_include "modmail_no_message_provided"/>" "description": "<@safe_include "modmail_no_message_provided"/>"
</#if> </#if>
<#if postedMessage.attachments?size gt 0> <#if attachedImageUrls?size gt 0>
,"imageUrl": "${postedMessage.attachments[0].proxyUrl}" ,"imageUrl": "${attachedImageUrls[0]}"
</#if>
<#if remainingAttachments?size gt 0>
,"fields": [
<#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
{
"name": "${attachment?json_string}",
"value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
}
<#sep>,</#list>
]
</#if> </#if>
} }
<#if attachedImageUrls?size gt 1>
<#assign attachmentCount>${attachedImageUrls?size}</#assign>
,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
{
<#include "modmail_color">,
<#assign currentIndex>${attachment?counter + 1}</#assign>
"description": "<@safe_include "modmail_attachment_embed_description"/>",
"imageUrl": "${attachment}"
}
<#sep>,</#list>
</#if>
] ]
<#if subscribers?size gt 0> <#if subscribers?size gt 0>
,"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>" ,"additionalMessage": "<#list subscribers as subscriber>${subscriber.asMention?json_string}<#sep>, </#list>"

View File

@@ -7,11 +7,33 @@
<#if message.embeds[0].description?has_content> <#if message.embeds[0].description?has_content>
,"description": "${message.embeds[0].description?json_string}" ,"description": "${message.embeds[0].description?json_string}"
</#if> </#if>
<#if message.embeds[0].image?has_content> <#if message.embeds?size gt 0 && message.embeds[0].image??>
,"imageUrl": "${message.embeds[0].image.proxyUrl}" ,"imageUrl": "${message.embeds[0].image.proxyUrl}"
</#if>
<#if message.embeds?size gt 0 && message.embeds[0].fields?size gt 0>
,"fields": [
<#list message.embeds[0].fields as field><#assign field=field/>
{
"name": "${field.name?json_string}",
"value": "${field.value?json_string}"
}
<#sep>,</#list>
]
</#if> </#if>
,"timeStamp": "${message.timeCreated}" ,"timeStamp": "${message.timeCreated}"
} }
<#if message.embeds?size gt 1>
<#assign attachmentCount>${message.embeds?size}</#assign>
<#list message.embeds[1..] as embed><#assign embed=embed/>
<#if embed.image?? && embed.image.proxyUrl??>
,{
<#include "modmail_color">,
<#assign currentIndex>${embed?counter + 1}</#assign>
"description": "<@safe_include "modmail_attachment_embed_description"/>",
"imageUrl": "${embed.image.proxyUrl}"
}
</#if></#list>
</#if>
] ]
<#if modMailMessage.anonymous> <#if modMailMessage.anonymous>
,"additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>" ,"additionalMessage": "<@safe_include "modmail_anonymous_message_note"/>"

View File

@@ -10,9 +10,30 @@
<#if text?has_content> <#if text?has_content>
,"description": "${text?json_string}" ,"description": "${text?json_string}"
</#if> </#if>
<#if postedMessage.attachments?size gt 0> <#if attachedImageUrls?size gt 0>
,"imageUrl": "${postedMessage.attachments[0].proxyUrl}" ,"imageUrl": "${attachedImageUrls[0]}"
</#if>
<#if remainingAttachments?size gt 0>
,"fields": [
<#list remainingAttachments?keys as attachment><#assign attachment=attachment/>
{
"name": "${attachment?json_string}",
"value": "[${attachment?json_string}](${remainingAttachments[attachment]?json_string})"
}
<#sep>,</#list>
]
</#if> </#if>
} }
<#if attachedImageUrls?size gt 1>
<#assign attachmentCount>${attachedImageUrls?size}</#assign>
,<#list attachedImageUrls[1..] as attachment><#assign attachment=attachment/>
{
<#include "modmail_color">,
<#assign currentIndex>${attachment?counter + 1}</#assign>
"description": "<@safe_include "modmail_attachment_embed_description"/>",
"imageUrl": "${attachment}"
}
<#sep>,</#list>
</#if>
] ]
} }

View File

@@ -4,14 +4,14 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates</groupId> <groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<modules> <modules>
<module>core</module> <module>core</module>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>statistic</artifactId> <artifactId>statistic</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>utility</artifactId> <artifactId>utility</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>abstracto-modules</artifactId> <artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId> <groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -5,7 +5,7 @@
<groupId>dev.sheldan.abstracto-templates</groupId> <groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<modules> <modules>
<module>abstracto-modules</module> <module>abstracto-modules</module>
@@ -23,7 +23,7 @@
<scm> <scm>
<url>https://maven.pkg.github.com/Sheldan/abstracto-templates</url> <url>https://maven.pkg.github.com/Sheldan/abstracto-templates</url>
<developerConnection>scm:git:git@github.com:Sheldan/abstracto-templates.git</developerConnection> <developerConnection>scm:git:git@github.com:Sheldan/abstracto-templates.git</developerConnection>
<tag>templates-1.3.0</tag> <tag>HEAD</tag>
</scm> </scm>
<repositories> <repositories>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>core</artifactId> <artifactId>core</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>experience-tracking</artifactId> <artifactId>experience-tracking</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -1 +1 @@
${user} from [${channelName}](${messageLink}) ${user} from [${channelName} (original)](${messageLink})

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>moderation</artifactId> <artifactId>moderation</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -1 +1 @@
${user} has note ${noteId} with text ${noteText} on ${date} ${user} has note ${noteId} on ${date} with text `${noteText}`.

View File

@@ -1 +1 @@
Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. The warning is **${decayed?then('decayed', 'active')}** Warning #${warnId} towards user ${warnedUserText} by user ${warningUserText} on ${warnDate}. It is **${decayed?then('decayed', 'active')}**. The reason was: `${reason}`.

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>modmail</artifactId> <artifactId>modmail</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -0,0 +1 @@
Attachment ${currentIndex}/${attachmentCount}

View File

@@ -4,14 +4,14 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates</groupId> <groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<modules> <modules>
<module>core</module> <module>core</module>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>statistic</artifactId> <artifactId>statistic</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@@ -4,13 +4,13 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>
<artifactId>utility</artifactId> <artifactId>utility</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.abstracto-templates.translations</groupId> <groupId>dev.sheldan.abstracto-templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.3.0</version> <version>1.3.3-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging> <packaging>pom</packaging>