[maven-release-plugin] prepare release templates-1.4.35

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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.35</version>
 
     <build>
         <plugins>

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

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

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

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

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

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

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/getCustomTemplate/getCustomTemplate_response_embed_en_US.ftl

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

abstracto-modules/core/src/main/resources/en_US/commands/getTemplate/getTemplate_response_embed_en_US.ftl

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

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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.35</version>
     <build>
         <plugins>
             <plugin>

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/addLevelAction/addLevelAction_response_embed_en_US.ftl

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

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/expLevelUpNotification/expLevelUpNotification_response_embed_en_US.ftl

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

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/rank/rank_post_embed_en_US.ftl

@@ -32,7 +32,7 @@
                 },
                 {
                     "name": "<@safe_include "rank_level_progress_field_title"/>",
-                    "value": "${inLevelExperience} <#list 1..currentLevelPercentage/10?floor as cent>🔹</#list><#if (currentLevelPercentage % 10) gt 4>🔸<#else>▫</#if><#assign restCent></#assign><#list 0..(10 - currentLevelPercentage/10?ceiling) as cent><#if cent gt 0>▫</#if>️</#list> ${nextLevelExperience - experienceForCurrentLevel}",
+                    "value": "${inLevelExperience} <#list 0..currentLevelPercentage/10?floor as cent><#if cent gt 0>🔹</#if></#list><#if (currentLevelPercentage % 10) gt 4>🔸<#else>▫</#if><#assign restCent></#assign><#list 0..(10 - currentLevelPercentage/10?ceiling) as cent><#if cent gt 0>▫</#if>️</#list> ${nextLevelExperience - experienceForCurrentLevel}",
                     "inline": "false"
                 }
             ]

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/removeLevelAction/removeLevelAction_response_embed_en_US.ftl

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

abstracto-modules/experience-tracking/src/main/resources/en_US/commands/showLevelActions/showLevelActions_response_embed_en_US.ftl

@@ -0,0 +1,19 @@
+{
+    "embeds": [
+        {
+            <#macro actionDisplay action>
+                <#assign parameters = action.parameters?eval_json>
+                <#assign level=action.level>
+                <#assign actionDescription><@safe_include "showLevelActions_action_${action.actionKey}"/></#assign>
+                <#assign actionKey=action.actionKey/>
+                <#assign actionParameter><@safe_include "showLevelActions_action_${action.actionKey}_config"/></#assign>
+                <#if action.member??>
+                    <#assign memberdisplay=action.member.memberMention/>
+                </#if>
+                <@safe_include "showLevelActions_action_description"/>
+
+            </#macro>
+            "description": "<#list actions as action><@actionDisplay action=action/></#list>"
+        }
+    ]
+}

abstracto-modules/experience-tracking/src/main/resources/en_US/exception/level_action_not_found_exception_en_US.ftl

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

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.35</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.35</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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/invite-filter/src/main/resources/en_US/listener/invite_link_deleted/invite_link_deleted_notification_embed_en_US.ftl

@@ -18,4 +18,17 @@
             ]
         }
     ]
+    <#if moderationActionComponents?size gt 0>,
+    "buttons": [
+    <#list moderationActionComponents as moderactionAction>
+        {
+            "label": "<@safe_include "moderation_action_${moderactionAction.action}_button_label"/>",
+            "id": "${moderactionAction.componentId}",
+            "buttonStyle": "danger",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }<#sep>,</#list>
+    ]
+    </#if>
 }

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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.35</version>
     <build>
         <plugins>
             <plugin>

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

@@ -1,8 +1,6 @@
 {
     "embeds": [
         {
-            <#include "user_detail">
-            <#include "full_member_info">
             "title": {
                 "title": "<@safe_include "ban_log_title"/>"
             },
@@ -10,27 +8,21 @@
             "fields": [
                 {
                     "name": "<@safe_include "ban_log_banned_user_field_title"/>",
-                    "value": "<@user_detail user=bannedUser/>"
+                    "value": "${bannedUser.userMention}"
                 },
                 {
                     "name": "<@safe_include "ban_log_banning_user_field_title"/>",
-                    "value": "<@full_member_info member=banningMember/>"
+                    "value": "${banningMember.memberMention}"
                 },
-                <#if commandMessage?has_content>
-                {
-                    "name": "<@safe_include "ban_log_jump_link_field_title"/>",
-                    "value": "[${commandMessage.channel.name?json_string}](${commandMessage.jumpUrl})"
-                },
-                </#if>
                 {
                     "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>
             ]

abstracto-modules/moderation/src/main/resources/en_US/command/kick/kick_log_embed_en_US.ftl

@@ -1,9 +1,6 @@
 {
     "embeds": [
         {
-            <#include "full_member_info">
-            <#include "member_author">
-            <@member_author member=kickedUser/>,
             "title": {
                 "title": "<@safe_include "kick_log_title"/>"
             },
@@ -11,18 +8,12 @@
             "fields": [
                 {
                     "name": "<@safe_include "kick_log_kicked_user_field_title"/>",
-                    "value": "<@full_member_info member=kickedUser/>"
+                    "value": "${kickedMember.memberMention}"
                 },
                 {
                     "name": "<@safe_include "kick_log_kicking_user_field_title"/>",
-                    "value": "<@full_member_info member=member/>"
+                    "value": "${kickingMember.memberMention}"
                 },
-                <#if messsage?has_content>
-                {
-                    "name": "<@safe_include "kick_log_jump_link_field_title"/>",
-                    "value": "[${channel.name?json_string}](${message.jumpUrl})"
-                },
-                </#if>
                 {
                     "name": "<@safe_include "kick_log_reason_field_title"/>",
                     "value": "${reason?json_string}"

abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_log_embed_en_US.ftl

@@ -1,10 +1,7 @@
-<#include "full_member_info">
 <#include "format_instant">
-<#include "member_author">
 {
     "embeds": [
         {
-            <@member_author member=mutedUser/>,
             "title": {
             <#if durationChanged>
                 "title": "<@safe_include "mute_log_title_mute_changed"/>"
@@ -13,13 +10,12 @@
             <#elseif muted>
                 "title": "<@safe_include "mute_log_title_muted"/>"
             </#if>
-
             },
             <#include "moderation_action_color">,
             "fields": [
                 {
                     "name": "<@safe_include "mute_log_muted_user_field_title"/>",
-                    "value": "<@full_member_info member=mutedUser/>"
+                    "value": "${mutedUser.memberMention}"
                 },
                 <#if mutingUser?has_content>
                 {
@@ -28,7 +24,7 @@
                     <#elseif muteEnded>
                         "name": "<@safe_include "mute_log_unmuting_user_field_title"/>",
                     </#if>
-                    "value": "<@full_member_info member=mutingUser/>"
+                    "value": "${mutingUser.memberMention}"
                 }
                 </#if>
                 <#if reason?has_content>,
@@ -40,7 +36,7 @@
                 <#if muted && !durationChanged>,
                 {
                     "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
-                    "value": "${fmtDuration(muteDuration)}"
+                    "value": "${fmtDuration(duration)}"
                 },
                 {
                     "name": "<@safe_include "mute_log_muted_until_field_title"/>",

abstracto-modules/moderation/src/main/resources/en_US/command/mute/mute_notification_not_possible_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/unBan/unBan_log_embed_en_US.ftl

@@ -1,8 +1,6 @@
 {
     "embeds": [
         {
-            <#include "user_detail">
-            <#include "full_member_info">
             "title": {
                 "title": "<@safe_include "unBan_log_title"/>"
             },
@@ -10,11 +8,11 @@
             "fields": [
                 {
                     "name": "<@safe_include "unBan_log_un_banned_user_field_title"/>",
-                    "value": "<@user_detail user=bannedUser/>"
+                    "value": "${bannedUser.userMention}"
                 },
                 {
                     "name": "<@safe_include "unBan_log_un_banning_user_field_title"/>",
-                    "value": "<@full_member_info member=unBanningMember/>"
+                    "value": "${unBanningMember.memberMention}"
                 }
             ]
         }

abstracto-modules/moderation/src/main/resources/en_US/command/warn/warn_log_embed_en_US.ftl

@@ -1,9 +1,6 @@
 {
     "embeds": [
         {
-            <#include "full_member_info">
-            <#include "member_author">
-            <@member_author member=warnedMember/>,
             "title": {
                 "title": "<@safe_include "warn_log_title"/>"
             },
@@ -11,18 +8,12 @@
             "fields": [
                 {
                     "name": "<@safe_include "warn_log_warned_user_field_title"/>",
-                    "value": "<@full_member_info member=warnedMember/>"
+                    "value": "${warnedMember.memberMention}"
                 },
-                <#if member?has_content>
+                <#if warningMember?has_content>
                 {
                     "name": "<@safe_include "warn_log_warning_user_field_title"/>",
-                    "value": "<@full_member_info member=member/>"
-                },
-                </#if>
-                <#if message?has_content>
-                {
-                    "name": "<@safe_include "warn_log_warn_location_field_title"/>",
-                    "value": "[${channel.name?json_string}](${message.jumpUrl})"
+                    "value": "${warningMember.memberMention}"
                 },
                 </#if>
                 {

abstracto-modules/moderation/src/main/resources/en_US/command/warnings/warnings_warn_entry_en_US.ftl

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

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/moderationAction/moderationAction_ban_modal_en_US.ftl

@@ -0,0 +1,24 @@
+{
+    "id": "${modalId}",
+    "title": "<@safe_include "moderationAction_ban_modal_title"/>",
+    "textInputs": [
+        {
+            "placeHolder": "<@safe_include "moderationAction_ban_modal_reason_placeholder"/>",
+            "id": "${reasonComponentId}",
+            "position": 1,
+            "label": "<@safe_include "moderationAction_ban_modal_reason_label"/>",
+            "style": "paragraph",
+            "maxLength": 2000,
+            "required": false
+        },
+        {
+            "placeHolder": "<@safe_include "moderationAction_ban_modal_duration_placeholder"/>",
+            "id": "${durationComponentId}",
+            "position": 2,
+            "label": "<@safe_include "moderationAction_ban_modal_duration_label"/>",
+            "style": "short",
+            "maxLength": 50,
+            "required": false
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_ban_response_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_kick_modal_en_US.ftl

@@ -0,0 +1,15 @@
+{
+    "id": "${modalId}",
+    "title": "<@safe_include "moderationAction_kick_modal_title"/>",
+    "textInputs": [
+        {
+            "placeHolder": "<@safe_include "moderationAction_kick_modal_reason_placeholder"/>",
+            "id": "${reasonComponentId}",
+            "position": 1,
+            "label": "<@safe_include "moderationAction_kick_modal_reason_label"/>",
+            "style": "paragraph",
+            "maxLength": 2000,
+            "required": false
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_kick_response_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_mute_modal_en_US.ftl

@@ -0,0 +1,24 @@
+{
+    "id": "${modalId}",
+    "title": "<@safe_include "moderationAction_mute_modal_title"/>",
+    "textInputs": [
+        {
+            "placeHolder": "<@safe_include "moderationAction_mute_modal_reason_placeholder"/>",
+            "id": "${reasonComponentId}",
+            "position": 1,
+            "label": "<@safe_include "moderationAction_mute_modal_reason_label"/>",
+            "style": "paragraph",
+            "maxLength": 2000,
+            "required": false
+        },
+        {
+            "placeHolder": "<@safe_include "moderationAction_mute_modal_duration_placeholder"/>",
+            "id": "${durationComponentId}",
+            "position": 2,
+            "label": "<@safe_include "moderationAction_mute_modal_duration_label"/>",
+            "style": "short",
+            "maxLength": 50,
+            "required": false
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_mute_response_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_warn_modal_en_US.ftl

@@ -0,0 +1,15 @@
+{
+    "id": "${modalId}",
+    "title": "<@safe_include "moderationAction_warn_modal_title"/>",
+    "textInputs": [
+        {
+            "placeHolder": "<@safe_include "moderationAction_warn_modal_reason_placeholder"/>",
+            "id": "${reasonComponentId}",
+            "position": 1,
+            "label": "<@safe_include "moderationAction_warn_modal_reason_label"/>",
+            "style": "paragraph",
+            "maxLength": 2000,
+            "required": false
+        }
+    ]
+}

abstracto-modules/moderation/src/main/resources/en_US/listener/moderationAction/moderationAction_warn_response_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/listener/reactionReport/reactionReport_notification_embed_en_US.ftl

@@ -33,5 +33,15 @@
                 "persistCallback": false
             }
         }
+        <#if moderationActionComponents?size gt 0>,</#if>
+        <#list moderationActionComponents as moderactionAction>
+        {
+            "label": "<@safe_include "moderation_action_${moderactionAction.action}_button_label"/>",
+            "id": "${moderactionAction.componentId}",
+            "buttonStyle": "danger",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }<#sep>,</#list>
     ]
 }

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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.35</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"/>",
-    "messageConfig": {
-        "ephemeral": true
-    }
+    "additionalMessage": "<@safe_include "contact_response_text"/>"
 }

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

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

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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.4.10</version>
+    <version>1.4.35</version>
 
     <modules>
         <module>core</module>
@@ -34,6 +34,10 @@
         <module>voice-channel-context</module>
         <module>anti-raid</module>
         <module>custom-command</module>
+        <module>twitch</module>
+        <module>giveaway</module>
+        <module>image-generation</module>
+        <module>sticky-roles</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.10</version>
+        <version>1.4.35</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

abstracto-modules/profanity-filter/src/main/resources/en_US/listener/profanityListener/profanityDetection_listener_report_embed_en_US.ftl

@@ -28,4 +28,17 @@
             ]
         }
     ]
+<#if moderationActionComponents?size gt 0>,
+    "buttons": [
+    <#list moderationActionComponents as moderactionAction>
+        {
+            "label": "<@safe_include "moderation_action_${moderactionAction.action}_button_label"/>",
+            "id": "${moderactionAction.componentId}",
+            "buttonStyle": "danger",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }<#sep>,</#list>
+    ]
+</#if>
 }

abstracto-modules/remind/pom.xml

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_file_name_en_US.ftl

@@ -1 +1 @@
-emote_stats_${guild.id}.csv
+emote_stats_${serverId}.csv

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/downloadEmoteStats/downloadEmoteStats_response_embed_en_US.ftl

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

abstracto-modules/statistic/src/main/resources/en_US/emotes/commands/emoteStats/emoteStats_animated_response_embed_en_US.ftl

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