Compare commits

...

54 Commits

Author SHA1 Message Date
Sheldan
dee05ccc88 [maven-release-plugin] prepare release templates-1.4.24 2023-12-10 14:31:33 +01:00
Sheldan
b1594b6a20 [AB-30] adding giveaway feature 2023-12-10 14:27:18 +01:00
Sheldan
b88046493b [AB-xxx] fixing suggestion update message 2023-11-19 01:18:13 +01:00
Sheldan
7256e72dbc [maven-release-plugin] prepare for next development iteration 2023-10-23 01:27:21 +02:00
Sheldan
6f9a055886 [maven-release-plugin] prepare release templates-1.4.23 2023-10-23 01:27:12 +02:00
Sheldan
8a2ae1c492 [AB-82] changing templates for command cooldown exceptions to use discord timestamps 2023-10-04 23:33:20 +02:00
Sheldan
c0a0bf23ff [maven-release-plugin] prepare for next development iteration 2023-09-26 22:53:46 +02:00
Sheldan
351325abe3 [maven-release-plugin] prepare release templates-1.4.22 2023-09-26 22:53:42 +02:00
Sheldan
ff5f56a065 [AB-106] adding deletion duration to ban command
removing banDelete command
updating deletion days to deletion duration
2023-09-26 01:05:08 +02:00
Sheldan
7718a86b14 [AB-xxx] adding information about command availability to help output 2023-09-20 02:01:36 +02:00
Sheldan
2d92a15bf0 [AB-105] migrating to discord usernames 2023-09-19 23:45:00 +02:00
Sheldan
c230455678 [AB-xxx] adding username to ban notification 2023-09-19 13:04:26 +02:00
Sheldan
e5549154e0 [maven-release-plugin] prepare for next development iteration 2023-09-07 23:29:40 +02:00
Sheldan
609609e484 [maven-release-plugin] prepare release templates-1.4.21 2023-09-07 23:29:36 +02:00
Sheldan
9fc76179dc [AB-xxx] changing formatting for custom command output 2023-09-07 23:09:17 +02:00
Sheldan
ba52bea891 [maven-release-plugin] prepare for next development iteration 2023-09-07 21:10:10 +02:00
Sheldan
fd0c99ae60 [maven-release-plugin] prepare release templates-1.4.20 2023-09-07 21:10:06 +02:00
Sheldan
3687ec3daf [AB-104] adding templates for new cooldown related commands
removing all templates related to the custom cooldown handling for payday and slots
2023-09-06 01:24:51 +02:00
Sheldan
12665c09af [AB-97] adding wind speed to weather command 2023-09-05 01:44:51 +02:00
Sheldan
6819b13439 [AB-103] adding templates for custom command configuration commands 2023-09-05 01:25:28 +02:00
Sheldan
b5d6b964e2 [AB-xxx] adding poll not found exception templates 2023-09-03 01:40:43 +02:00
Sheldan
3d7359daa3 [maven-release-plugin] prepare for next development iteration 2023-09-03 00:51:28 +02:00
Sheldan
5b298ec037 [maven-release-plugin] prepare release templates-1.4.19 2023-09-03 00:51:23 +02:00
Sheldan
cca6c9eb9d [AB-94] adding templates for show poll command 2023-09-03 00:20:00 +02:00
Sheldan
3d1ef56aed [AB-100] fixing failing to show twitch streamer if default post target is not setup 2023-09-02 21:49:56 +02:00
Sheldan
4278310ddc [AB-101] adding random string to twitch stream preview image to invalidate cache 2023-09-02 21:42:13 +02:00
Sheldan
7d87c0d3f4 [AB-102] adding templates for redirect 2023-09-02 21:21:07 +02:00
Sheldan
a1d6d04011 [maven-release-plugin] prepare for next development iteration 2023-07-09 23:16:20 +02:00
Sheldan
62e6d50b12 [maven-release-plugin] prepare release templates-1.4.18 2023-07-09 23:16:15 +02:00
Sheldan
c8f2ebe7d7 [AB-98] removing test string 2023-07-09 23:10:38 +02:00
Sheldan
5a63f0a8de [AB-98] adding templates for twitch feature 2023-07-09 23:09:34 +02:00
Sheldan
4810352160 [AB-90] extracting add option button label to template 2023-06-04 21:58:05 +02:00
Sheldan
ee4a39f871 [maven-release-plugin] prepare for next development iteration 2023-06-04 21:16:06 +02:00
Sheldan
4a80d0ca71 [maven-release-plugin] prepare release templates-1.4.17 2023-06-04 21:16:02 +02:00
Sheldan
7e99db3733 [AB-90] adding poll functionality 2023-06-04 21:10:55 +02:00
Sheldan
9373b07c8a [AB-xx] making description for slow mode parameter shorter 2023-05-18 23:33:58 +02:00
Sheldan
af436715f5 [maven-release-plugin] prepare for next development iteration 2023-05-18 22:52:04 +02:00
Sheldan
4f8c4d0062 [maven-release-plugin] prepare release templates-1.4.16 2023-05-18 22:52:00 +02:00
Sheldan
7300dccfc7 [AB-93] adapting templates causing an message attachment to use new behaviour 2023-05-18 22:33:36 +02:00
Sheldan
892de1bcd3 [AB-92] fixing modmail already exists template 2023-05-18 01:23:03 +02:00
OneNormalUsername
993d5a2873 Various minor wording updates (#11)
Co-authored-by: Sheldan <5037282+Sheldan@users.noreply.github.com>
2023-04-14 16:51:28 +02:00
Sheldan
d9f65184e7 [AB-xxx] fixing help text for feature modes parameter 2023-03-29 23:53:01 +02:00
Sheldan
4e963d6767 [AB-xxx] fixing showing the user id with "," for warnings output 2023-03-19 16:47:52 +01:00
Sheldan
a3d125b67d [AB-91] adding direct link to open weather map in the output of the weather command 2023-03-19 10:55:36 +01:00
Sheldan
c6aa854aa3 [maven-release-plugin] prepare for next development iteration 2023-03-19 00:13:09 +01:00
Sheldan
318b41ae3d [maven-release-plugin] prepare release templates-1.4.15 2023-03-19 00:13:05 +01:00
Sheldan
e05f774500 [AB-89] adding templates for weather command feature 2023-03-19 00:04:06 +01:00
Sheldan
b6a2dd2da7 [AB-xxx] adding comma as separator for emote stats 2023-03-12 13:51:05 +01:00
Sheldan
1b8717a5aa [AB-xxx] changing logic for author names and avatars to be more considerate between user and member avatar
limiting roles for userinfo and features for server info to lower values
2023-03-05 13:49:46 +01:00
Sheldan
4bcc4260d1 [maven-release-plugin] prepare for next development iteration 2023-02-26 10:57:04 +01:00
Sheldan
fcadb4260b [maven-release-plugin] prepare release templates-1.4.14 2023-02-26 10:56:59 +01:00
Sheldan
dba30f80f2 [AB-85] adding template for suggestion thread name
not showing suggestion votes in the update message in case reactions are used for suggestions
2023-02-26 10:53:27 +01:00
Sheldan
acb65e49b2 [AB-84] adding suggestion text, vote percentages and emotes to suggestion update message 2023-02-25 18:34:27 +01:00
Sheldan
f934f1d2f9 [maven-release-plugin] prepare for next development iteration 2023-02-04 15:45:43 +01:00
340 changed files with 1095 additions and 145 deletions

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>core</artifactId>
<version>1.4.13</version>
<version>1.4.24</version>
<build>
<plugins>

View File

@@ -1,2 +1,4 @@
<#include "member_avatar">
<#macro member_author member> "author": { "name": "<@member_user_name member=member/>", "avatar": "${member.user.effectiveAvatarUrl}" }</#macro>
<#macro member_display_author member> "author": { "name": "<@member_display_user_name member=member/>", "avatar": "<@member_display_avatar member=member/>" }</#macro>
<#macro member_display_author member> "author": { "name": "<@member_display_member_name member=member/>", "avatar": "<@member_display_avatar member=member/>" }</#macro>
<#macro member_display_user_author member> "author": { "name": "<@member_display_user_name member=member/>", "avatar": "<@member_display_user_avatar member=member/>" }</#macro>

View File

@@ -1 +1,2 @@
<#macro member_display_avatar member><#if member.memberAvatarUrl?has_content>${member.memberAvatarUrl?json_string}<#else>${member.userAvatarUrl?json_string}</#if></#macro>
<#macro member_display_user_avatar member>${member.userAvatarUrl?json_string}</#macro>

View File

@@ -1,2 +1,4 @@
<#macro member_user_name member>${member.effectiveName?json_string}#${member.user.discriminator}</#macro>
<#macro member_display_user_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if>#${member.discriminator}</#macro>
<#macro member_user_name member>${member.effectiveName?json_string}<#if member.user.discriminator?number gt 0>#${member.user.discriminator}</#if></#macro>
<#macro member_member_name member><#if member.effectiveName?has_content>${member.effectiveName?json_string}<#else>${member.user.name?json_string}</#if><#if member.user.discriminator?number gt 0>#${member.user.discriminator}</#if></#macro>
<#macro member_display_member_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if></#macro>
<#macro member_display_user_name member>${member.userName?json_string}<#if member.discriminator?number gt 0>#${member.discriminator}</#if></#macro>

View File

@@ -1 +1 @@
<#macro user_detail user>${user.name?json_string}#${user.discriminator} (${user.idLong?c})</#macro>
<#macro user_detail user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if> (${user.idLong?c})</#macro>

View File

@@ -1 +1 @@
<#macro user_user_name user>${user.name?json_string}#${user.discriminator}</#macro>
<#macro user_user_name user>${user.name?json_string}<#if user.discriminator?number gt 0>#${user.discriminator}</#if></#macro>

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "echo_redirect_response"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -3,7 +3,8 @@
"additionalMessage": "<@safe_include "getCustomTemplate_response_embed_text"/>",
"files": [
{
"fileName": "${templateKey}.ftl"
"fileName": "${templateKey}.ftl",
"fileContent": "${templateContent?json_string}"
}
]
}

View File

@@ -3,7 +3,8 @@
"additionalMessage": "<@safe_include "getTemplate_response_embed_text"/>",
"files": [
{
"fileName": "${templateKey}.ftl"
"fileName": "${templateKey}.ftl",
"fileContent": "${templateContent?json_string}"
}
]
}

View File

@@ -10,22 +10,32 @@
<#if command.help??>
<#if command.help.templated>
<#if command.slashCommandOnly><@safe_include "help_command_embed_command_slash_command_only"/></#if>
<#if command.messageCommandOnly><@safe_include "help_command_embed_command_message_command_only"/></#if>
<#if !command.slashCommandOnly>
**<@safe_include "help_command_embed_command_usage"/>**: `${usage}`
</#if>
**<@safe_include "help_command_embed_command_detailed_help"/>**: <@safe_include "${command.name}_long_help"/>
<#if command.help.hasExample>
<#if command.help.hasExample && !command.slashCommandOnly>
<@safe_include "help_command_embed_command_example"/>: <@safe_include "${command.name}_example"/>
</#if>
<#else>
<#if command.slashCommandOnly><@safe_include "help_command_embed_command_slash_command_only"/></#if>
<#if command.messageCommandOnly><@safe_include "help_command_embed_command_message_command_only"/></#if>
<#if !command.slashCommandOnly>
**<@safe_include "help_command_embed_command_usage"/>**: `${usage}`
</#if>
**<@safe_include "help_command_embed_command_detailed_help"/>**: ${command.help.longHelp?json_string}
<#if command.help.hasExample>
<#if command.help.hasExample && !command.slashCommandOnly>
<@safe_include "help_command_embed_command_example"/>:${command.help.example?json_string}
</#if>
</#if>
<#if command.aliases?? && command.aliases?size gt 0>
<#if command.aliases?? && command.aliases?size gt 0 && !command.slashCommandOnly>
<@safe_include "help_command_embed_command_aliases"/>: `${command.aliases?join("`, `")?json_string}`
</#if>
<#if serverSpecificAliases?size gt 0>
<#if serverSpecificAliases?size gt 0 && !command.slashCommandOnly>
<@safe_include "help_command_embed_command_server_aliases"/>: `${serverSpecificAliases?join("`, `")?json_string}`
</#if>
<#if cooldowns??>

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "removeCommandMemberCooldown_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "setCommandMemberCooldown_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -1,3 +1,4 @@
<#assign executeIn>${fmtDuration(model.reason.executeIn)}</#assign>
<#include "format_instant">
<#assign executeIn><@format_instant_relative instant=model.reason.executeAt/></#assign>
<#assign reason>${model.reason.reason}</#assign>
<#include "command_cool_down_detail_text">

View File

@@ -1,3 +1,4 @@
<#include "user_user_name">
{
"embeds": [
{
@@ -7,7 +8,7 @@
<#else>
"author":
{
"name": "${fullUser.user.name?json_string}#${fullUser.user.discriminator}",
"name": "<@user_user_name user=fullUser.user/>",
"avatar": "${fullUser.user.effectiveAvatarUrl}"
},
</#if>

View File

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

View File

@@ -0,0 +1,8 @@
{
"embeds": [
{
<#include "abstracto_color">,
"description": "<@safe_include "createCustomCommand_response_description"/>"
}
]
}

View File

@@ -0,0 +1,8 @@
{
"embeds": [
{
<#include "abstracto_color">,
"description": "<@safe_include "deleteCustomCommand_response_description"/>"
}
]
}

View File

@@ -0,0 +1,3 @@
{
"additionalMessage": "<@safe_include "getCustomCommand_response_text"/>"
}

View File

@@ -0,0 +1,4 @@
<#assign name=command.name/>
<#assign content=command.content/>
<#assign creator=command.creator.memberMention/>
<#include "listCustomCommands_entry_text">

View File

@@ -0,0 +1,8 @@
{
"embeds": [
{
<#include "abstracto_color">,
"description": "<@safe_include "listCustomCommands_no_commands_response_text"/>"
}
]
}

View File

@@ -0,0 +1,10 @@
{
"embeds": [
{
"description": "<#list row as command><#assign command=command><@safe_include "listCustomCommands_entry"/>\n</#list>"
}
],
"buttons": [
<#include "paginator_buttons">
]
}

View File

@@ -0,0 +1,9 @@
{
<#assign exitOnly=innerModel.customCommands?size lt 5/>
"embedConfigs": [
<#assign chunks=innerModel.customCommands?chunk(4)>
<#list chunks as row><#assign counter=row?index><#assign row=row><#include "listCustomCommands_response_entry"><#sep>,</#list>
],
"timeoutSeconds": 120,
"restrictUser": true
}

View File

@@ -0,0 +1 @@
<#include "custom_command_exists_exception_text">

View File

@@ -0,0 +1 @@
<#include "custom_command_not_found_exception_text">

View File

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

View File

@@ -1,2 +0,0 @@
<#assign retryDuration>${fmtDuration(model.tryAgainDuration)}</#assign>
<#include "payday_cooldown_exception_text">

View File

@@ -1,2 +0,0 @@
<#assign retryDuration>${fmtDuration(model.tryAgainDuration)}</#assign>
<#include "payday_cooldown_exception_text">

View File

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

View File

@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.24</version>
</parent>
<artifactId>giveaway</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>giveaway-templates-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources</directory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "cancelGiveaway_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "createGiveaway_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "reRollGiveaway_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1 @@
<#include "giveaway_not_found_exception_message">

View File

@@ -0,0 +1,35 @@
<#include "format_instant">
{
"embeds": [
{
"title": {
<#assign title=title?json_string>
<#assign id=giveawayId?json_string>
"title": "<@safe_include "giveaway_post_embed_title"/>"
},
<#include "abstracto_color">,
<#if description?has_content><#assign description=description?json_string></#if>
<#assign endDate><@format_instant_relative instant=targetDate/></#assign>
<#assign host=creator.memberMention/>
<#if benefactor?has_content><#assign benefactor=benefactor.memberMention/></#if>
<#assign memberMentions><#list winners as winner>${winner.memberMention}<#sep>,<#else><@safe_include "giveaway_result_no_winner"/></#list></#assign>
<#assign cancelled=cancelled>
<#assign entries=joinedUserCount>
<#assign ended=ended>
<#assign winnerCount=winnerCount>
"description": "<@safe_include "giveaway_post_embed_description"/>"
}
]
<#if !cancelled && !ended>,
"buttons": [
{
"label": "<@safe_include "giveaway_post_join_button_label"/>",
"id": "${joinComponentId}",
"buttonStyle": "secondary",
"metaConfig": {
"persistCallback": false
}
}
]
</#if>
}

View File

@@ -0,0 +1,7 @@
{
<#assign winnerCount=winners?size>
<#assign memberMentions><#list winners as winner>${winner.memberMention}<#sep>,</#list></#assign>
<#assign prize=title>
"additionalMessage": "<#if winnerCount gt 0><@safe_include "giveaway_result_text"/><#else><@safe_include "giveaway_result_no_winner"/></#if>",
"referencedMessageId": "${messageId?c}"
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "giveaway_already_joined_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "giveaway_join_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -1,7 +1,7 @@
{
"embeds": [
{
<#assign user>${member.user.name}#${member.user.discriminator} (${member.asMention}: ${member.id})</#assign>
<#assign user>${member.user.name} (${member.asMention}: ${member.id})</#assign>
"description": "<@safe_include "user_joined_text"/>",
<#include "abstracto_color"/>
}

View File

@@ -1,7 +1,8 @@
{
"embeds": [
{
<#assign user>${user.name}#${user.discriminator} (${user.id})</#assign>
<#include "user_detail">
<#assign user><@user_detail user=user/></#assign>
"description": "<@safe_include "user_left_text"/>",
<#include "abstracto_color"/>
}

View File

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

View File

@@ -3,6 +3,7 @@
{
<#include "user_detail">
<#include "full_member_info">
<#assign bannedUserName=bannedUser.name>
"title": {
"title": "<@safe_include "ban_log_title"/>"
},
@@ -26,11 +27,11 @@
"name": "<@safe_include "ban_log_reason_field_title"/>",
"value": "${reason?json_string}"
}
<#if deletionDays gt 0>
<#if deletionDuration?has_content>
,
{
"name": "<@safe_include "ban_log_deletion_days_field_title"/>",
"value": "${deletionDays?c}"
"name": "<@safe_include "ban_log_deletion_duration_field_title"/>",
"value": "${fmtDuration(deletionDuration)}"
}
</#if>
]

View File

@@ -2,8 +2,8 @@
<#assign decayed=warning.decayed/>
<#assign warnId=warning.warnId/>
<#assign reason=warning.reason/>
<#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warnedUser.userId?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId})<#else>${warning.warningUser.userId?c}</#if></#assign>
<#assign warnedUserText><#if warning.warnedUser.memberMention??>${warning.warnedUser.memberMention}(${warning.warnedUser.userId?c})<#else>${warning.warnedUser.userId?c}</#if></#assign>
<#assign warningUserText><#if warning.warningUser.memberMention??>${warning.warningUser.memberMention}(${warning.warnedUser.userId?c})<#else>${warning.warningUser.userId?c}</#if></#assign>
<#assign warnDate><@format_instant_date_time instant=warning.warnDate/></#assign>
<#include "warnings_warn_entry_text">

View File

@@ -3,6 +3,7 @@
{
<#include "user_detail">
<#include "abstracto_color">,
<#assign bannedUserName=bannedUser.name>
"description" : "<@safe_include "userBanned_description"/>",
"fields": [
{

View File

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

View File

@@ -2,7 +2,7 @@
"embeds": [
{
<#include "member_author">
<@member_author member=member/>,
<@member_display_author member=executingMemberDisplay/>,
<#include "modmail_color">,
"description": "<@safe_include "modmail_thread_already_exists"/>",
"fields": [

View File

@@ -4,14 +4,14 @@
<parent>
<groupId>dev.sheldan.abstracto-templates</groupId>
<artifactId>templates</artifactId>
<version>1.4.13</version>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.13</version>
<version>1.4.24</version>
<modules>
<module>core</module>
@@ -34,6 +34,8 @@
<module>voice-channel-context</module>
<module>anti-raid</module>
<module>custom-command</module>
<module>twitch</module>
<module>giveaway</module>
</modules>
</project>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>statistic</artifactId>
<version>1.4.13</version>
<version>1.4.24</version>
<build>
<plugins>
<plugin>

View File

@@ -7,7 +7,8 @@
"additionalMessage": "<@safe_include "downloadEmoteStats_response_embed_text"/>",
"files": [
{
"fileName": "${serverId}-emotestats.csv"
"fileName": "<@safe_include "downloadEmoteStats_file_name"/>",
"fileContent": "<@safe_include "downloadEmoteStats_file_content"/>"
}
]
}

View File

@@ -5,7 +5,7 @@
"title": "<@safe_include "emoteStats_animated_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
"description": "<#list animatedEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep>, </#if></#list>"
}
]
}

View File

@@ -5,7 +5,7 @@
"title": "<@safe_include "emoteStats_static_emotes_title"/>"
},
<#include "statistic_color">,
"description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep> </#if></#list>"
"description": "<#list staticEmotes as emote><#if emote.emote?has_content>${emote.emote.asMention}x${emote.result.amount?c}<#sep>, </#if></#list>"
}
]
}

View File

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

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "cancelPoll_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "closePoll_response_text"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,16 @@
{
"embeds": [
{
"description": "<@safe_include "poll_server_close_message_description"/>"
<#if text?has_content>,
"fields": [
{
"name": "<@safe_include "poll_server_close_message_embed_text_field_title"/>",
"value": "${text?json_string}"
}
]
</#if>
}
],
"referencedMessageId": "${pollMessageId?c}"
}

View File

@@ -0,0 +1,24 @@
{
"id": "${modalId}",
"title": "<@safe_include "poll_server_add_option_modal_title"/>",
"textInputs": [
{
"placeHolder": "<@safe_include "poll_server_add_option_modal_label_placeholder"/>",
"id": "${labelInputComponentId}",
"position": 1,
"label": "<@safe_include "poll_server_add_option_modal_label_label"/>",
"style": "paragraph",
"maxLength": 100,
"required": true
},
{
"placeHolder": "<@safe_include "poll_server_add_option_modal_description_placeholder"/>",
"id": "${descriptionInputComponentId}",
"position": 2,
"label": "<@safe_include "poll_server_add_option_modal_description_label"/>",
"style": "paragraph",
"maxLength": 100,
"required": false
}
]
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "poll_add_option_notification_message"/>",
"messageConfig" : {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "poll_decision_notification_message"/>",
"messageConfig" : {
"ephemeral": true
}
}

View File

@@ -0,0 +1,12 @@
{
"embeds": [
{
"title": {
"title": "<@safe_include "poll_server_evaluation_title"/>"
},
<#include "abstracto_color">,
"description": "<#list options as option><#assign option=option><@safe_include "poll_message_option_display_always"/><#sep>\n</#list>"
}
],
"referencedMessageId": "${pollMessageId?c}"
}

View File

@@ -0,0 +1,47 @@
<#include "format_instant">
{
"embeds": [
{
"title": {
"title": "<@safe_include "poll_server_message_title"/>"
},
<#assign formattedEndDate><@format_instant_relative instant=endDate/></#assign>
"description": "<@safe_include "poll_server_description_info"/><#list options as option><#assign option=option><@safe_include "poll_message_option_display"/><#sep>\n</#list>"
}
],
"selectionMenus": [
{
"position": 1,
"id": "${selectionMenuId}",
"type": "STRING",
"minValues": 1,
<#if allowMultiple>
"maxValues": ${options?size},
<#else>
"maxValues": 1,
</#if>
"menuEntries": [
<#list options as option>
{
"value": "${option.value}",
"label": "${option.label}",
"description": "${option.description}"
}
<#sep>,</#list>
]
}
]
<#if allowAdditions && options?size lt 20>,
"buttons": [
{
"label": "<@safe_include "poll_message_button_add_option_label"/>",
"position": 2,
"id": "${addOptionButtonId}",
"buttonStyle": "secondary",
"metaConfig": {
"persistCallback": false
}
}
]
</#if>
}

View File

@@ -0,0 +1,21 @@
<#include "format_instant">
{
"embeds": [
{
<#include "abstracto_color"/>,
<#assign pollId=pollId>
<#assign description=description>
"description": "<@safe_include "poll_reminder_job_notification_message_description"/><#list topOptions as option><#assign option=option><@safe_include "poll_message_option_display_always"/><#sep>\n</#list>"
}
],
"buttons": [
{
"label": "<@safe_include "poll_server_reminder_job_button_jump"/>",
"url": "${messageLink?json_string}",
"buttonStyle": "link",
"metaConfig": {
"persistCallback": false
}
}
]
}

View File

@@ -0,0 +1,3 @@
{
"additionalMessage": "<@safe_include "poll_server_response_text"/>"
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "poll_quick_decision_notification_message"/>",
"messageConfig" : {
"ephemeral": true
}
}

View File

@@ -0,0 +1,12 @@
{
"embeds": [
{
"title": {
"title": "<@safe_include "poll_quick_evaluation_title"/>"
},
<#include "abstracto_color">,
"description": "<#list options as option><#assign option=option><@safe_include "poll_message_option_display_always"/><#sep>\n</#list>"
}
],
"referencedMessageId": "${pollMessageId?c}"
}

View File

@@ -0,0 +1,34 @@
<#include "format_instant">
{
"embeds": [
{
"title": {
"title": "<@safe_include "poll_quick_message_title"/>"
},
<#assign formattedEndDate><@format_instant_relative instant=endDate/></#assign>
"description": "<@safe_include "poll_quick_description_info"/><#list options as option><#assign option=option><@safe_include "poll_quick_message_option_display"/><#sep>\n</#list>"
}
],
"selectionMenus": [
{
"position": 1,
"id": "${selectionMenuId}",
"type": "STRING",
"minValues": 1,
<#if allowMultiple>
"maxValues": ${options?size},
<#else>
"maxValues": 1,
</#if>
"menuEntries": [
<#list options as option>
{
"value": "${option.value}",
"label": "${option.label}",
"description": "${option.description}"
}
<#sep>,</#list>
]
}
]
}

View File

@@ -0,0 +1,17 @@
<#include "format_instant">
{
"embeds": [
{
<#include "abstracto_color"/>,
<#assign pollId=id>
<#assign description=description>
<#assign pollCreationDate><@format_instant_date_time instant=creationDate/></#assign>
<#assign pollTargetDate><@format_instant_date_time instant=targetDate/></#assign>
<#assign allowMultipleStr>${allowMultiple?string('✅', '❌')}</#assign>
<#assign showDecisionsStr>${showDecisions?string('✅', '❌')}</#assign>
<#assign allowAdditionsStr>${allowAdditions?string('✅', '❌')}</#assign>
<#assign totalVotes=totalVotes>
"description": "<@safe_include "showPoll_response_description"/><#list options as option><#assign option=option><@safe_include "showPoll_response_option_display"/><#sep>\n</#list>"
}
]
}

View File

@@ -0,0 +1 @@
Option: `${option.value}` - votes: ${option.votes} (${option.percentage}%)<#if option.adder?has_content> - Added by ${option.adder.memberMention}</#if>

View File

@@ -5,22 +5,30 @@
<#if message?? && message.attachments?size gt 0>
"imageUrl": "${message.attachments[0].proxyUrl}",
</#if>
"description": "<@safe_include "suggest_text_label"/>: ${text?json_string}"
<#if reason?has_content || buttonsActive>,
"fields": [
<#if reason?has_content>
<#if reason?has_content>
{
"name": "<@safe_include "suggest_reason_field_title"/>",
"value": "${reason?json_string}"
},
}
</#if>
<#if buttonsActive>
<#if reason?has_content>
,
</#if>
{
"name": "<@safe_include "suggestion_agreements_field_title"/>",
"value": "${agreeVotes?c}"
"value": "👍 ${agreeVotes?c} (${agreementPercentage?ceiling}%)"
},
{
"name": "<@safe_include "suggestion_disagreements_field_title"/>",
"value": "${disAgreeVotes?c}"
"value": "👎 ${disAgreeVotes?c} (${disAgreementPercentage?ceiling}%)"
}
</#if>
]
</#if>
}
],
"referencedMessageId": "${originalMessageId?c}",

View File

@@ -0,0 +1 @@
<#include "poll_cancellation_not_possible_exception_text">

View File

@@ -0,0 +1 @@
<#include "poll_does_not_exist_exception_text">

View File

@@ -0,0 +1 @@
<#include "poll_option_already_exists_exception_text">

View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<artifactId>abstracto-modules</artifactId>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<artifactId>twitch</artifactId>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>twitch-templates-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@@ -0,0 +1,15 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>zip</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<outputDirectory>.</outputDirectory>
<directory>${project.basedir}/src/main/resources</directory>
</fileSet>
</fileSets>
</assembly>

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "addTwitchStreamer_response_description"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "changeTwitchStreamer_response_description"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1,17 @@
{
"embeds": [
{
<#include "twitch_color">,
"description": "<#list streamers as streamer>
<#assign streamer=streamer>
<#assign name=streamer.name>
<#if streamer.targetChannel?has_content>
<#assign targetChannel=streamer.targetChannel.channelMention>
</#if>
<#assign showNotificationsDisplay>${streamer.showNotifications?string('✅', '❌')}</#assign>
<#assign streamerURL=streamer.streamerURL>
<#include "listTwitchStreamer_response_streamer_display"><#sep>
</#list>"
}
]
}

View File

@@ -0,0 +1,6 @@
{
"additionalMessage": "<@safe_include "removeTwitchStreamer_response_description"/>",
"messageConfig": {
"ephemeral": true
}
}

View File

@@ -0,0 +1 @@
<#include "streamer_already_exists_in_server_exception_message">

View File

@@ -0,0 +1 @@
<#include "streamer_not_exists_exception_message">

View File

@@ -0,0 +1 @@
<#include "streamer_not_exists_in_server_exception_message">

View File

@@ -0,0 +1,34 @@
<#include "format_instant">
{
<#assign channelName=channelName>
<#assign streamerAvatarURL=streamerAvatarURL>
<#assign streamURL=streamURL>
<#assign title=currentSection.title>
<#assign thumbnail=currentSection.thumbnailURL>
<#assign viewerCount=currentSection.viewerCount>
"additionalMessage": "<@safe_include "twitch_streamer_go_live_notification_text"/>",
"embeds": [
{
<#include "twitch_color">,
"author": { "name": "${channelName}", "avatar": "${streamerAvatarURL}", "url": "${streamURL}"},
"title": {
"title": "${title?json_string}"
},
"description": "<@safe_include "twitch_streamer_go_live_notification_current_section"/> <#if pastSections?? && pastSections?size gt 0><@safe_include "twitch_streamer_go_live_notification_past_sections"/></#if>",
"imageUrl": "${thumbnail}?${randomString}"
}
],
"messageConfig": {
"allowsRoleMention": true
},
"buttons": [
{
"label": "<@safe_include "twitch_streamer_go_live_notification_watch_button"/>",
"url": "${streamURL?json_string}",
"buttonStyle": "link",
"metaConfig": {
"persistCallback": false
}
}
]
}

View File

@@ -0,0 +1,18 @@
<#include "format_instant">
{
"embeds": [
{
<#include "twitch_color">,
<#assign channelName=channelName>
<#assign avatarURL=avatarURL>
"title": {
"title": "<@safe_include "twitch_streamer_went_offline_notification_title"/>"
},
"author": { "name": "${channelName}", "avatar": "${avatarURL}"},
"description": "<@safe_include "twitch_streamer_went_offline_notification_past_sections"/>"
<#if offlineImageURL??>,
<#assign offlineImageURL=offlineImageURL>
"imageUrl": "${offlineImageURL}"</#if>
}
]
}

View File

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

View File

@@ -59,8 +59,9 @@
},
{
"name": "<@safe_include "serverinfo_embed_features_field_title"/>",
"value": "<#list guild.features as feature>${feature}<#sep>, <#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
"inline": "true"
"value": "<#list guild.features as feature>${feature}<#sep> <#else><@safe_include "serverinfo_embed_features_no_features"/></#list>",
"inline": "true",
"valueSplitLength": 250
}
]
}

View File

@@ -7,8 +7,9 @@
"imageUrl": "${memberInfo.user.effectiveAvatarUrl}",
"fields": [
{
<#include "member_user_name">
"name": "<@safe_include "showAvatar_response_embed_user_field_title"/>",
"value": "${memberInfo.user.name?json_string}#${memberInfo.user.discriminator}",
"value": "<@member_member_name member=memberInfo/>",
"inline": "true"
},
{

View File

@@ -3,9 +3,9 @@
"embeds": [
{
<#include "member_author">
<#include "member_avatar">
<@member_display_author member=memberDisplay/>,
<@member_display_user_author member=memberDisplay/>,
<#include "abstracto_color">,
<#include "member_avatar">
"thumbnail": "<@member_display_avatar member=memberDisplay/>",
"fields": [
{
@@ -39,8 +39,9 @@
,
{
"name": "<@safe_include "userInfo_response_embed_roles_field_title"/>",
"value": "<#list roles as role>${role.roleMention?json_string}<#sep>, </#list>",
"inline": "true"
"value": "<#list roles as role>${role.roleMention?json_string}<#sep> </#list>",
"inline": "true",
"valueSplitLength": 250
}
</#if>
<#if activities?size gt 0>

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>abstracto-modules</artifactId>
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
<version>1.4.13</version>
<version>1.4.24</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.4.13</version>
<version>1.4.24</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -0,0 +1,50 @@
{
"embeds": [
{
"color" : {
"r": ${embedColor.red},
"g": ${embedColor.green},
"b": ${embedColor.blue}
},
<#assign weatherMap = { "Rain": "🌧️", "Clouds": "☁️", "Mist": "🌁", "Fog": "🌫️", "Sand": "⏳", "Dust": "⏳", "Thunderstorm": "⛈️", "Snow": "🌨️", "Clear": "☀️"}>
<#assign locationName=locationName>
<#assign countryKey=countryKey>
<#assign weatherIcon>${weatherMap[mainWeather]!""}</#assign>
<#assign weatherKey=mainWeather!"">
<#assign weatherDescription=description!"">
<#assign weatherLocationLink>https://openweathermap.org/city/${locationId?c}</#assign>
"description": "<@safe_include "openWeatherMap_command_response_description"/>",
"fields": [
<#if temperature??>
{
<#assign displayTemperaturRange=maxTemperature!=minTemperature>
"name": "<@safe_include "openWeatherMap_command_response_field_temperature_field_title"/>",
"value": "<@safe_include "openWeatherMap_command_response_field_temperature_field_value"/>",
"inline": "true"
},
{
"name": "<@safe_include "openWeatherMap_command_response_field_temperature_feels_like_field_title"/>",
"value": "${feelsLikeTemperature}°C",
"inline": "true"
}
</#if>
<#if windSpeed??>
<#if temperature??>,</#if>
{
"name": "<@safe_include "openWeatherMap_command_response_field_wind_field_title"/>",
"value": "${windSpeed}m/s",
"inline": "true"
}
</#if>
<#if humidity??>
<#if windSpeed?? || temperature??>,</#if>
{
"name": "<@safe_include "openWeatherMap_command_response_field_humidity_field_title"/>",
"value": "${humidity}%",
"inline": "true"
}
</#if>
]
}
]
}

View File

@@ -0,0 +1 @@
<#include "no_weather_location_found_exception_text">

Some files were not shown because too many files have changed in this diff Show More