Refactor

.github/workflows/build.yml

@@ -1,13 +1,13 @@
-name: Java CI
+name: Build on Push
 
-on: [push, pull_request]
+on: push
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: Test
+
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    services:
+      db:
+        image: mariadb:11.1.2
+        env:
+          MYSQL_DATABASE: 'talium'
+          MYSQL_USER: 'taliumBot'
+          MYSQL_PASSWORD: 'password'
+          MYSQL_ROOT_PASSWORD: 'password'
+        ports:
+          - "4770:3306"
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Maven
+        run: mvn --batch-mode --update-snapshots clean compile
+        working-directory: bot
+        env:
+          JAVA_TOOL_OPTIONS: --enable-preview
+      - name: Run all Tests
+        run: mvn test
+        working-directory: bot
+        env:
+          JAVA_TOOL_OPTIONS: --enable-preview
+          tipeeeApikey: ${{ secrets.tipeeeApikey }}
+          DOCKER_PASS: ${{ secrets.tipeeeChannel }}

bot/main/talium/system/ASCIIProgressbar.java → bot/main/talium/ASCIIProgressbar.java

@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

bot/main/talium/system/GlobalExceptionHandler.java → bot/main/talium/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -10,6 +10,7 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
     @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
     @ExceptionHandler(value = {Exception.class})
     public String generalException(Exception e) {
+        logger.error(e.getMessage(), e);
         return "An Exception occurred!";
     }
 }

bot/main/talium/system/Out.java → bot/main/talium/Out.java

@@ -1,22 +1,22 @@
-package talium.system;
+package talium;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
-import talium.inputs.Twitch4J.Twitch4JInput;
-import talium.inputs.Twitch4J.TwitchApi;
-import talium.system.stringTemplates.Template;
-import talium.system.stringTemplates.TemplateService;
-import talium.system.templateParser.exeptions.ArgumentValueNullException;
-import talium.system.templateParser.exeptions.UnIterableArgumentException;
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
-import talium.system.templateParser.TemplateParser;
+import talium.twitch4J.TwitchAPINoop;
+import talium.twitch4J.TwitchApi;
+import talium.stringTemplates.Template;
+import talium.stringTemplates.TemplateService;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.TemplateParser;
+import talium.templateParser.statements.Statement;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
-import static talium.system.templateParser.TemplateInterpreter.populate;
+import static talium.templateParser.TemplateInterpreter.populate;
 
 @Component
 public class Out {
@@ -30,8 +30,11 @@ public void setTemplateService(TemplateService templateService) {
 
     public static class Twitch {
 
+        @NonNull
+        public static TwitchApi api = new TwitchAPINoop();
+
         public static void sendRawMessage(String message) {
-            TwitchApi.sendMessage(message);
+            api.sendMessage(message);
         }
 
         public static String sendNamedTemplate(String id, HashMap<String, Object> baseValues) throws NoSuchElementException {
@@ -47,16 +50,21 @@ public static String sendNamedTemplate(String id, HashMap<String, Object> baseVa
 
         public static String sendRawTemplate(String template, HashMap<String, Object> values) {
             String message;
+            List<Statement> parsed;
+            try {
+                parsed = new TemplateParser(template).parse();
+            } catch (ParsingException e) {
+                // TODO display exceptions, but this should not throw exceptions, since a parsing check should be done on save, so it should still work here
+                throw new RuntimeException(e);
+            }
             try {
-                var parsed = new TemplateParser(template).parse();
                 message = populate(parsed, values);
-            } catch (UnsupportedComparisonOperator | NoSuchFieldException | ArgumentValueNullException |
-                     IllegalAccessException | UnIterableArgumentException | UnsupportedComparandType e) {
+            } catch (InterpretationException e) {
                 //TODO handle exceptions
                 // the exceptions should be displayed in the console and in the webconsole with a fairly high priority
                 throw new RuntimeException(e);
             }
-            TwitchApi.sendMessage(message);
+            api.sendMessage(message);
             return message;
         }
     }

bot/main/talium/Registrar.java

@@ -0,0 +1,141 @@
+package talium;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import talium.twitch4J.TwitchUserPermission;
+import talium.inputSystem.HealthManager;
+import talium.stringTemplates.Template;
+import talium.stringTemplates.TemplateService;
+import talium.twitchCommands.cooldown.ChatCooldown;
+import talium.twitchCommands.cooldown.CooldownType;
+import talium.twitchCommands.triggerEngine.RuntimeTrigger;
+import talium.twitchCommands.triggerEngine.TriggerCallback;
+import talium.twitchCommands.triggerEngine.TriggerEngine;
+import talium.twitchCommands.triggerEngine.TriggerProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/// Used as a central place to register actions and resources with parts of the bot
+@Component
+public class Registrar {
+
+    static TemplateService templateService;
+
+    @Autowired
+    public Registrar(TemplateService templateService) {
+        Registrar.templateService = templateService;
+    }
+
+    /// Register Custom HealthUI titel and description
+    public static void registerHealthDescription(String self, String title, String description) {
+        HealthManager.addCustomization(self, title, description);
+    }
+
+    /// Register Custom HealthUI titel and description
+    public static void registerHealthDescription(Class<?> self, String title, String description) {
+        HealthManager.addCustomization(self.getCanonicalName(), title, description);
+    }
+
+    public interface ResetableCache {
+        void rebuild();
+    }
+
+    /// Register a function to reset/rebuild a application cache from the panel ui
+    public static void registerResetableChache(String name, String description, ResetableCache cache) {
+        //TODO register cache, show in ui, act on reset HTTP post
+    }
+
+    /// Register an autogenerated command with the bot
+    public static class Command {
+        //set all defaults
+        String id;
+        List<Pattern> patterns = new ArrayList<>();
+        TwitchUserPermission permission = TwitchUserPermission.EVERYONE;
+        ChatCooldown userCooldown = new ChatCooldown(CooldownType.MESSAGES, 0);
+        ChatCooldown globalCooldown = new ChatCooldown(CooldownType.MESSAGES, 0);
+
+        public Command(String id) {
+            checkId(id);
+            this.id = id;
+        }
+
+        public Command(String id, String pattern) {
+            checkId(id);
+            this.id = id;
+        }
+
+        private static void checkId(String id) {
+            if (id == null || id.isEmpty()) {
+                throw new IllegalArgumentException("Command id cannot be null or empty");
+            }
+            if (id.startsWith("userCommand.")) {
+                throw new IllegalArgumentException("Autogenerated command is not allowed to have the prefix \"userCommand.\" cause: '"+ id);
+            }
+        }
+
+        public Command id(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Command patterns(List<String> patterns) {
+            for (String pattern : patterns) {
+                this.patterns.add(Pattern.compile(pattern));
+            }
+            return this;
+        }
+
+        public Command pattern(String pattern) {
+            this.patterns.add(Pattern.compile(pattern));
+            return this;
+        }
+
+        public Command permission(TwitchUserPermission permission) {
+            this.permission = permission;
+            return this;
+        }
+
+        public Command userCooldown(ChatCooldown userCooldown) {
+            this.userCooldown = userCooldown;
+            return this;
+        }
+
+        public Command globalCooldown(ChatCooldown globalCooldown) {
+            this.globalCooldown = globalCooldown;
+            return this;
+        }
+
+        /// Registers an automatically generated command with a callback
+        public void registerActionCommand(TriggerCallback callback) {
+            TriggerProvider.addCommandRegistration(new RuntimeTrigger(id, patterns, permission, userCooldown,globalCooldown, callback));
+        }
+
+        /// Registers an automatically generated command without a callback, but with a template
+        public void registerTextCommand(String template) {
+            registerTextCommand(template, null);
+        }
+
+        /// Registers an automatically generated command without a callback, but with a template
+        public void registerTextCommand(String template, String messageColor) {
+            templateService.saveIfAbsent(new Template(id, template, messageColor));
+            TriggerProvider.addCommandRegistration(new RuntimeTrigger(id, patterns, permission, userCooldown,globalCooldown, TriggerEngine.TEXT_COMMAND_CALLBACK));
+        }
+    }
+
+    /// Registers a template with the context variables (captured environment)
+    public static void registerTemplate(Template template) {
+        templateService.saveIfAbsent(template);
+    }
+
+    /// Registers a template with the context variables (captured environment)
+    public static void registerTemplate(String templateId, String template, String messageColor) {
+        templateService.saveIfAbsent(new Template(templateId, template, messageColor));
+    }
+
+    /// Registers a template with the context variables (captured environment)
+    public static void registerTemplate(String templateId, String template) {
+        templateService.saveIfAbsent(new Template(templateId, template, null));
+    }
+}

bot/main/talium/system/StopWatch.java → bot/main/talium/StopWatch.java

@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public StopWatch(TYPE type) {
                 endMessage = "Finished Bot shutdown";
             }
         }
-        if (startMessage.length() > 0)
+        if (!startMessage.isEmpty())
             logger.info("{}...", startMessage.trim());
     }