[AB-358] refactoring templates and setting new 1.4 version

2026-01-05 00:53:48 +00:00 · 2022-03-18 00:14:48 +01:00
parent e505b181e6
commit 30eadf6352
54 changed files with 108 additions and 72 deletions
--- a/abstracto-modules/anti-raid/pom.xml
+++ b/abstracto-modules/anti-raid/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/assignable-roles/pom.xml
+++ b/abstracto-modules/assignable-roles/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/core/pom.xml
+++ b/abstracto-modules/core/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>core</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>

    <build>
        <plugins>
--- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_cancellation_notification_en_US.ftl
@@ -1 +1 @@
-<#assign featureName><#include "feature_${featureConfig.feature.key}"></#assign><#include "feature_setup_cancellation_message">
+<#assign featureName><#include "feature_${featureKey}"></#assign><#include "feature_setup_cancellation_message">
--- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_completion_notification_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_completion_notification_en_US.ftl
@@ -1 +1 @@
-<#assign featureName><#include "feature_${featureConfig.feature.key}"></#assign><#include "feature_setup_completion_message">
+<#assign featureName><#include "feature_${featureKey}"></#assign><#include "feature_setup_completion_message">
--- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_embed_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_embed_en_US.ftl
@@ -0,0 +1,30 @@
+{
+    "embeds": [
+        {
+            "description": "<#list actionConfigs as actionConfig><#assign actionConfig=actionConfig/>
+                <#assign param=actionConfig.object.templateModel>
+                <@safe_include "${actionConfig.object .templateName}"/>
+
+            </#list>
+            "
+        }
+    ],
+    "buttons": [
+        {
+            "label": "<@safe_include "feature_setup_confirmation_confirm_button_title"/>",
+            "id": "${confirmButtonId}",
+            "buttonStyle": "secondary",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        },
+        {
+            "label": "<@safe_include "feature_setup_confirmation_cancel_button_title"/>",
+            "id": "${cancelButtonId}",
+            "buttonStyle": "secondary",
+            "metaConfig": {
+                "persistCallback": false
+            }
+        }
+    ]
+}
--- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_confirmation_en_US.ftl
@@ -1,5 +0,0 @@
-<#list actionConfigs as actionConfig><#assign actionConfig=actionConfig/>
-<#assign param=actionConfig.templateModel>
-<@safe_include "${actionConfig.templateName}"/>
-
-</#list>
--- a/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_action_en_US.ftl
+++ b/abstracto-modules/core/src/main/resources/en_US/commands/setupFeature/feature_setup_post_target_action_en_US.ftl
@@ -1 +1 @@
-<#assign postTargetKey>${param.postTargetKey}</#assign><#assign channel>${param.channel.asMention}</#assign><@safe_include "feature_setup_post_target_action_display"/>
+<#assign postTargetKey>${param.postTargetKey}</#assign><#assign channel>${param.channelAsMention}</#assign><@safe_include "feature_setup_post_target_action_display"/>
--- a/abstracto-modules/entertainment/pom.xml
+++ b/abstracto-modules/entertainment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/experience-tracking/pom.xml
+++ b/abstracto-modules/experience-tracking/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>experience-tracking</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/invite-filter/pom.xml
+++ b/abstracto-modules/invite-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/link-embed/pom.xml
+++ b/abstracto-modules/link-embed/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/logging/pom.xml
+++ b/abstracto-modules/logging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/moderation/pom.xml
+++ b/abstracto-modules/moderation/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>moderation</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/modmail/pom.xml
+++ b/abstracto-modules/modmail/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>modmail</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_embed_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_embed_en_US.ftl
@@ -0,0 +1,14 @@
+{
+    "additionalMessage": "<@safe_include "server_chooser_server_list_description"/>",
+    "buttons": [
+        <#list choices.commonGuilds?keys as componentId>
+            {
+                "label": "${choices.commonGuilds[componentId].serverName}",
+                "id": "${componentId}",
+                "buttonStyle": "secondary",
+                "metaConfig": {
+                    "persistCallback": false
+                }
+            }<#sep>,</#list>
+    ]
+}
--- a/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/listener/messageReceived/modmail_modal_server_choice_en_US.ftl
@@ -1,5 +0,0 @@
-<@safe_include "server_chooser_server_list_description"/>
-
-<#list commonGuilds as guild>
-    ${guild.reactionEmote} ${guild.guild.guild.name}
-</#list>
--- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/featureSetup/feature_setup_modmail_category_action_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/featureSetup/feature_setup_modmail_category_action_en_US.ftl
@@ -1 +1 @@
-<#assign category>${param.category.name}</#assign><#include "feature_setup_modmail_category_action_display">
+<#assign category>${param.categoryAsMention} (${param.categoryId?c})</#assign><#include "feature_setup_modmail_category_action_display">
--- a/abstracto-modules/modmail/src/main/resources/en_US/modmail/featureSetup/feature_setup_modmail_category_message_en_US.ftl
+++ b/abstracto-modules/modmail/src/main/resources/en_US/modmail/featureSetup/feature_setup_modmail_category_message_en_US.ftl
@@ -1 +1 @@
-<#assign categoryName><#if category?has_content>${category.name}<#else><#include "feature_setup_modmail_category_message_no_category"></#if></#assign><#include "feature_setup_modmail_category_message_display">
+<#assign categoryMention><#if categoryId?has_content>${categoryAsMention} (${categoryId?c})<#else><#include "feature_setup_modmail_category_message_no_category"></#if></#assign><#include "feature_setup_modmail_category_message_display">
--- a/abstracto-modules/pom.xml
+++ b/abstracto-modules/pom.xml
@@ -4,14 +4,14 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <groupId>dev.sheldan.abstracto-templates.templates</groupId>
    <artifactId>abstracto-modules</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>

    <modules>
        <module>core</module>
--- a/abstracto-modules/profanity-filter/pom.xml
+++ b/abstracto-modules/profanity-filter/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/remind/pom.xml
+++ b/abstracto-modules/remind/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/repost-detection/pom.xml
+++ b/abstracto-modules/repost-detection/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/starboard/pom.xml
+++ b/abstracto-modules/starboard/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/statistic/pom.xml
+++ b/abstracto-modules/statistic/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>statistic</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/suggestion/pom.xml
+++ b/abstracto-modules/suggestion/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>
--- a/abstracto-modules/utility/pom.xml
+++ b/abstracto-modules/utility/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
        <artifactId>abstracto-modules</artifactId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>pom</packaging>

    <artifactId>utility</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
    <build>
        <plugins>
            <plugin>
--- a/abstracto-modules/voice-channel-context/pom.xml
+++ b/abstracto-modules/voice-channel-context/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/abstracto-modules/webservices/pom.xml
+++ b/abstracto-modules/webservices/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>abstracto-modules</artifactId>
        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>