[AB-240] moving invite filtering to separate module

adding templates for effects rework
changed display of optional parameters in help

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

@@ -46,21 +46,19 @@
 </#if>
 <#if restricted?? && restricted>
 <@safe_include "help_command_embed_command_executable_by"/>:<#if allowedRoles??> <#list allowedRoles as allowedRole> ${allowedRole.asMention?json_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_executable_by_nobody"/></#list> </#if>
-<#if immuneRoles?? ><@safe_include "help_command_embed_command_immune"/>: <#list immuneRoles as immuneRole> ${immuneRole.asMention?json_string}<#sep><@safe_include "help_command_embed_or"/><#else><@safe_include "help_command_embed_command_immune_none"/></#list> </#if>
 <#else>
 <@safe_include "help_command_embed_command_not_restricted"/>
 </#if>
 
+<#if effects??><@safe_include "help_command_embed_command_effects"/>: <#list effects as effect> <@safe_include "effect_type_${effect}"/><#sep>,<#else><@safe_include "help_command_embed_command_effects_none"/></#list> </#if>
+
 </#if>
 **<@safe_include "help_command_embed_command_parameters"/>**:
 <#if command.parameters??>
 <#list command.parameters as parameter><#assign parameter=parameter>
-<@safe_include "help_command_embed_command_description"/> `${parameter.name?json_string}`: <#if parameter.templated?? && parameter.templated><@safe_include "${command.name}_parameter_${parameter.name}"/><#else>${(parameter.description?json_string)!""}</#if>
-<#list parameter.validators as validator><#assign validator=validator><#assign model=validator.templateModel/><@safe_include "${validator.templateName}"/>
-</#list>
-
-<@safe_include "help_command_embed_command_optional"/><#sep>
-
+<@safe_include "help_command_embed_command_description"/> `${parameter.name?json_string}`: <#if parameter.templated?? && parameter.templated><@safe_include "${command.name}_parameter_${parameter.name}"/><#else>${(parameter.description?json_string)!""}</#if> <@safe_include "help_command_embed_command_optional"/>
+<#list parameter.validators as validator><#assign validator=validator><#assign model=validator.templateModel/><@safe_include "${validator.templateName}"/></#list>
+<#sep>
 <#else>
 <@safe_include "help_command_embed_command_no_parameters"/>
 </#list>

abstracto-modules/core/src/main/resources/en_US/commands/showEffects/showEffects_response_embed_en_US.ftl

@@ -0,0 +1,8 @@
+{
+  <#include "abstracto_color">,
+  "description": "
+<#list effects as effect>
+`${effect}` <@safe_include "effect_type_${effect}_description"/>
+</#list>
+"
+}

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

@@ -1,2 +1,3 @@
 <#assign roleName>${model.role.name}</#assign>
+<#assign effect><#include "effect_type_${model.effectTypeKey}"></#assign>
 <#include "immune_role_exception_text">

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

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

abstracto-modules/invite-filter/pom.xml

@@ -0,0 +1,37 @@
+<?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>
+        <artifactId>abstracto-modules</artifactId>
+        <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+        <version>1.2.7-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>invite-filter</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>invite-filter-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/invite-filter/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/invite-filter/src/main/resources/en_US/command/showTrackedInviteLinks/showTrackedInviteLinks_response_embed_en_US.ftl

@@ -4,7 +4,7 @@
   },
   <#include "success_color">,
   "description": "<#list inviteLinks as link><#assign link=link/>
-  <#assign linkText>${link.code}</#assign>
+  <#assign linkText>${link.serverName}</#assign>
   <#assign linkUses>${link.uses}</#assign>
   <@safe_include "tracked_invite_links_link_display"/><#else><@safe_include "tracked_invite_links_no_links"/>
   </#list>"

abstracto-modules/pom.xml

@@ -29,6 +29,7 @@
         <module>suggestion</module>
         <module>webservices</module>
         <module>logging</module>
+        <module>invite-filter</module>
     </modules>
 
 </project>