[maven-release-plugin] prepare for next development iteration

adding validation message to enableFeature response

.github/workflows/release.yml

@@ -1,19 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  release:
-    types: [created]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Publish to GitHub Packages
-        run: mvn --file pom.xml -B deploy -Dmaven.wagon.http.pool=false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release_manual.yml

@@ -0,0 +1,26 @@
+name: Publishes a new version of the templates
+on: workflow_dispatch
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+      - name: Release maven packages
+        uses: qcastel/github-actions-maven-release@v1.12.41
+        env:
+          JAVA_HOME: /usr/lib/jvm/java-21-openjdk/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          git-release-bot-name: "release-bot"
+          git-release-bot-email: "release-bot@sheldan.dev"
+          release-branch-name: master
+          maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
+          access-token: ${{ secrets.GITHUB_TOKEN }}
+          author_email: "release-bot@sheldan.dev"

abstracto-modules/anti-raid/pom.xml

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

abstracto-modules/assignable-roles/pom.xml

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

abstracto-modules/core/pom.xml

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

abstracto-modules/core/src/main/resources/en_US/builtins/member_user_name_en_US.ftl

@@ -1,3 +1,4 @@
-<#macro member_user_name member>${member.effectiveName?json_string}#${member.user.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_display_member_name member><#if member.nickname?has_content>${member.nickname?json_string}<#else>${member.userName?json_string}</#if>#${member.discriminator}</#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_user_name member>${member.userName?json_string}#${member.discriminator}</#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>

abstracto-modules/core/src/main/resources/en_US/builtins/user_detail_en_US.ftl

@@ -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>

abstracto-modules/core/src/main/resources/en_US/builtins/user_user_name_en_US.ftl

@@ -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>

abstracto-modules/core/src/main/resources/en_US/commands/echo/echo_redirect_response_embed_en_US.ftl

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

abstracto-modules/core/src/main/resources/en_US/commands/enableFeature/enableFeature_response_embed_en_US.ftl

@@ -1,5 +1,5 @@
 {
-    "additionalMessage": "<@safe_include "enableFeature_response_text"/>",
+    "additionalMessage": "<@safe_include "enableFeature_response_text"/><#if validationText?has_content>${validationText}</#if>",
     "messageConfig": {
         "ephemeral": true
     }

abstracto-modules/core/src/main/resources/en_US/commands/help/help_command_details_response_embed_en_US.ftl

@@ -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??>

abstracto-modules/core/src/main/resources/en_US/commands/removeCommandMemberCooldown/removeCommandMemberCooldown_response_embed_en_US.ftl

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

abstracto-modules/core/src/main/resources/en_US/commands/setCommandMemberCooldown/setCommandMemberCooldown_response_embed_en_US.ftl

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

abstracto-modules/core/src/main/resources/en_US/condition/command_cool_down_detail_en_US.ftl

@@ -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">

abstracto-modules/core/src/main/resources/en_US/exceptions/generic_command_exception_embed_en_US.ftl

@@ -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>

abstracto-modules/custom-command/pom.xml

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/createCustomCommand/createCustomCommand_response_embed_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/deleteCustomCommand/deleteCustomCommand_response_embed_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/getCustomCommand/getCustomCommand_response_embed_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/listCustomCommands/listCustomCommands_entry_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/listCustomCommands/listCustomCommands_no_commands_response_embed_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/listCustomCommands/listCustomCommands_response_entry_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/commands/listCustomCommands/listCustomCommands_response_paginator_en_US.ftl

@@ -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
+}

abstracto-modules/custom-command/src/main/resources/en_US/exceptions/custom_command_exists_exception_en_US.ftl

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

abstracto-modules/custom-command/src/main/resources/en_US/exceptions/custom_command_not_found_exception_en_US.ftl

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

abstracto-modules/entertainment/pom.xml

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

abstracto-modules/entertainment/src/main/resources/en_US/commands/pressF/pressF_join_embed_en_US.ftl

@@ -0,0 +1,4 @@
+{
+    <#assign user=memberDisplay.memberMention>
+    "additionalMessage": "<@safe_include "pressF_join_text"/>"
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/pressF/pressF_response_embed_en_US.ftl

@@ -0,0 +1,15 @@
+{
+    <#assign text=text?json_string>
+    "additionalMessage": "<@safe_include "pressF_response_text"/>",
+    "buttons": [
+        {
+            "emoteMarkdown": "<@safe_include "pressF_response_press_button_emote"/>",
+            "label": "<@safe_include "pressF_response_press_button_label"/>",
+            "id": "${pressFComponentId}",
+            "buttonStyle": "secondary",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/pressF/pressF_result_embed_en_US.ftl

@@ -0,0 +1,5 @@
+{
+    <#assign userCount=userCount>
+    <#assign text=text?json_string>
+    "additionalMessage": "<@safe_include "pressF_result_text"/>"
+}

abstracto-modules/entertainment/src/main/resources/en_US/exception/already_pressed_f_exception_en_US.ftl

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

abstracto-modules/entertainment/src/main/resources/en_US/exception/payday_cooldown_exception_en_US.ftl

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

abstracto-modules/entertainment/src/main/resources/en_US/exception/slots_cooldown_exception_en_US.ftl

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

abstracto-modules/experience-tracking/pom.xml

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

abstracto-modules/giveaway/pom.xml

@@ -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.33-SNAPSHOT</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>

abstracto-modules/giveaway/src/main/assembly/assembly.xml

@@ -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>

abstracto-modules/giveaway/src/main/resources/en_US/commands/cancelGiveaway/cancelGiveaway_response_embed_en_US.ftl

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

abstracto-modules/giveaway/src/main/resources/en_US/commands/createGiveaway/createGiveaway_response_embed_en_US.ftl

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

abstracto-modules/giveaway/src/main/resources/en_US/commands/reRollGiveaway/reRollGiveaway_response_embed_en_US.ftl

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

abstracto-modules/giveaway/src/main/resources/en_US/exception/giveaway_not_found_exception_en_US.ftl

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

abstracto-modules/giveaway/src/main/resources/en_US/general/giveaway_post_embed_en_US.ftl

@@ -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>
+}

abstracto-modules/giveaway/src/main/resources/en_US/general/giveaway_result_embed_en_US.ftl

@@ -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}"
+}

abstracto-modules/giveaway/src/main/resources/en_US/listener/giveaway_already_joined_response_embed_en_US.ftl

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

abstracto-modules/giveaway/src/main/resources/en_US/listener/giveaway_join_response_embed_en_US.ftl

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

abstracto-modules/image-generation/pom.xml

@@ -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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+        <artifactId>abstracto-modules</artifactId>
+        <version>1.4.33-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>image-generation</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>image-generation-templates-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

abstracto-modules/image-generation/src/main/assembly/assembly.xml

@@ -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>

abstracto-modules/image-generation/src/main/resources/en_US/commands/amongusText/amongusText_response_embed_en_US.ftl

@@ -0,0 +1 @@
+{}

abstracto-modules/image-generation/src/main/resources/en_US/commands/bonk/bonk_response_embed_en_US.ftl

@@ -0,0 +1 @@
+{}

abstracto-modules/image-generation/src/main/resources/en_US/commands/pat/pat_response_embed_en_US.ftl

@@ -0,0 +1 @@
+{}

abstracto-modules/image-generation/src/main/resources/en_US/commands/triggered/triggered_response_embed_en_US.ftl

@@ -0,0 +1 @@
+{}

abstracto-modules/image-generation/src/main/resources/en_US/exception/amongusText_exception_en_US.ftl

@@ -0,0 +1,3 @@
+<#assign inputText=model.inputText>
+<#assign errorMessage=model.errorMessage>
+<#include "amongusText_exception_message"/>

abstracto-modules/invite-filter/pom.xml

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

abstracto-modules/link-embed/pom.xml

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

abstracto-modules/logging/pom.xml

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

abstracto-modules/logging/src/main/resources/en_US/listener/user_joined/user_join_embed_en_US.ftl

@@ -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"/>
         }

abstracto-modules/logging/src/main/resources/en_US/listener/user_left/user_leave_embed_en_US.ftl

@@ -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"/>
         }

abstracto-modules/moderation/pom.xml

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

abstracto-modules/moderation/src/main/resources/en_US/command/ban/ban_log_embed_en_US.ftl

@@ -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"/>",
+                    "name": "<@safe_include "ban_log_deletion_duration_field_title"/>",
-                    "value": "${deletionDays?c}"
+                    "value": "${fmtDuration(deletionDuration)}"
                 }
                 </#if>
             ]

abstracto-modules/moderation/src/main/resources/en_US/listener/honeyPot/honeypot_ban_reason_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/userBanned/userBanned_listener_notification_embed_en_US.ftl

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

abstracto-modules/modmail/pom.xml

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

abstracto-modules/modmail/src/main/resources/en_US/command/contact/contact_response_embed_en_US.ftl

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

abstracto-modules/modmail/src/main/resources/en_US/exception/modmail_thread_closed_exception_en_US.ftl

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

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

@@ -8,13 +8,15 @@
             },
             <#include "modmail_color">,
             <#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 channel?has_content>,
             "fields": [
                 {
                     "name": "<@safe_include "modmail_notification_field_title_channel"/>",
                     "value": "${channel.asMention}"
                 }
             ]
+            </#if>
         }
     ],
     "messageConfig": {

abstracto-modules/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates</groupId>
         <artifactId>templates</artifactId>
-        <version>1.4.18</version>
+        <version>1.4.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.4.18</version>
+    <version>1.4.33-SNAPSHOT</version>
 
     <modules>
         <module>core</module>
@@ -35,6 +35,8 @@
         <module>anti-raid</module>
         <module>custom-command</module>
         <module>twitch</module>
+        <module>giveaway</module>
+        <module>image-generation</module>
     </modules>
 
 </project>

abstracto-modules/profanity-filter/pom.xml

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

abstracto-modules/remind/pom.xml

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

abstracto-modules/repost-detection/pom.xml

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

abstracto-modules/starboard/pom.xml

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

abstracto-modules/statistic/pom.xml

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

abstracto-modules/suggestion/pom.xml

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

abstracto-modules/suggestion/src/main/resources/en_US/commands/showPoll/showPoll_response_embed_en_US.ftl

@@ -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>"
+        }
+    ]
+}

abstracto-modules/suggestion/src/main/resources/en_US/commands/showPoll/showPoll_response_option_display_en_US.ftl

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

abstracto-modules/suggestion/src/main/resources/en_US/common/suggest_update_embed_en_US.ftl

@@ -5,7 +5,7 @@
             <#if message?? && message.attachments?size gt 0>
             "imageUrl": "${message.attachments[0].proxyUrl}",
             </#if>
-            "description": "<@safe_include "suggest_text_label"/>: ${text}"
+            "description": "<@safe_include "suggest_text_label"/>: ${text?json_string}"
             <#if reason?has_content || buttonsActive>,
             "fields": [
                 <#if reason?has_content>

abstracto-modules/suggestion/src/main/resources/en_US/exception/poll_does_not_exist_exception_en_US.ftl

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

abstracto-modules/twitch/pom.xml

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

abstracto-modules/twitch/src/main/resources/en_US/commands/listTwitchStreamer/listTwitchStreamer_response_embed_en_US.ftl

@@ -5,7 +5,9 @@
             "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>

abstracto-modules/twitch/src/main/resources/en_US/general/twitch_streamer_go_live_notification_embed_en_US.ftl

@@ -15,7 +15,7 @@
                 "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}"
+            "imageUrl": "${thumbnail}?${randomString}"
         }
     ],
     "messageConfig": {

abstracto-modules/utility/pom.xml

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

abstracto-modules/utility/src/main/resources/en_US/commands/showAvatar/showAvatar_response_embed_en_US.ftl

@@ -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"
                 },
                 {

abstracto-modules/voice-channel-context/pom.xml

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

abstracto-modules/webservices/pom.xml

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

abstracto-modules/webservices/src/main/resources/en_US/dictionaryapi/commands/dictionaryDefinition/dictionaryDefinition_response_embed_en_US.ftl

@@ -0,0 +1,21 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "title": {
+                "title": "${word?json_string}"
+            },
+            <#macro definitionDisplay definition>
+                <#assign meaning=definition.definition>
+                <#assign hasExample=definition.example?has_content>
+                <#if hasExample>
+                    <#assign example=definition.example>
+                </#if>
+                <@safe_include "dictionaryDefinition_response_meaning_display"/>
+
+
+            </#macro>
+            "description": "<#list definitions as definition>${definition?index + 1}: <@definitionDisplay definition=definition /></#list>"
+        }
+    ]
+}

abstracto-modules/webservices/src/main/resources/en_US/dictionaryapi/exception/dictionary_api_request_exception_en_US.ftl

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

abstracto-modules/webservices/src/main/resources/en_US/dictionaryapi/exception/no_dictionary_api_definition_found_exception_en_US.ftl

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

abstracto-modules/webservices/src/main/resources/en_US/openweathermap/commands/openWeatherMap/openWeatherMap_command_response_embed_en_US.ftl

@@ -28,8 +28,16 @@
                     "inline": "true"
                 }
                 </#if>
-                <#if humidity??>
+                <#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}%",

abstracto-modules/webservices/src/main/resources/en_US/wikipedia/commands/wikipediaArticleSummary/wikipediaArticleSummary_response_embed_en_US.ftl

@@ -0,0 +1,21 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "title": {
+                "title": "${title?json_string}"
+            },
+            "description": "${summary?json_string}"
+        }
+    ],
+    "buttons": [
+        {
+            "label": "<@safe_include "wikipediaArticleSummary_jump_link"/>",
+            "url": "${fullURL?json_string}",
+            "buttonStyle": "link",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }
+    ]
+}

abstracto-modules/webservices/src/main/resources/en_US/wikipedia/exception/no_wikipedia_article_found_exception_en_US.ftl

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

abstracto-modules/webservices/src/main/resources/en_US/wikipedia/exception/wikipedia_request_exception_en_US.ftl

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

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>dev.sheldan.abstracto-templates</groupId>
     <artifactId>templates</artifactId>
-    <version>1.4.18</version>
+    <version>1.4.33-SNAPSHOT</version>
 
     <modules>
         <module>abstracto-modules</module>
@@ -21,10 +21,11 @@
     </distributionManagement>
 
     <scm>
-        <url>https://maven.pkg.github.com/Sheldan/abstracto-templates</url>
+        <connection>scm:git:${project.scm.url}</connection>
-        <developerConnection>scm:git:git@github.com:Sheldan/abstracto-templates.git</developerConnection>
+        <developerConnection>scm:git:${project.scm.url}</developerConnection>
-      <tag>templates-1.4.18</tag>
+        <url>https://github.com/Sheldan/abstracto-templates.git</url>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <repositories>
         <repository>

settings.xml

@@ -0,0 +1,19 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <servers>
+        <server>
+            <id>github</id>
+            <configuration>
+                <httpHeaders>
+                    <property>
+                        <name>Authorization</name>
+                        <value>Bearer ${env.GITHUB_TOKEN}</value>
+                    </property>
+                </httpHeaders>
+            </configuration>
+        </server>
+    </servers>
+</settings>

translations/anti-raid/pom.xml

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

translations/assignable-roles/pom.xml

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

translations/core/pom.xml

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

translations/core/src/main/resources/en_US/commands/echo/echo_redirect_response_en_US.ftl

@@ -0,0 +1 @@
+Sent to ${channel.channelMention}.

translations/core/src/main/resources/en_US/commands/echo/help/echo_parameter_targetChannel_en_US.ftl

@@ -0,0 +1 @@
+The channel to post the message to

translations/core/src/main/resources/en_US/commands/help/command_embed/help_command_embed_command_message_command_only_en_US.ftl

@@ -0,0 +1 @@
+This command is only available as a message command.

translations/core/src/main/resources/en_US/commands/help/command_embed/help_command_embed_command_slash_command_only_en_US.ftl

@@ -0,0 +1 @@
+This command is only available as a slash command.

translations/core/src/main/resources/en_US/commands/removeCommandMemberCooldown/help/removeCommandMemberCooldown_description_en_US.ftl

@@ -0,0 +1 @@
+Removes the server wide cooldown for an individual member

translations/core/src/main/resources/en_US/commands/removeCommandMemberCooldown/help/removeCommandMemberCooldown_long_help_en_US.ftl

@@ -0,0 +1 @@
+This removes the cooldown that is applied to each member when they execute the command. The cooldown is the same on the whole server.

translations/core/src/main/resources/en_US/commands/removeCommandMemberCooldown/help/removeCommandMemberCooldown_parameter_commandName_en_US.ftl

@@ -0,0 +1 @@
+The command name to remove the cooldown for.