Compare commits

...

9 Commits

Author SHA1 Message Date
Sheldan
d2fa000624 [maven-release-plugin] prepare release templates-1.2.13 2021-06-27 00:33:46 +02:00
OneNormalUsername
1b0dcf5aff Remove dashes in unban related templates (#5)
* Remove dashes in unban related templates
2021-06-26 22:44:57 +02:00
Sheldan
e9b15bf32d [AB-xxx] consistent naming for un-banning 2021-06-26 22:24:06 +02:00
Sheldan
1ae65d2723 [AB-xxx] fixing ban related templates 2021-06-26 22:17:28 +02:00
Sheldan
b8d7ed4139 [AB-287] adapting templates for changed behaviour in case users left the server for warnings display
fixing un mute template not requiring a message url
2021-06-09 12:53:42 +02:00
OneNormalUsername
4433d234be Small improvements to warnings and mutes templates (#4)
- Warning reasons after `;warnings user_id` is run is now displayed in a code block for better readability
- There is now a space before `This warning was decayed on [...]` after running `;warnings user_id`
- Minor wording changes
2021-06-07 19:10:01 +02:00
OneNormalUsername
b2fb63bca9 Fix string in ban log template (#3) 2021-06-05 13:24:31 +02:00
OneNormalUsername
0217e48278 Change "default reason" to "No reason provided" for moderation commands templates (#2) 2021-06-04 17:01:51 +02:00
Sheldan
77c515effc [maven-release-plugin] prepare for next development iteration 2021-06-02 12:42:18 +02:00
59 changed files with 83 additions and 74 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -26,10 +26,12 @@
"value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
</#if>
},
<#if messageUrl??>
{
"name": "<@safe_include "mute_log_mute_location_field_title"/>",
"value": "[Link](${messageUrl})"
},
</#if>
{
"name": "<@safe_include "unMute_log_muted_since_field_title"/>",
"value": "${formatDate(mute.muteDate, "yyyy-MM-dd HH:mm:ss zz")}"

View File

@@ -2,7 +2,7 @@
<#include "user_detail">
<#include "full_member_info">
"title": {
"title": "<@safe_include "ban_log_title"/>"
"title": "<@safe_include "unBan_log_title"/>"
},
<#include "moderation_action_color">,
"fields": [

View File

@@ -1,11 +1,11 @@
<#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?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 warnedUserText><#if warning.warnedUser.member??>${warning.warnedUser.member.asMention}(${warning.warnedUser.member.user.id})<#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 warnDate>${formatDate(warning.warning.warnDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#include "warnings_warn_entry_text">
<#if warning.warning.decayed>
<#assign decayDate>${formatDate(warning.warning.decayDate, "yyyy-MM-dd HH:mm:ss zz")}</#assign>
<#include "warnings_warn_is_decayed">
<#include "warnings_warn_is_decayed">
</#if>

View File

@@ -1,23 +1,23 @@
{
<#include "user_detail">
<#include "abstracto_color">,
"description" : "User was banned.",
"description" : "<@safe_include "userBanned_description"/>",
"fields": [
{
"name": "Banned user",
"value": ""<@user_detail user=bannedUser/>"
"name": "<@safe_include "userBanned_field_title_banned_user"/>",
"value": "<@user_detail user=bannedUser/>"
}
<#if banningUser??>
,
{
"name": "Banning user",
"name": "<@safe_include "userBanned_field_title_banning_user"/>",
"value": "<@user_detail user=banningUser/>"
}
</#if>
<#if reason??>
,
{
"name": "reason",
"name": "<@safe_include "userBanned_field_title_reason"/>",
"value": "${reason}"
}
</#if>

View File

@@ -1,16 +1,16 @@
{
<#include "user_detail">
<#include "abstracto_color">,
"description" : "User was un-banned.",
"description" : "<@safe_include "userUnBanned_description"/>",
"fields": [
{
"name": "Un-Banned user",
"name": "<@safe_include "userUnBanned_field_title_un_banned_user"/>",
"value": "<@user_detail user=unBannedUser/>"
}
<#if unBanningUser??>
,
{
"name": "Un-banning user",
"name": "<@safe_include "userUnBanned_field_title_un_banning_user"/>",
"value": "<@user_detail user=unBanningUser/>"
}
</#if>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1 +1 @@
default reason
No reason provided

View File

@@ -1,5 +1,5 @@
Applies the muted role to the user and logs the mute in the `mutes` post target.
The user will be automatically un-muted after the time period is over and another un-mute notification will be send to the
The user will be automatically unmuted after the time period is over and another un-mute notification will be send to the
`mutes` post target.
<#include "duration_format_help">

View File

@@ -1 +1 @@
Amount of warns ${warnCount}.
Amount of warnings: ${warnCount}.

View File

@@ -1 +1 @@
Warning #${warnId} with reason: ${reason} towards user ${warnedUserText} by user ${warningUserText} on `${warnDate}`.
Warning #${warnId} with reason: `${reason}` towards user ${warnedUserText} by user ${warningUserText} on `${warnDate}`.

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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