moved some more templates to template config

fixed usage of post target exceptions

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/service/ModMailThreadServiceBean.java

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.modmail.service;
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import com.jagrosh.jdautilities.menu.ButtonMenu;
 import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
-import dev.sheldan.abstracto.core.exception.PostTargetNotValidException;
+import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException;
 import dev.sheldan.abstracto.core.models.FullGuild;
 import dev.sheldan.abstracto.core.models.FullUser;
 import dev.sheldan.abstracto.core.models.UndoActionInstance;
@@ -398,7 +398,7 @@ public class ModMailThreadServiceBean implements ModMailThreadService {
                             log.error("Failed to log messages for mod mail thread {}.", modMailThreadId, innerThrowable);
                             return null;
                         });
-                    } catch (PostTargetNotValidException po) {
+                    } catch (PostTargetNotFoundException po) {
                         log.error("Failed to log mod mail messages", po);
                         sendModMailFailure("modmail_exception_post_target_not_defined", innerModMailThread.getUser(), modMailThreadId, feedBack, po);
                     } catch (Exception e) {

abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/modmail/modmail_thread_header_embed_en_US.ftl

@@ -10,6 +10,6 @@
   },
   <#assign user>${threadUser.member.effectiveName}#${threadUser.member.user.discriminator} (${threadUser.member.user.id})</#assign>
   <#assign joinDate>${threadUser.member.timeJoined}</#assign>
-  <#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else>No roles</#list></#assign>
+  <#assign roles><#list threadUser.member.roles as role>${role.asMention}<#sep>,<#else><#include "modmail_thread_header_no_roles"></#list></#assign>
   "description": "<#include "modmail_thread_header_embed_description">"
 }

abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/templates/listener/starboard/starboard_post_embed_en_US.ftl

@@ -4,7 +4,7 @@
     "name": "${author.effectiveName}",
     "avatar": "${author.user.effectiveAvatarUrl}"
   <#else>
-    "name": "${user.id?c} (Has left the server)"
+    "name": "${user.id?c} (<#include "user_left_server">)"
   </#if>
   },
   "color" : {

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/PostTargetServiceBean.java

@@ -3,6 +3,7 @@ package dev.sheldan.abstracto.core.service;
 import dev.sheldan.abstracto.core.config.DynamicKeyLoader;
 import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
 import dev.sheldan.abstracto.core.exception.GuildException;
+import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException;
 import dev.sheldan.abstracto.core.exception.PostTargetNotValidException;
 import dev.sheldan.abstracto.core.service.management.PostTargetManagement;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
@@ -70,7 +71,7 @@ public class PostTargetServiceBean implements PostTargetService {
             return postTarget;
         } else {
             log.error("PostTarget {} in server {} was not found!", postTargetName, serverId);
-            throw new PostTargetNotValidException(postTargetName);
+            throw new PostTargetNotFoundException(postTargetName);
         }
     }
 
@@ -171,7 +172,7 @@ public class PostTargetServiceBean implements PostTargetService {
     public void throwIfPostTargetIsNotDefined(String name, Long serverId) {
         PostTarget postTarget = postTargetManagement.getPostTarget(name, serverId);
         if(postTarget == null) {
-            throw new PostTargetNotValidException(name);
+            throw new PostTargetNotValidException(name, dynamicKeyLoader.getPostTargetsAsList());
         }
     }
 

abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/PostTargetManagementBean.java

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service.management;
 
 import dev.sheldan.abstracto.core.config.DynamicKeyLoader;
 import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
-import dev.sheldan.abstracto.core.exception.PostTargetNotFoundException;
+import dev.sheldan.abstracto.core.exception.PostTargetNotValidException;
 import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
@@ -36,7 +36,7 @@ public class PostTargetManagementBean implements PostTargetManagement {
     @Override
     public PostTarget createPostTarget(String name, AServer server, AChannel targetChannel) {
         if(!postTargetService.validPostTarget(name)) {
-            throw new PostTargetNotFoundException(name, dynamicKeyLoader.getPostTargetsAsList());
+            throw new PostTargetNotValidException(name, dynamicKeyLoader.getPostTargetsAsList());
         }
         log.info("Creating post target {} pointing towards {}", name, targetChannel);
         PostTarget build = PostTarget.builder().name(name).channelReference(targetChannel).serverReference(server).build();

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/command_not_found_en_US.ftl

@@ -1 +1 @@
-Command was not found.
+<#include "command_not_found_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_disabled_message_en_US.ftl

@@ -1 +1 @@
-Feature has been disabled. Necessary feature is: <#include "${featureConfig.feature.key}_feature">, you can enable it by executing `enable ${featureConfig.feature.key}`.
+<#assign featureName><#include "${featureConfig.feature.key}_feature"></#assign><#assign featureKey>${featureConfig.feature.key}</#assign><#include "feature_disabled_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/feature_not_found_en_US.ftl

@@ -1 +1 @@
-Feature ${featureName} not available. The available features are: ${availableFeatures?join(", ")}
+<#assign availableFeatures>${availableFeatures?join(", ")}</#assign><#include "feature_not_found_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/immune_role_en_US.ftl

@@ -1 +1 @@
-The targeted user is immune against this command, because of the role: ${role.name}.
+<#assign roleName>${role.name}</#assign> <#include "immune_role_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/incorrect_parameters_en_US.ftl

@@ -1 +1 @@
-The necessary parameters were not found. A '${class.simpleName}' was expected as '${parameterName}'. Consult help to see the correct syntax.
+<#assign expectedType>${class.simpleName}</#assign><#include "incorrect_parameters_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_parameters_en_US.ftl

@@ -1 +1 @@
-Insufficient parameters: ${parameterName} was not found.
+<#include "insufficient_parameters_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/insufficient_role_en_US.ftl

@@ -1 +1 @@
-You lack the necessary role to execute this command. One of the following is needed: <#list allowedRoles as role>${role.name}<#sep>,<#else>None configured.</#list>
+<#assign roles><#list allowedRoles as role>${role.name}<#sep>,<#else>None configured.</#list></#assign><#include "insufficient_role_text">

abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/parameter_too_long_en_US.ftl

@@ -1 +1 @@
-The parameter ${parameterName} had a too large value: ${actualLength}. The maximum is: ${maximumLength}.
+<#include "parameter_too_long_text">

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotFoundException.java

@@ -8,12 +8,10 @@ import java.util.List;
 public class PostTargetNotFoundException extends AbstractoRunTimeException implements Templatable {
 
     private String postTargetKey;
-    private List<String> availableTargets;
 
-    public PostTargetNotFoundException(String key, List<String> available) {
+    public PostTargetNotFoundException(String key) {
         super("");
         this.postTargetKey = key;
-        this.availableTargets = available;
     }
 
     @Override
@@ -25,7 +23,6 @@ public class PostTargetNotFoundException extends AbstractoRunTimeException imple
     public Object getTemplateModel() {
         HashMap<String, String> param = new HashMap<>();
         param.put("key", this.postTargetKey);
-        param.put("available", String.join(",", this.availableTargets));
         return param;
     }
 }

abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/PostTargetNotValidException.java

@@ -3,14 +3,17 @@ package dev.sheldan.abstracto.core.exception;
 import dev.sheldan.abstracto.templating.Templatable;
 
 import java.util.HashMap;
+import java.util.List;
 
 public class PostTargetNotValidException extends AbstractoRunTimeException implements Templatable {
 
     private String postTargetKey;
+    private List<String> availableTargets;
 
-    public PostTargetNotValidException(String key) {
+    public PostTargetNotValidException(String key, List<String> available) {
         super("");
         this.postTargetKey = key;
+        this.availableTargets = available;
     }
 
     @Override
@@ -22,6 +25,7 @@ public class PostTargetNotValidException extends AbstractoRunTimeException imple
     public Object getTemplateModel() {
         HashMap<String, String> param = new HashMap<>();
         param.put("key", this.postTargetKey);
+        param.put("available", String.join(",", this.availableTargets));
         return param;
     }
 }

abstracto-application/template-config/src/main/resources/templates/en_US/general/embed_page_count_page_en_US.ftl

@@ -0,0 +1 @@
+Page ${count}

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/command_not_found_text_en_US.ftl

@@ -0,0 +1 @@
+Command was not found.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_disabled_text_en_US.ftl

@@ -0,0 +1 @@
+Feature has been disabled. Necessary feature is: ${featureName}, you can enable it by executing `enable ${featureKey}`.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/feature_not_found_text_en_US.ftl

@@ -0,0 +1 @@
+Feature ${featureName} not available. The available features are: ${availableFeatures}.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/immune_role_text_en_US.ftl

@@ -0,0 +1 @@
+The targeted user is immune against this command, because of the role: ${roleName}.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/incorrect_parameters_text_en_US.ftl

@@ -0,0 +1 @@
+The necessary parameters were not found. A '${expectedType}' was expected as '${parameterName}'. Consult help to see the correct syntax.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_parameters_text_en_US.ftl

@@ -0,0 +1 @@
+Insufficient parameters: ${parameterName} was not found.

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/insufficient_role_text_en_US.ftl

@@ -0,0 +1 @@
+You lack the necessary role to execute this command. One of the following is needed: ${roles}

abstracto-application/template-config/src/main/resources/templates/en_US/general/exception/parameter_too_long_text_en_US.ftl

@@ -0,0 +1 @@
+The parameter ${parameterName} had a too large value: ${actualLength}. The maximum is: ${maximumLength}.

abstracto-application/template-config/src/main/resources/templates/en_US/modMail/notification/modmail_thread_header_no_roles_en_US.ftl

@@ -0,0 +1 @@
+No roles.

abstracto-application/templating/templating-impl/src/main/resources/templates/embeds/embed_page_count_en_US.ftl

@@ -1 +1 @@
-Page ${count}
+<#include "embed_page_count_page">