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

adding validation message to enableFeature response

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.0.RC1</version>
+        <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>core</artifactId>
-    <version>1.4.0.RC1</version>
+    <version>1.4.29</version>
 
     <build>
         <plugins>

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

@@ -1 +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_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

@@ -0,0 +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 +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_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/commands/showEffects/showEffects_response_embed_en_US.ftl

@@ -5,6 +5,7 @@
             "description": "
 <#list effects as effect>
 `${effect}` <@safe_include "effect_type_${effect}_description"/>
+<#else><#include "showEffects_response_no_effects">
 </#list>
 "
         }

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

@@ -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">
+    <parent>
+        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+        <artifactId>abstracto-modules</artifactId>
+        <version>1.4.29</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>custom-command</artifactId>
+    <packaging>pom</packaging>
+    <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>custom-command-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/custom-command/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/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/custom_command_response_embed_en_US.ftl

@@ -0,0 +1,3 @@
+{
+    "additionalMessage": "${additionalText?json_string}"
+}

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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/entertainment/src/main/resources/en_US/commands/creditGamble/creditGamble_response_embed_en_US.ftl

@@ -0,0 +1,19 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign rolls=rolls?join(", ")>
+            <#assign uniqueNumbers=uniqueNumbers>
+            <#assign bid=bid>
+            <#assign toBank=toBank>
+            <#assign toJackpot=toJackpot>
+            <#assign currentJackpot=currentJackpot>
+            <#assign won=won>
+            <#if won>
+                "description": "<@safe_include "creditGamble_response_win_text.ftl"/>"
+            <#else>
+                "description": "<@safe_include "creditGamble_response_text"/>"
+            </#if>
+        }
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/creditLeaderboard/creditLeaderboard_rank_entry_en_US.ftl

@@ -0,0 +1,5 @@
+<#assign credits=entry.credits>
+<#assign rank=entry.rank>
+<#assign userId=entry.memberDisplay.userId>
+<#assign memberDisplay><#if entry.member?has_content><@member_user_name member=entry.member/><#else>${userId?c}</#if></#assign>
+#${rank} - ${credits} credits - ${memberDisplay}

abstracto-modules/entertainment/src/main/resources/en_US/commands/creditLeaderboard/creditLeaderboard_response_embed_en_US.ftl

@@ -0,0 +1,9 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<#list entries as entry><#assign entry=entry><@safe_include "creditLeaderboard_rank_entry"/>\n</#list>
+            <#assign entry=ownRank><@safe_include "creditLeaderboard_rank_entry"/>"
+        }
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/creditLeaderboard/creditLeaderboard_response_no_user_entry_en_US.ftl

@@ -0,0 +1,7 @@
+{
+    "embeds": [
+        {
+            "description": "<#include "creditLeaderboard_no_user_found">"
+        }
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/credits/credits_response_embed_en_US.ftl

@@ -0,0 +1,13 @@
+
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign credits=entry.credits>
+            <#assign rank=entry.rank>
+            <#assign userId=entry.memberDisplay.userId>
+            <#assign memberDisplay><#if entry.member?has_content><@member_user_name member=entry.member/><#else>${userId?c}</#if></#assign>
+            "description": "<@safe_include "credits_response_description"/>"
+        }
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/mines/mines_board_response_embed_en_US.ftl

@@ -0,0 +1,39 @@
+{
+    <#assign totalMines=mineCount>
+    <#assign userLost=state.name() == "LOST">
+    <#assign userWon=state.name() == "WON">
+    <#assign ended=userLost || userWon>
+    <#if creditsEnabled>
+        <#assign changedCreditAmount=creditChange/>
+        <#assign creditAmount=credits/>
+        <#assign stateText><#if state.name() == "WON"><#include "mines_state_won_credits"><#elseif state.name() == "LOST"><#include "mines_state_lost_credits"><#else><#include "mines_state_continue_credits"></#if></#assign>
+    <#else>
+        <#assign stateText><#if state.name() == "WON"><#include "mines_state_won"><#elseif state.name() == "LOST"><#include "mines_state_lost"><#else><#include "mines_state_continue"></#if></#assign>
+    </#if>
+"additionalMessage": "<@safe_include "mines_additional_message"/>",
+    "buttons": [
+        <#list rows as row>
+            <#list row.fields as field>
+                {
+                    <#if ended>
+                        <#assign label><#if field.counterValue != 0>${field.counterValue}<#elseif field.type.name() == "EXPLODED">💀<#elseif field.type.name() == "MINE">💣<#elseif field.type.name() == "UNCOVERED">o</#if></#assign>
+                    <#else>
+                        <#assign label><#if field.type.name() == "COVERED" || field.type.name() == "MINE">x<#elseif field.counterValue != 0>${field.counterValue}<#else>o</#if></#assign>
+                    </#if>
+                    "label": "${label}",
+                    "id": "${boardId}_${field.x}_${field.y}",
+                    "buttonStyle": "secondary",
+                    <#if ended>"disabled": true,</#if>
+                    "metaConfig": {
+                        "persistCallback": false
+                        <#if field?is_first>
+                        ,"forceNewRow": true
+                        </#if>
+                    }
+                }
+                <#sep>,
+            </#list>
+            <#sep>,
+        </#list>
+    ]
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/payday/payday_response_embed_en_US.ftl

@@ -0,0 +1,11 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#assign currentCredits=currentCredits>
+            <#assign rank=leaderboardPosition>
+            <#assign gainedCredits=gainedCredits>
+            "description": "<@safe_include "payday_response_text"/>"
+        }
+    ]
+}

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/commands/slots/slots_board_display_en_US.ftl

@@ -0,0 +1,3 @@
+<#list rows as row><#assign row=row>
+<#if row?index = 1>><#else>  </#if><#list row as item><#assign item=item>${item}</#list>
+</#list>

abstracto-modules/entertainment/src/main/resources/en_US/commands/slots/slots_response_embed_en_US.ftl

@@ -0,0 +1,11 @@
+{
+    <#assign newCredits=newCredits>
+    <#assign bid=bid>
+    <#assign oldCredits=oldCredits>
+    <#assign winnings><#if winnings gt 0>${winnings}<#else>0</#if></#assign>
+    <#assign factor=factor>
+    <#assign rows=rows>
+    <#assign outcomeKey=outComeKey>
+    <#assign board><#include "slots_board_display"/></#assign>
+    "additionalMessage": "~~\n~~<@safe_include "slots_outcome_description"/>"
+}

abstracto-modules/entertainment/src/main/resources/en_US/commands/transferCredits/transferCredits_response_embed_en_US.ftl

@@ -0,0 +1,9 @@
+{
+    <#assign sourceUser=sourceMember.memberMention/>
+    <#assign targetUser=targetMember.memberMention/>
+    <#assign creditsCount=credits/>
+    "additionalMessage": "<@safe_include "transferCredits_response_text"/>",
+    "messageConfig": {
+        "ephemeral": false
+    }
+}

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/invalid_mine_board_config_exception_en_US.ftl

@@ -0,0 +1,2 @@
+<#assign minRatio>${model.minMinesRatio * 100}</#assign>
+<#include "invalid_mine_board_config_exception_text">

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

@@ -0,0 +1 @@
+<#include "not_enough_wealth_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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>experience-tracking</artifactId>
-    <version>1.4.0.RC1</version>
+    <version>1.4.29</version>
     <build>
         <plugins>
             <plugin>

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

@@ -29,6 +29,11 @@
                     "name": "<@safe_include "rank_rank_field_title"/>",
                     "value": "${rankUser.rank}",
                     "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "rank_level_progress_field_title"/>",
+                    "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/listener/experienceTrackerListener/experience_level_up_notification_embed_en_US.ftl

@@ -0,0 +1,6 @@
+{
+    <#assign userMention=memberDisplay.memberMention>
+    <#assign pastLevel=oldLevel>
+    <#assign currentLevel=newLevel>
+    "additionalMessage": "<@safe_include "experience_level_up_notification_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.29</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.29</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/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/invite-filter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>abstracto-modules</artifactId>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.4.0.RC1</version>
+        <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl

@@ -18,7 +18,7 @@
             </#list>
             ",
             </#if>
-            <#if embeddedMessage.attachments?size gt 0>
+            <#if embeddedMessage.attachments?size gt 0 && !embeddedMessage.attachments[0].spoiler>
             "imageUrl": "${embeddedMessage.attachments[0].proxyUrl}",
             <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedThumbnail??>
             "imageUrl": "${embeddedMessage.embeds[0].cachedThumbnail.proxyUrl}",
@@ -58,6 +58,9 @@
         }
     ]
     </#if>
+    <#if embeddedMessage.attachments?size gt 0 && embeddedMessage.attachments[0].spoiler>
+    ,"additionalMessage": "||${embeddedMessage.attachments[0].proxyUrl?json_string}||"
+    </#if>
 <#if referencedMessageId?has_content && mentionsReferencedMessage?has_content>
     ,"referencedMessageId": "${referencedMessageId?c}",
     "messageConfig": {

abstracto-modules/logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.0.RC1</version>
+        <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>moderation</artifactId>
-    <version>1.4.0.RC1</version>
+    <version>1.4.29</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"/>",
-                    "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/editInfraction/editInfraction_response_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/infractions/infractions_display_response_paginator_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/infractions/infractions_infraction_entry_en_US.ftl

@@ -0,0 +1,15 @@
+<#include "format_instant">
+<#assign decayed=infraction.decayed/>
+<#assign infractionId=infraction.infractionId/>
+<#assign type=infraction.type/>
+<#assign reason=infraction.reason/>
+<#assign infractionUserText><#if infraction.infractionUser.memberMention??>${infraction.infractionUser.memberMention}(${infraction.infractionUser.userId?c})<#else>${infraction.infractionUser.userId?c}</#if></#assign>
+<#assign infractionCreatorUserText><#if infraction.infractionCreationUser.memberMention??>${infraction.infractionCreationUser.memberMention}(${infraction.infractionCreationUser.userId?c})<#else>${infraction.infractionCreationUser.userId?c}</#if></#assign>
+<#assign infractionDate><@format_instant_date_time instant=infraction.creationDate/></#assign>
+<#assign parameterText><#list infraction.parameters?keys as key><@safe_include "infraction_parameter_${type}_${key}_label"/>: ${infraction.parameters[key]}</#list></#assign>
+<#include "infractions_infraction_entry_text">
+
+<#if decayed>
+<#assign decayDate><@format_instant_date_time instant=infraction.decayDate/></#assign>
+ <#include "infractions_infraction_is_decayed">
+</#if>

abstracto-modules/moderation/src/main/resources/en_US/command/infractions/infractions_no_infractions_found_embed_en_US.ftl

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

abstracto-modules/moderation/src/main/resources/en_US/command/infractions/infractions_response_entry_en_US.ftl

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

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

@@ -6,7 +6,14 @@
         {
             <@member_author member=mutedUser/>,
             "title": {
-                "title": "<@safe_include "mute_log_title"/>"
+            <#if durationChanged>
+                "title": "<@safe_include "mute_log_title_mute_changed"/>"
+            <#elseif muteEnded>
+                "title": "<@safe_include "mute_log_title_unmuted"/>"
+            <#elseif muted>
+                "title": "<@safe_include "mute_log_title_muted"/>"
+            </#if>
+
             },
             <#include "moderation_action_color">,
             "fields": [
@@ -14,20 +21,23 @@
                     "name": "<@safe_include "mute_log_muted_user_field_title"/>",
                     "value": "<@full_member_info member=mutedUser/>"
                 },
+                <#if mutingUser?has_content>
                 {
-                    "name": "<@safe_include "mute_log_muting_user_field_title"/>",
+                    <#if muted>
+                        "name": "<@safe_include "mute_log_muting_user_field_title"/>",
+                    <#elseif muteEnded>
+                        "name": "<@safe_include "mute_log_unmuting_user_field_title"/>",
+                    </#if>
                     "value": "<@full_member_info member=mutingUser/>"
-                },
-                <#if message?has_content>
-                {
-                    "name": "<@safe_include "mute_log_mute_location_field_title"/>",
-                    "value": "[${contextChannel.name?json_string}](${message.jumpUrl})"
-                },
+                }
                 </#if>
+                <#if reason?has_content>,
                 {
                     "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
                     "value": "${reason?json_string}"
-                },
+                }
+                </#if>
+                <#if muted && !durationChanged>,
                 {
                     "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
                     "value": "${fmtDuration(muteDuration)}"
@@ -36,11 +46,18 @@
                     "name": "<@safe_include "mute_log_muted_until_field_title"/>",
                     "value": "<@format_instant_date_time instant=muteTargetDate/>"
                 }
-            ],
-            "footer": {
-                "text": "<@safe_include "mute_log_mute_id_footer"/>"
-            },
-            "timeStamp": "${muteDate}"
+                </#if>
+                <#if durationChanged>,
+                {
+                    "name": "<@safe_include "mute_log_new_mute_time_field_title"/>",
+                    "value": "<@format_instant_date_time instant=muteTargetDate/>"
+                },
+                {
+                    "name": "<@safe_include "mute_log_old_mute_time_field_title"/>",
+                    "value": "<@format_instant_date_time instant=oldMuteTargetDate/>"
+                }
+                </#if>
+            ]
         }
     ]
 }

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

@@ -1,57 +0,0 @@
-<#include "full_member_info">
-<#include "format_instant">
-{
-    "embeds": [
-        {
-            <#if unMutedUser?has_content>
-            <#include "member_author">
-            <@member_author member=unMutedUser/>,
-            </#if>
-            "title": {
-                "title": "<@safe_include "unMute_log_title"/>"
-            },
-            <#include "moderation_action_color">,
-            "fields": [
-                {
-                    "name": "<@safe_include "unMute_log_unmuted_user_field_title"/>",
-                    <#if unMutedUser?has_content>
-                    "value": "<@full_member_info member=unMutedUser/>"
-                    <#else>
-                    "value": "<@safe_include "user_left_server"/> (${mute.mutedUser.userReference.id?c})"
-                    </#if>
-                },
-                {
-                    "name": "<@safe_include "mute_log_muting_user_field_title"/>",
-                    <#if mutingUser?has_content>
-                    "value": "<@full_member_info member=mutingUser/>"
-                    <#else>
-                    "value": "<@safe_include "user_left_server"/> (${mute.mutingUser.userReference.id?c})"
-                    </#if>
-                },
-                <#if messageUrl??>
-                {
-                    "name": "<@safe_include "mute_log_mute_location_field_title"/>",
-                    "value": "[Link](${messageUrl})"
-                },
-                </#if>
-                {
-                    "name": "<@safe_include "unMute_log_muted_since_field_title"/>",
-                    "value": "<@format_instant_date_time instant=mute.muteDate/>"
-                },
-                {
-                    "name": "<@safe_include "mute_log_mute_duration_field_title"/>",
-                    "value": "${fmtDuration(muteDuration)}"
-                },
-                {
-                    "name": "<@safe_include "mute_log_mute_reason_field_title"/>",
-                    "value": "${mute.reason?json_string}"
-                }
-            ],
-            "footer": {
-                <#assign muteId=mute.muteId.id/>
-                "text": "<@safe_include "mute_log_mute_id_footer"/>"
-            },
-            "timeStamp": "${unmuteDate}"
-        }
-    ]
-}

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/exception/mute_role_has_not_been_setup_exception_en_US.ftl

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

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

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

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

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

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

@@ -0,0 +1,15 @@
+{
+    "id": "${modalId}",
+    "title": "<@safe_include "reactionReport_modal_title"/>",
+    "textInputs": [
+        {
+            "placeHolder": "<@safe_include "reactionReport_modal_context_placeholder"/>",
+            "id": "${inputComponentId}",
+            "position": 1,
+            "label": "<@safe_include "reactionReport_modal_context_label"/>",
+            "style": "paragraph",
+            "maxLength": 2000,
+            "required": false
+        }
+    ]
+}

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

@@ -3,13 +3,35 @@
         {
             <#include "abstracto_color">,
             <#assign messageLink=reportedMessage.messageUrl>
-            "description" : "<@safe_include "reactionReport_notification_embed_description"/>",
-            "fields": [
+            <#assign userMention>${reportedMessage.author.asMention}</#assign>
+            <#assign messageContent><#if reportedMessage.content?has_content>`${reportedMessage.content?json_string}`<#else><@safe_include "reactionReport_no_content"/></#if></#assign>
+            "description" : "<#if context?has_content><@safe_include "reactionReport_additional_context_label"/>: `${context?json_string}`</#if>
+<@safe_include "reactionReport_notification_embed_description"/>"
+            <#if reportedMessage.attachments?size gt 0>
+                ,"imageUrl": "${reportedMessage.attachments[0].proxyUrl}"
+            <#elseif reportedMessage.attachments?size = 0 && reportedMessage.embeds?size gt 0 && reportedMessage.embeds[0].cachedThumbnail??>
+                ,"imageUrl": "${reportedMessage.embeds[0].cachedThumbnail.proxyUrl}"
+            <#elseif reportedMessage.attachments?size = 0 && reportedMessage.embeds?size gt 0 && reportedMessage.embeds[0].cachedImageInfo??>
+                ,"imageUrl": "${reportedMessage.embeds[0].cachedImageInfo.proxyUrl}"
+            </#if>
+<#if singularMessage>
+            ,"fields": [
                 {
                     "name": "<@safe_include "reactionReport_notification_embed_report_counter_field_title"/>",
                     "value": "${reportCount}"
                 }
             ]
+</#if>
+        }
+    ],
+    "buttons": [
+        {
+            "label": "<@safe_include "reactionReport_jump_button_label"/>",
+            "url": "${messageLink?json_string}",
+            "buttonStyle": "link",
+            "metaConfig": {
+                "persistCallback": false
+            }
         }
     ]
 }

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

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

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

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

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/moderation/src/main/resources/en_US/scheduler/warnDecay/warn_decay_log_embed_en_US.ftl

@@ -7,7 +7,7 @@
             },
             <#include "moderation_action_color">,
             "description": "<#list warnings as warning><#assign warning=warning/>
-<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.warningUser.userId?c}</#assign></#if> <#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
+<#if warning.warnedMember??><#assign warnedUser>${warning.warnedMember.asMention?json_string} (${warning.warnedMember.idLong?c})</#assign><#else><#assign warnedUser> ${warning.warnedUser.userId?c}</#assign></#if> <#if warning.warningMember??><#assign warningUser> ${warning.warningMember.asMention?json_string} (${warning.warningMember.idLong?c})</#assign><#else><#assign warningUser>${warning.warningUser.userId?c}</#assign></#if> <#assign warnDate><@format_instant_date_time instant=warning.warning.warnDate/></#assign><#assign warnReason=warning.warning.reason/> <@safe_include "warnDecay_log_warn_entry"/>
 <#else>
 <@safe_include "warnDecay_log_no_warnings"/>
 </#list>"

abstracto-modules/modmail/pom.xml

@@ -4,13 +4,13 @@
     <parent>
         <groupId>dev.sheldan.abstracto-templates.templates</groupId>
         <artifactId>abstracto-modules</artifactId>
-        <version>1.4.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <artifactId>modmail</artifactId>
-    <version>1.4.0.RC1</version>
+    <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
     <groupId>dev.sheldan.abstracto-templates.templates</groupId>
     <artifactId>abstracto-modules</artifactId>
-    <version>1.4.0.RC1</version>
+    <version>1.4.29</version>
 
     <modules>
         <module>core</module>
@@ -33,6 +33,10 @@
         <module>profanity-filter</module>
         <module>voice-channel-context</module>
         <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.0.RC1</version>
+        <version>1.4.29</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.0.RC1</version>
+        <version>1.4.29</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

abstracto-modules/remind/src/main/resources/en_US/commands/remind/remind_joining_notification_embed_en_US.ftl

@@ -0,0 +1,27 @@
+{
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "metaConfig" : {
+                "preventEmptyEmbed": "true"
+            },
+"description": "
+<#if failedToJoin>
+<@safe_include "remind_reminder_join_failed"/>
+<#elseif selfJoin>
+<@safe_include "remind_reminder_self_join"/>
+<#else>
+<#if joined>
+<#include "format_instant">
+<#assign targetDate><@format_instant_date_time instant=reminderDate/></#assign>
+<@safe_include "remind_reminder_joined"/>
+<#else>
+<@safe_include "remind_reminder_left"/>
+</#if>
+</#if>"
+        }
+    ],
+    "messageConfig": {
+        "ephemeral": true
+    }
+}