From 2532ff76c768b0a8a18901e092d2d6bb34bcd539 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 28 Jan 2025 16:56:39 +0100
Subject: [PATCH 01/58] remove prototype Subscriber Alerts

---
 .../DonationTemplateContext.java              | 33 ------------
 .../donation_alerts/TipeeeSubscriber.java     | 31 -----------
 .../MVP_TemplateController.java               | 54 -------------------
 3 files changed, 118 deletions(-)
 delete mode 100644 bot/main/talium/modules/donation_alerts/DonationTemplateContext.java
 delete mode 100644 bot/main/talium/modules/donation_alerts/TipeeeSubscriber.java
 delete mode 100644 bot/main/talium/system/stringTemplates/MVP_TemplateController.java

diff --git a/bot/main/talium/modules/donation_alerts/DonationTemplateContext.java b/bot/main/talium/modules/donation_alerts/DonationTemplateContext.java
deleted file mode 100644
index aad7cc2b..00000000
--- a/bot/main/talium/modules/donation_alerts/DonationTemplateContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package talium.modules.donation_alerts;
-
-import talium.inputs.TipeeeStream.DonationEvent;
-import talium.system.stringTemplates.Formatter;
-import talium.system.stringTemplates.Template;
-
-import java.time.format.DateTimeFormatter;
-
-public class DonationTemplateContext {
-    private static final DateTimeFormatter dateFormater = DateTimeFormatter.ofPattern("dd/MM/yyyy");
-    private static final DateTimeFormatter timeFormater = DateTimeFormatter.ofPattern("HH:mm");
-
-    public final String currencyCode;
-    public final String currencySymbol;
-    public final String amount;
-    public final String message;
-    public final boolean hasMessage;
-    public final String tipeee_username;
-    public final String time;
-    public final String date;
-
-
-    public DonationTemplateContext(DonationEvent event) {
-        this.currencyCode = "EUR";
-        this.currencySymbol = "€";
-        this.amount = Formatter.formatDoubleComma(event.amount);
-        this.message = event.message;
-        this.hasMessage = event.hasMessage;
-        this.tipeee_username = event.tipeee_username;
-        this.date = event.donated_at.format(dateFormater);
-        this.time = event.donated_at.format(timeFormater);
-    }
-}
diff --git a/bot/main/talium/modules/donation_alerts/TipeeeSubscriber.java b/bot/main/talium/modules/donation_alerts/TipeeeSubscriber.java
deleted file mode 100644
index c54a4fa5..00000000
--- a/bot/main/talium/modules/donation_alerts/TipeeeSubscriber.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package talium.modules.donation_alerts;
-
-import talium.inputs.TipeeeStream.DonationEvent;
-import talium.modules.donation_goal.DonationGoal;
-import talium.modules.donation_goal.GoalTemplateContext;
-import talium.system.Out;
-import talium.system.eventSystem.Subscriber;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class TipeeeSubscriber {
-
-    @Subscriber
-    public static void handleTipeeeEvent(DonationEvent event) {
-        List<DonationGoal> activeGoals = DonationGoal.repo.findByActive(true);
-        for (DonationGoal goal: activeGoals) {
-            goal.amountInGoal += event.amount;
-            DonationGoal.repo.save(goal);
-        }
-
-        //TODO print new goal values
-        DonationTemplateContext donationContext = new DonationTemplateContext(event);
-        HashMap<String, Object> baseValues = new HashMap<>();
-        //TODO should be done via a system to attach additional context to a template
-        GoalTemplateContext goal = new GoalTemplateContext(activeGoals.getFirst());
-        baseValues.put("goal", goal);
-        baseValues.put("donation", donationContext);
-        Out.Twitch.sendNamedTemplate("alerts.tipeee.donation", baseValues);
-    }
-}
diff --git a/bot/main/talium/system/stringTemplates/MVP_TemplateController.java b/bot/main/talium/system/stringTemplates/MVP_TemplateController.java
deleted file mode 100644
index f9fe77c9..00000000
--- a/bot/main/talium/system/stringTemplates/MVP_TemplateController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package talium.system.stringTemplates;
-
-import com.google.gson.Gson;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-
-import java.util.List;
-import java.util.Optional;
-
-@RestController
-@RequestMapping("/templates")
-public class MVP_TemplateController {
-
-    private final TemplateService templateService;
-
-    @Autowired
-    public MVP_TemplateController(TemplateService templateService) {
-        this.templateService = templateService;
-    }
-
-    @GetMapping("/all")
-    String all() {
-        List<Template> templates = templateService.getAllTemplates();
-        Gson gson = new Gson();
-        return gson.toJson(templates);
-    }
-
-    @GetMapping
-    String getBy(@RequestParam String module, @RequestParam String type, @RequestParam String object) {
-        Optional<Template> template = templateService.getTemplateById(STR."\{module}.\{type}.\{object}");
-        if (template.isEmpty()) {
-            throw new ResponseStatusException(
-                    HttpStatus.NOT_FOUND, "entity not found"
-            );
-            //TODO
-        }
-        Gson gson = new Gson();
-        return gson.toJson(template.get());
-    }
-
-    @PostMapping
-    void updateTemplateString(@RequestParam String module, @RequestParam String type, @RequestParam String object, @RequestBody String new_template) {
-        try {
-            String id = STR."\{module}.\{type}.\{object}";
-            templateService.updateTemplateStringById(id, new_template);
-        } catch (RuntimeException e) {
-            throw new ResponseStatusException(
-                    HttpStatus.NOT_FOUND, "entity not found"
-            );
-        }
-    }
-}

From 5a73bd5e472fe21c9d3cba5f0c291ea9141f63ff Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 28 Jan 2025 17:34:39 +0100
Subject: [PATCH 02/58] remove donationGoal prototype

---
 .../modules/donation_goal/DonationGoal.java   | 40 -----------
 .../donation_goal/DonationGoalJson.java       |  8 ---
 .../donation_goal/DonationGoalRepo.java       | 16 -----
 .../donation_goal/GoalTemplateContext.java    | 23 ------
 .../donation_goal/MVP_GoalController.java     | 71 -------------------
 .../system/stringTemplates/TemplateDTO.java   |  8 ---
 6 files changed, 166 deletions(-)
 delete mode 100644 bot/main/talium/modules/donation_goal/DonationGoal.java
 delete mode 100644 bot/main/talium/modules/donation_goal/DonationGoalJson.java
 delete mode 100644 bot/main/talium/modules/donation_goal/DonationGoalRepo.java
 delete mode 100644 bot/main/talium/modules/donation_goal/GoalTemplateContext.java
 delete mode 100644 bot/main/talium/modules/donation_goal/MVP_GoalController.java

diff --git a/bot/main/talium/modules/donation_goal/DonationGoal.java b/bot/main/talium/modules/donation_goal/DonationGoal.java
deleted file mode 100644
index 05a9e097..00000000
--- a/bot/main/talium/modules/donation_goal/DonationGoal.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package talium.modules.donation_goal;
-
-import jakarta.persistence.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Currency;
-
-@Table(name = "goals-donation_goals")
-@Entity
-@Component
-public class DonationGoal {
-    @Id
-    public String idName;
-    public String displayName;
-    public Currency currency;
-    public double targetAmount;
-    public double amountInGoal;
-    public boolean active;
-    @Column(unique = true)
-    public int order;
-
-    public DonationGoal(String idName, String displayName, Currency currency, double targetAmount, double amountInGoal, boolean active) {
-        this.idName = idName;
-        this.displayName = displayName;
-        this.currency = currency;
-        this.targetAmount = targetAmount;
-        this.amountInGoal = amountInGoal;
-        this.active = active;
-    }
-
-    public DonationGoal() {
-    }
-
-    @Autowired
-    public void setRepo(DonationGoalRepo repo) {
-        DonationGoal.repo = repo;
-    }
-    public static DonationGoalRepo repo;
-}
diff --git a/bot/main/talium/modules/donation_goal/DonationGoalJson.java b/bot/main/talium/modules/donation_goal/DonationGoalJson.java
deleted file mode 100644
index 2bb7536a..00000000
--- a/bot/main/talium/modules/donation_goal/DonationGoalJson.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package talium.modules.donation_goal;
-
-public record DonationGoalJson(
-        String name,
-        Double target,
-        Double current,
-        String alertText
-) {}
diff --git a/bot/main/talium/modules/donation_goal/DonationGoalRepo.java b/bot/main/talium/modules/donation_goal/DonationGoalRepo.java
deleted file mode 100644
index 9ec0adff..00000000
--- a/bot/main/talium/modules/donation_goal/DonationGoalRepo.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package talium.modules.donation_goal;
-
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface DonationGoalRepo extends CrudRepository<DonationGoal, String> {
-
-    DonationGoal findByIdName(String name);
-
-    DonationGoal findByIdNameAndActive(String idName, boolean active);
-
-    List<DonationGoal> findByActive(boolean active);
-}
diff --git a/bot/main/talium/modules/donation_goal/GoalTemplateContext.java b/bot/main/talium/modules/donation_goal/GoalTemplateContext.java
deleted file mode 100644
index ed747edc..00000000
--- a/bot/main/talium/modules/donation_goal/GoalTemplateContext.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package talium.modules.donation_goal;
-
-import talium.system.ASCIIProgressbar;
-import talium.system.stringTemplates.Formatter;
-
-public class GoalTemplateContext {
-    public final String targetAmount;
-    public final String currentAmount;
-    public final String currentPercentDecimals;
-    public final String currentPercentRounded;
-    public final String displayName;
-    public final String progressBar;
-
-    public GoalTemplateContext(DonationGoal goal) {
-        this.targetAmount = Formatter.formatDoubleComma(goal.targetAmount);
-        this.currentAmount = Formatter.formatDoubleComma(goal.amountInGoal);
-        double percent = (goal.amountInGoal / goal.targetAmount) * 100;
-        this.currentPercentDecimals = Formatter.formatDoubleComma(percent);
-        this.currentPercentRounded = Formatter.formatDoubleComma( percent);
-        this.displayName = goal.displayName;
-        this.progressBar = ASCIIProgressbar.bar(goal.amountInGoal, goal.targetAmount, 10, "■", " ", false, false);
-    }
-}
diff --git a/bot/main/talium/modules/donation_goal/MVP_GoalController.java b/bot/main/talium/modules/donation_goal/MVP_GoalController.java
deleted file mode 100644
index f6140e94..00000000
--- a/bot/main/talium/modules/donation_goal/MVP_GoalController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package talium.modules.donation_goal;
-
-import com.google.gson.Gson;
-import org.springframework.beans.factory.annotation.Autowired;
-import talium.system.stringTemplates.Template;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-import talium.system.stringTemplates.TemplateService;
-
-import java.util.Currency;
-import java.util.Optional;
-
-@RestController
-@RequestMapping("/donation_goals")
-public class MVP_GoalController {
-
-    private final DonationGoalRepo donationGoalRepo;
-    private final TemplateService templateService;
-
-    @Autowired
-    public MVP_GoalController(DonationGoalRepo donationGoalRepo, TemplateService templateService) {
-        this.donationGoalRepo = donationGoalRepo;
-        this.templateService = templateService;
-    }
-
-    @GetMapping
-    String donationGoal() {
-        Optional<DonationGoal> goal = DonationGoal.repo.findById("goal");
-        Optional<Template> template = templateService.getTemplateById("alerts.tipeee.donation");
-        if (template.isEmpty() || goal.isEmpty()) {
-            throw new ResponseStatusException(
-                    HttpStatus.NOT_FOUND, "donation goal not found"
-            );
-            //TODO
-        }
-        DonationGoalJson goalJson = new DonationGoalJson(
-                goal.get().displayName,
-                goal.get().targetAmount,
-                goal.get().amountInGoal,
-                template.get().template
-        );
-        Gson gson = new Gson();
-        return gson.toJson(goalJson);
-    }
-
-    @PostMapping
-    void donationGoal(@RequestBody String donationGoal) {
-        Gson gson = new Gson();
-        DonationGoalJson goalJson = gson.fromJson(donationGoal, DonationGoalJson.class);
-        Optional<DonationGoal> goal = DonationGoal.repo.findById("goal");
-        DonationGoal dg;
-        if (goal.isPresent()) {
-            dg = goal.get();
-            dg.targetAmount = goalJson.target();
-            dg.amountInGoal = goalJson.current();
-            dg.displayName = goalJson.name();
-        } else {
-            dg = new DonationGoal(
-                    "goal",
-                    goalJson.name(),
-                    Currency.getInstance("EUR"),
-                    goalJson.target(),
-                    goalJson.current(),
-                    true
-            );
-        }
-        donationGoalRepo.save(dg);
-        templateService.updateTemplateStringById(goalJson.alertText(), "alerts.tipeee.donation");
-    }
-}
diff --git a/bot/main/talium/system/stringTemplates/TemplateDTO.java b/bot/main/talium/system/stringTemplates/TemplateDTO.java
index cf2dc79c..c0e6cf8c 100644
--- a/bot/main/talium/system/stringTemplates/TemplateDTO.java
+++ b/bot/main/talium/system/stringTemplates/TemplateDTO.java
@@ -1,14 +1,6 @@
 package talium.system.stringTemplates;
 
-import org.jetbrains.annotations.NotNull;
-import talium.modules.donation_goal.GoalTemplateContext;
-import talium.system.twitchCommands.controller.TriggerDTO;
-
-import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 

From f5b659f807de77a123dd92d6d316919d30f8d4dd Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 28 Jan 2025 17:35:07 +0100
Subject: [PATCH 03/58] remove years old testing code

---
 .../testModule/Core_FollowHandler.java        | 19 -------------------
 .../testModule/resources/templates/test.html  | 10 ----------
 2 files changed, 29 deletions(-)
 delete mode 100644 bot/main/talium/modules/testModule/Core_FollowHandler.java
 delete mode 100644 bot/main/talium/modules/testModule/resources/templates/test.html

diff --git a/bot/main/talium/modules/testModule/Core_FollowHandler.java b/bot/main/talium/modules/testModule/Core_FollowHandler.java
deleted file mode 100644
index d8721208..00000000
--- a/bot/main/talium/modules/testModule/Core_FollowHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package talium.modules.testModule;
-
-import com.github.twitch4j.chat.events.channel.FollowEvent;
-import com.github.twitch4j.chat.events.channel.SubscriptionEvent;
-import talium.system.eventSystem.Subscriber;
-
-@SuppressWarnings("unused")
-public class Core_FollowHandler {
-
-    @Subscriber
-    public static void handleFollow(FollowEvent followEvent) {
-        System.out.println("Test follow Event");
-    }
-
-    @Subscriber
-    public static void handleSub(SubscriptionEvent subscriptionEvent) {
-        System.out.println("Sub follow Event");
-    }
-}
diff --git a/bot/main/talium/modules/testModule/resources/templates/test.html b/bot/main/talium/modules/testModule/resources/templates/test.html
deleted file mode 100644
index d94da13a..00000000
--- a/bot/main/talium/modules/testModule/resources/templates/test.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Test</title>
-</head>
-<body>
-        Das ist ein geglückter Test
-</body>
-</html>
\ No newline at end of file

From 92988e537bd5c7749846dd64c1fbc370253c7f6d Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 28 Jan 2025 17:47:52 +0100
Subject: [PATCH 04/58] remove Twitch4JHandler, move object translation into
 from method on ChatMessage

---
 .../talium/inputs/Twitch4J/ChatMessage.java   |  79 +++++++++++
 .../talium/inputs/Twitch4J/Twitch4JInput.java |  17 ++-
 .../talium/modules/core/Twitch4JHandler.java  | 134 ------------------
 3 files changed, 95 insertions(+), 135 deletions(-)
 delete mode 100644 bot/main/talium/modules/core/Twitch4JHandler.java

diff --git a/bot/main/talium/inputs/Twitch4J/ChatMessage.java b/bot/main/talium/inputs/Twitch4J/ChatMessage.java
index 7c6ea1a7..96008714 100644
--- a/bot/main/talium/inputs/Twitch4J/ChatMessage.java
+++ b/bot/main/talium/inputs/Twitch4J/ChatMessage.java
@@ -1,8 +1,17 @@
 package talium.inputs.Twitch4J;
 
+import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
+import com.github.twitch4j.common.enums.CommandPermission;
+import com.github.twitch4j.common.events.domain.EventUser;
 import org.jetbrains.annotations.Nullable;
+import talium.system.twitchCommands.cooldown.CooldownService;
 
 import java.time.Instant;
+import java.util.HashSet;
+import java.util.Set;
+
+import static talium.inputs.Twitch4J.TwitchUserPermission.*;
+import static talium.inputs.Twitch4J.TwitchUserPermission.OWNER;
 
 public record ChatMessage(
         String messageId,
@@ -19,4 +28,74 @@ public record ChatMessage(
         String channelID,
         Instant sendAT
 ) {
+
+    public static ChatMessage fromChannelMessageEvent(ChannelMessageEvent event) {
+        //Convert ChatMessage
+        EventUser eUser = event.getUser();
+        TwitchUser user = new TwitchUser(eUser.getId(), eUser.getName(), convertUserPermissions(event.getPermissions()), event.getSubscriberMonths(), event.getSubscriptionTier());
+        String replyToID = null;
+        if (event.getReplyInfo() != null)
+            replyToID = event.getReplyInfo().getMessageId();
+        return new ChatMessage(
+                event.getMessageEvent().getEventId(),
+                CooldownService.computeMessageUserIndex(user),
+                CooldownService.computeMessageGlobalIndex(),
+                event.getMessage(),
+                user,
+                event.isHighlightedMessage(),
+                event.isHighlightedMessage(),
+                event.isDesignatedFirstMessage(),
+                event.isUserIntroduction(),
+                event.getCustomRewardId().orElse(null),
+                replyToID,
+                event.getChannel().getId(),
+                event.getFiredAtInstant()
+        );
+    }
+
+    /**
+     * Converts a set of Twitch4J permission into our equivalent Permissions, and returns the highest one.
+     * @param userPermissions A set of Twitch4J Permissions
+     * @return The highest equivalent ranking permission in our system from the set
+     * @see CommandPermission
+     * @see TwitchUserPermission
+     */
+    private static TwitchUserPermission convertUserPermissions(Set<CommandPermission> userPermissions) {
+        HashSet<TwitchUserPermission> permissions = translatePerms(userPermissions);
+        TwitchUserPermission highest_perm = EVERYONE;
+        for (TwitchUserPermission perm : permissions) {
+            if (perm.ordinal() > highest_perm.ordinal())
+                highest_perm = perm;
+        }
+        return highest_perm;
+    }
+
+    /**
+     * Translate the Permissions of a user from Twit4J's permission System into our.
+     * @param permissions A Set if Twit4J#s permissions
+     * @return A Set of our Permissions
+     * @see CommandPermission
+     */
+    private static HashSet<TwitchUserPermission> translatePerms(Set<CommandPermission> permissions) {
+        HashSet<TwitchUserPermission> newPerm = new HashSet<>();
+        for (CommandPermission cp : permissions) {
+            switch (cp) {
+                case EVERYONE -> newPerm.add(EVERYONE);
+                case SUBSCRIBER -> newPerm.add(SUBSCRIBER);
+                case FOUNDER -> newPerm.add(FOUNDER);
+                case PREDICTIONS_BLUE -> newPerm.add(PREDICTIONS_BLUE);
+                case PREDICTIONS_PINK -> newPerm.add(PREDICTIONS_PINK);
+                case ARTIST -> newPerm.add(ARTIST);
+                case VIP -> newPerm.add(VIP);
+                case MODERATOR -> newPerm.add(MODERATOR);
+                case BROADCASTER -> newPerm.add(BROADCASTER);
+                case OWNER -> newPerm.add(OWNER);
+                //PRIME_TURBO, NO_VIDEO, MOMENTS, NO_AUDIO, TWITCHSTAFF, SUBGIFTER, BITS_CHEERER, PARTNER, FORMER_HYPE_TRAIN_CONDUCTOR, CURRENT_HYPE_TRAIN_CONDUCTOR -> {}
+                default -> {
+                }
+            }
+        }
+        return newPerm;
+    }
+
 }
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 897029bb..eebd9ab4 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -7,12 +7,14 @@
 import com.github.twitch4j.auth.providers.TwitchIdentityProvider;
 import com.github.twitch4j.chat.TwitchChat;
 import com.github.twitch4j.chat.events.TwitchEvent;
+import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.helix.TwitchHelix;
 import org.apache.commons.lang.RandomStringUtils;
 import talium.inputs.shared.oauth.OAuthEndpoint;
 import talium.inputs.shared.oauth.OauthAccount;
 import talium.system.coinsWatchtime.WatchtimeUpdateService;
 import talium.system.eventSystem.EventDispatcher;
+import talium.system.eventSystem.Subscriber;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.Input;
@@ -22,7 +24,9 @@
 import org.springframework.beans.factory.annotation.Value;
 import talium.system.inputSystem.configuration.InputConfiguration;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -203,4 +207,15 @@ private void report(InputStatus health) {
         HealthManager.reportStatus(this, health);
         this.health = health;
     }
-}
+
+
+    private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("DD-HH:mm:ss.SSS");
+
+    @Subscriber
+    public static void converTwitchMessage(ChannelMessageEvent messageEvent) {
+        if (messageEvent.getMessage().toCharArray()[0] == '!') {
+            System.out.println(simpleDateFormat.format(new Date()) + " |CHAT | " + messageEvent.getUser().getName() + ": " + messageEvent.getMessage());
+        }
+        EventDispatcher.dispatch(ChatMessage.fromChannelMessageEvent(messageEvent));
+    }
+}
\ No newline at end of file
diff --git a/bot/main/talium/modules/core/Twitch4JHandler.java b/bot/main/talium/modules/core/Twitch4JHandler.java
deleted file mode 100644
index b1dfa281..00000000
--- a/bot/main/talium/modules/core/Twitch4JHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package talium.modules.core;
-
-import com.github.twitch4j.chat.events.channel.ChannelJoinEvent;
-import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
-import com.github.twitch4j.chat.events.channel.CheerEvent;
-import com.github.twitch4j.chat.events.channel.FollowEvent;
-import com.github.twitch4j.common.enums.CommandPermission;
-import com.github.twitch4j.common.events.domain.EventUser;
-import talium.system.twitchCommands.cooldown.CooldownService;
-import talium.inputs.Twitch4J.ChatMessage;
-import talium.inputs.Twitch4J.TwitchUser;
-import talium.inputs.Twitch4J.TwitchUserPermission;
-import talium.system.eventSystem.EventDispatcher;
-import talium.system.eventSystem.Subscriber;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import static talium.inputs.Twitch4J.TwitchUserPermission.*;
-
-/**
- * Handels all Events from Twitch4J that are needed for the core of the bot to function
- * @see com.github.twitch4j.chat.events.TwitchEvent
- */
-public class Twitch4JHandler {
-    private static final Logger logger = LoggerFactory.getLogger(Twitch4JHandler.class);
-    private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("DD-HH:mm:ss.SSS");
-
-    @Subscriber
-    public static void MessageEvent(ChannelMessageEvent messageEvent) {
-        if (messageEvent.getMessage().toCharArray()[0] == '!')
-            System.out.println(simpleDateFormat.format(new Date()) + " |CHAT | " + messageEvent.getUser().getName() + ": " + messageEvent.getMessage());
-
-        //Convert ChatMessage
-        EventUser eUser = messageEvent.getUser();
-        TwitchUser user = new TwitchUser(eUser.getId(), eUser.getName(), convertUserPermissions(messageEvent.getPermissions()), messageEvent.getSubscriberMonths(), messageEvent.getSubscriptionTier());
-        String replyToID = null;
-        if (messageEvent.getReplyInfo() != null)
-            replyToID = messageEvent.getReplyInfo().getMessageId();
-        ChatMessage message = new ChatMessage(
-                messageEvent.getMessageEvent().getEventId(),
-                CooldownService.computeMessageUserIndex(user),
-                CooldownService.computeMessageGlobalIndex(),
-                messageEvent.getMessage(),
-                user,
-                messageEvent.isHighlightedMessage(),
-                messageEvent.isHighlightedMessage(),
-                messageEvent.isDesignatedFirstMessage(),
-                messageEvent.isUserIntroduction(),
-                messageEvent.getCustomRewardId().orElse(null),
-                replyToID,
-                messageEvent.getChannel().getId(),
-                messageEvent.getFiredAtInstant());
-        EventDispatcher.dispatch(message);
-//        CommandProcessor.processMessage(message);
-    }
-
-
-    //Das sind nur schnelle Beispiele um zu testen, dass es funktioniert
-    @Subscriber
-    @Deprecated(forRemoval = true)
-    public static void CheerEvent(CheerEvent cheerEvent) {
-        //Do Database Stuff
-        EventDispatcher.dispatch(new ChannelMessageEvent(cheerEvent.getChannel(), cheerEvent.getMessageEvent(), cheerEvent.getUser(), "!testCommand"));
-    }
-
-    @Subscriber
-    @Deprecated(forRemoval = true)
-    public static void FollowEvent(FollowEvent followEvent) {
-        System.out.println("Twitch4JHandler.FollowEvent");
-//        InputManager.receiveChatMessage(new ChannelMessageEvent(
-//                followEvent.getChannel(),
-//                null,
-//                followEvent.getUser(),
-//                "!testCommand",
-//                null));
-    }
-
-    @Subscriber
-    @Deprecated(forRemoval = true)
-    public static void ChannelJoinEvent(ChannelJoinEvent channelJoinEvent) {
-        logger.debug("{} joined! ", channelJoinEvent.getUser());
-    }
-
-    /**
-     * Converts a set of Twitch4J permission into our equivalent Permissions, and returns the highest one.
-     * @param userPermissions A set of Twitch4J Permissions
-     * @return The highest equivalent ranking permission in our system from the set
-     * @see CommandPermission
-     * @see TwitchUserPermission
-     */
-    private static TwitchUserPermission convertUserPermissions(Set<CommandPermission> userPermissions) {
-        HashSet<TwitchUserPermission> permissions = translatePerms(userPermissions);
-        TwitchUserPermission highest_perm = EVERYONE;
-        for (TwitchUserPermission perm : permissions) {
-            if (perm.ordinal() > highest_perm.ordinal())
-                highest_perm = perm;
-        }
-        return highest_perm;
-    }
-
-    /**
-     * Translate the Permissions of a user from Twit4J's permission System into our.
-     * @param permissions A Set if Twit4J#s permissions
-     * @return A Set of our Permissions
-     * @see CommandPermission
-     */
-    private static HashSet<TwitchUserPermission> translatePerms(Set<CommandPermission> permissions) {
-        HashSet<TwitchUserPermission> newPerm = new HashSet<>();
-        for (CommandPermission cp : permissions) {
-            switch (cp) {
-                case EVERYONE -> newPerm.add(EVERYONE);
-                case SUBSCRIBER -> newPerm.add(SUBSCRIBER);
-                case FOUNDER -> newPerm.add(FOUNDER);
-                case PREDICTIONS_BLUE -> newPerm.add(PREDICTIONS_BLUE);
-                case PREDICTIONS_PINK -> newPerm.add(PREDICTIONS_PINK);
-                case ARTIST -> newPerm.add(ARTIST);
-                case VIP -> newPerm.add(VIP);
-                case MODERATOR -> newPerm.add(MODERATOR);
-                case BROADCASTER -> newPerm.add(BROADCASTER);
-                case OWNER -> newPerm.add(OWNER);
-                //PRIME_TURBO, NO_VIDEO, MOMENTS, NO_AUDIO, TWITCHSTAFF, SUBGIFTER, BITS_CHEERER, PARTNER, FORMER_HYPE_TRAIN_CONDUCTOR, CURRENT_HYPE_TRAIN_CONDUCTOR -> {}
-                default -> {
-                }
-            }
-        }
-        return newPerm;
-    }
-
-}

From ffe8806979adf4458aea70bfa0b0a6ffa82f4c16 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 28 Jan 2025 18:13:18 +0100
Subject: [PATCH 05/58] makeshift startup script

---
 bot/main/talium/TwitchBot.java                | 32 +++++++++++++++++++
 .../inputs/TipeeeStream/TipeeeInput.java      |  2 +-
 .../system/inputSystem/HealthManager.java     |  4 +++
 .../system/inputSystem/InputManager.java      |  2 +-
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index d2236839..fd669b6c 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -2,7 +2,10 @@
 
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
+import talium.inputs.TipeeeStream.TipeeeInput;
+import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.system.StopWatch;
+import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.InputManager;
 import talium.system.inputSystem.InputStatus;
@@ -11,6 +14,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import talium.system.twitchCommands.triggerEngine.TriggerProvider;
 
 @SpringBootApplication
 @EnableJpaRepositories
@@ -30,6 +34,34 @@ public static void startup() {
         System.out.println("DateFormat: DayNumber-Hour:Minute:Second:Millis");
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
+
+
+        //TWITCH
+        BotInput twitch = new Twitch4JInput();
+        try {
+            twitch.run();
+            //TODO register config stuff
+        } catch (RuntimeException e) {
+            logger.error("Exception starting Input: Twitch because: {}",  e.getMessage());
+            HealthManager.reportStatus(twitch, InputStatus.DEAD);
+        }
+        while (HealthManager.get(twitch).equals(InputStatus.STARTING)) {
+            Thread.onSpinWait();
+        }
+
+        //TIPEEE
+        BotInput tipeee = new TipeeeInput();
+        try {
+            tipeee.run();
+            //TODO register config stuff
+        } catch (RuntimeException e) {
+            logger.error("Exception starting Input: Twitch because: {}",  e.getMessage());
+            HealthManager.reportStatus(tipeee, InputStatus.DEAD);
+        }
+        while (HealthManager.get(tipeee).equals(InputStatus.STARTING)) {
+            Thread.onSpinWait();
+        }
+
         InputManager.startAllInputs();
         HealthManager.subscribeNextChange(_ -> time.close(), InputStatus.HEALTHY);
     }
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index f8af2542..e0d98d0a 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -66,7 +66,7 @@ public void shutdown() {
 
     @Override
     public void run() {
-        if (tipeeeSocketUrl == null || tipeeeSocketUrl.isEmpty() && apiKey == null || apiKey.isEmpty() && channelName == null || channelName.isEmpty()) {
+        if (apiKey == null || apiKey.isEmpty() && channelName == null || channelName.isEmpty()) {
             LOGGER.warn("TipeeeStream Module is disabled");
             report(InputStatus.STOPPED);
             return;
diff --git a/bot/main/talium/system/inputSystem/HealthManager.java b/bot/main/talium/system/inputSystem/HealthManager.java
index cd0b38c8..72c8d0be 100644
--- a/bot/main/talium/system/inputSystem/HealthManager.java
+++ b/bot/main/talium/system/inputSystem/HealthManager.java
@@ -84,4 +84,8 @@ public record StringStatus(String name, InputStatus status) {}
     public static List<StringStatus> allStatuses() {
         return statuses.stream().map(status -> new StringStatus(status.input.threadName(), status.status)).toList();
     }
+
+    public static InputStatus get(BotInput input) {
+        return statuses.stream().filter(s -> s.input.equals(input)).findFirst().get().status;
+    }
 }
diff --git a/bot/main/talium/system/inputSystem/InputManager.java b/bot/main/talium/system/inputSystem/InputManager.java
index 82891900..fd82195c 100644
--- a/bot/main/talium/system/inputSystem/InputManager.java
+++ b/bot/main/talium/system/inputSystem/InputManager.java
@@ -39,7 +39,7 @@ public static void startAllInputs() {
 
     public static void startInput(BotInput input) {
         try {
-            new Thread(input, "LAUNCHER-" + input.threadName()).start();
+//            new Thread(input, "LAUNCHER-" + input.threadName()).start();
             inputs.add(input);
         } catch (RuntimeException e) {
             logger.error("Exception starting Input: {} because: {}", input.getClass().getName(), e.getMessage());

From c741d185534d50c29c8a24cd6cc3f9d29abc5144 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 29 Jan 2025 17:02:17 +0100
Subject: [PATCH 06/58] change command and template registration, add central
 Registrar

---
 bot/main/talium/Registrar.java                | 89 +++++++++++++++++++
 bot/main/talium/TwitchBot.java                | 40 ++++-----
 .../inputs/TipeeeStream/TipeeeInput.java      |  4 +-
 .../talium/inputs/Twitch4J/Twitch4JInput.java |  4 +-
 ...ut.java => WIPWatchtimeCommandServer.java} | 50 +++--------
 .../talium/system/inputSystem/BotInput.java   |  6 +-
 .../system/inputSystem/InputManager.java      | 12 +--
 .../stringTemplates/TemplateService.java      | 10 +--
 .../triggerEngine/TriggerProvider.java        | 26 +++---
 9 files changed, 145 insertions(+), 96 deletions(-)
 create mode 100644 bot/main/talium/Registrar.java
 rename bot/main/talium/system/coinsWatchtime/{CoinsDummyInput.java => WIPWatchtimeCommandServer.java} (67%)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
new file mode 100644
index 00000000..cc24b2df
--- /dev/null
+++ b/bot/main/talium/Registrar.java
@@ -0,0 +1,89 @@
+package talium;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.system.stringTemplates.Template;
+import talium.system.stringTemplates.TemplateService;
+import talium.system.twitchCommands.cooldown.ChatCooldown;
+import talium.system.twitchCommands.cooldown.CooldownType;
+import talium.system.twitchCommands.triggerEngine.RuntimeTrigger;
+import talium.system.twitchCommands.triggerEngine.TriggerCallback;
+import talium.system.twitchCommands.triggerEngine.TriggerEngine;
+import talium.system.twitchCommands.triggerEngine.TriggerProvider;
+
+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 {
+
+    private static final ChatCooldown DEFAULT_COOLDOWN = new ChatCooldown(CooldownType.MESSAGES, 0);
+    static TemplateService templateService;
+
+    @Autowired
+    public Registrar(TemplateService templateService) {
+        Registrar.templateService = templateService;
+    }
+
+    public Registrar() {
+    }
+
+    /// Registers an automatically generated command with a callback
+    public static void registerCallbackCommand(RuntimeTrigger command) {
+        TriggerProvider.addCommandRegistration(command);
+    }
+
+    /// Registers an automatically generated command with a callback
+    public static void registerCallbackCommand(String commandId, String pattern, TriggerCallback callback) {
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
+    }
+
+    /// Registers an automatically generated command with a callback
+    public static void registerCallbackCommand(String commandId, List<String> pattern, TriggerCallback callback) {
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
+    }
+
+
+    /// Registers an automatically generated command without a callback, but with a template
+    public static void registerTextCommand(String commandId, String pattern, String template) {
+        templateService.saveIfAbsent(new Template(commandId, template, null));
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
+    }
+    
+    /// Registers an automatically generated command without a callback, but with a template
+    public static void registerTextCommand(String commandId, List<String> pattern, String template) {
+        templateService.saveIfAbsent(new Template(commandId, template, null));
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
+    }
+
+    /// Registers an automatically generated command without a callback, but with a template
+    public static void registerTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template) {
+        templateService.saveIfAbsent(new Template(commandId, template, null));
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
+    }
+
+    /// Registers an automatically generated command without a callback, but with a template
+    public static void registerTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template, String messageColor) {
+        templateService.saveIfAbsent(new Template(commandId, template, messageColor));
+        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, 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));
+    }
+}
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index fd669b6c..5c179793 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -5,6 +5,7 @@
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.system.StopWatch;
+import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.InputManager;
@@ -35,32 +36,14 @@ public static void startup() {
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
 
+        startInput(new Twitch4JInput(), "Twitch");
+        startInput(new TipeeeInput(), "Tipeee");
 
-        //TWITCH
-        BotInput twitch = new Twitch4JInput();
-        try {
-            twitch.run();
-            //TODO register config stuff
-        } catch (RuntimeException e) {
-            logger.error("Exception starting Input: Twitch because: {}",  e.getMessage());
-            HealthManager.reportStatus(twitch, InputStatus.DEAD);
-        }
-        while (HealthManager.get(twitch).equals(InputStatus.STARTING)) {
-            Thread.onSpinWait();
-        }
+        // This section is used to pass the execution/control to different parts of the bot to do some initialisation
+        WIPWatchtimeCommandServer.init();
 
-        //TIPEEE
-        BotInput tipeee = new TipeeeInput();
-        try {
-            tipeee.run();
-            //TODO register config stuff
-        } catch (RuntimeException e) {
-            logger.error("Exception starting Input: Twitch because: {}",  e.getMessage());
-            HealthManager.reportStatus(tipeee, InputStatus.DEAD);
-        }
-        while (HealthManager.get(tipeee).equals(InputStatus.STARTING)) {
-            Thread.onSpinWait();
-        }
+        TriggerProvider.rebuildTriggerCache();
+        //TODO remove all templates that were once registered automatically, but are no longer
 
         InputManager.startAllInputs();
         HealthManager.subscribeNextChange(_ -> time.close(), InputStatus.HEALTHY);
@@ -85,4 +68,13 @@ public static void shutdown() {
             e.printStackTrace();
         }
     }
+
+    private static void startInput(BotInput input, String name) {
+        try {
+            input.run();
+        } catch (RuntimeException e) {
+            logger.error("Exception starting Input: {} because: {}",  name, e.getMessage());
+            HealthManager.reportStatus(input, InputStatus.DEAD);
+        }
+    }
 }
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index e0d98d0a..a4f2b321 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -146,9 +146,7 @@ public InputStatus getHealth() {
     }
 
     @Override
-    public InputConfiguration getConfiguration() {
-        return null;
-    }
+    public void runRegistration() {}
 
     @Override
     public String threadName() {
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index eebd9ab4..6e419e28 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -154,9 +154,7 @@ public void shutdown() {
     }
 
     @Override
-    public InputConfiguration getConfiguration() {
-        return null;
-    }
+    public void runRegistration() {}
 
     @Override
     public String threadName() {
diff --git a/bot/main/talium/system/coinsWatchtime/CoinsDummyInput.java b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
similarity index 67%
rename from bot/main/talium/system/coinsWatchtime/CoinsDummyInput.java
rename to bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
index a1622bf8..fd494442 100644
--- a/bot/main/talium/system/coinsWatchtime/CoinsDummyInput.java
+++ b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -1,62 +1,36 @@
 package talium.system.coinsWatchtime;
 
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import talium.Registrar;
 import talium.inputs.Twitch4J.ChatMessage;
 import talium.inputs.Twitch4J.TwitchApi;
 import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.Chatter;
 import talium.system.coinsWatchtime.chatter.ChatterService;
-import talium.system.inputSystem.BotInput;
-import talium.system.inputSystem.Input;
-import talium.system.inputSystem.InputStatus;
-import talium.system.inputSystem.configuration.InputConfiguration;
 
 import java.util.HashMap;
 
 /**
- * Does nothing, only temporarily exists to add watchtime and coins commands
+ * Serves all commands related to watchtime and coins
  */
-@Input
-public class CoinsDummyInput implements BotInput {
-    private static final Logger logger = LoggerFactory.getLogger(CoinsDummyInput.class);
+@Component
+public class WIPWatchtimeCommandServer {
+    private static final Logger logger = LoggerFactory.getLogger(WIPWatchtimeCommandServer.class);
     private static ChatterService chatterService;
 
     @Autowired
     public void setChatterService(ChatterService chatterService) {
-        CoinsDummyInput.chatterService = chatterService;
+        WIPWatchtimeCommandServer.chatterService = chatterService;
     }
 
-    @Override
-    public void run() {
-        //noop
-    }
-
-    @Override
-    public void shutdown() {
-        //noop
-    }
-
-    @Override
-    public InputStatus getHealth() {
-        return InputStatus.HEALTHY;
-    }
-
-    @Override
-    public String threadName() {
-        return "CoinsDummyInput";
-    }
-
-    @Override
-    public @Nullable InputConfiguration getConfiguration() {
-        return new InputConfiguration.Builder()
-                .addCallbackCommand("watchtime.getwatchtime", "!watchtime", CoinsDummyInput::triggerGetWatchtime)
-                .addCallbackCommand("watchtime.getCoins", "!coins", CoinsDummyInput::triggerGetCoins)
-                .addTemplate("coins.coins", "${wt.username} has ${wt.coins} Coins!")
-                .addTemplate("coins.watchtime", "${wt.username} has ${wt.daysRounded2} Days of watchtime!")
-                .build();
+    public static void init() {
+        Registrar.registerCallbackCommand("watchtime.getwatchtime", "!watchtime", WIPWatchtimeCommandServer::triggerGetWatchtime);
+        Registrar.registerCallbackCommand("watchtime.getCoins", "!coins", WIPWatchtimeCommandServer::triggerGetCoins);
+        Registrar.registerTemplate("coins.coins", "${wt.username} has ${wt.coins} Coins!");
+        Registrar.registerTemplate("coins.watchtime", "${wt.username} has ${wt.daysRounded2} Days of watchtime!");
     }
 
     static class WatchtimeContext {
diff --git a/bot/main/talium/system/inputSystem/BotInput.java b/bot/main/talium/system/inputSystem/BotInput.java
index 7fce4375..c9d7ff2d 100644
--- a/bot/main/talium/system/inputSystem/BotInput.java
+++ b/bot/main/talium/system/inputSystem/BotInput.java
@@ -1,8 +1,5 @@
 package talium.system.inputSystem;
 
-import jakarta.annotation.Nullable;
-import talium.system.inputSystem.configuration.InputConfiguration;
-
 public interface BotInput extends Runnable {
     @Override
     void run();
@@ -11,8 +8,7 @@ public interface BotInput extends Runnable {
 
     InputStatus getHealth();
 
-    @Nullable
-    InputConfiguration getConfiguration();
+    void runRegistration();
 
     String threadName();
 
diff --git a/bot/main/talium/system/inputSystem/InputManager.java b/bot/main/talium/system/inputSystem/InputManager.java
index fd82195c..8bac0c6c 100644
--- a/bot/main/talium/system/inputSystem/InputManager.java
+++ b/bot/main/talium/system/inputSystem/InputManager.java
@@ -46,12 +46,12 @@ public static void startInput(BotInput input) {
             HealthManager.reportStatus(input, InputStatus.DEAD);
         }
         try {
-            var conf = input.getConfiguration();
-            if (conf == null) {
-                return;
-            }
-            TriggerProvider.addCommandsFromCodeConfig(conf.commands());
-            templateService.saveIfAbsent(conf.templates());
+//            var conf = input.runRegistration();
+//            if (conf == null) {
+//                return;
+//            }
+//            TriggerProvider.addCommandsFromCodeConfig(conf.commands());
+//            templateService.saveIfAbsent(conf.templates());
         } catch (RuntimeException e) {
             logger.error("Exception while setting Input Configuration: {} because: {}", input.getClass().getName(), e.getMessage());
             HealthManager.reportStatus(input, InputStatus.INJURED);
diff --git a/bot/main/talium/system/stringTemplates/TemplateService.java b/bot/main/talium/system/stringTemplates/TemplateService.java
index b5d51dbf..786b8e8d 100644
--- a/bot/main/talium/system/stringTemplates/TemplateService.java
+++ b/bot/main/talium/system/stringTemplates/TemplateService.java
@@ -60,12 +60,10 @@ public void save(Template template) {
         repo.save(template);
     }
 
-    public void saveIfAbsent(List<Template> templates) {
-        for (Template template : templates) {
-            if (repo.existsById(template.id)) {
-                return;
-            }
-            save(template);
+    public void saveIfAbsent(Template template) {
+        if (repo.existsById(template.id)) {
+            return;
         }
+        save(template);
     }
 }
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
index ec362e9e..de889fd9 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
@@ -131,17 +131,21 @@ public static RuntimeTrigger transformTrigger(TriggerEntity trigger, TriggerCall
      */
     public static void addCommandsFromCodeConfig(List<RuntimeTrigger> commands) {
         for (RuntimeTrigger command : commands) {
-            codeTriggerMap.put(command.id(), command);
-            if (triggerService.existsById(command.id())) {
-                continue;
-            }
-            var patterns = command.patterns().stream().map(pattern -> new MessagePattern(pattern.pattern(), true, false, true)).toList();
-            TriggerEntity entity = new TriggerEntity(command.id(), "", patterns, command.permission(), command.userCooldown(), command.globalCooldown(), true, null);
-            try {
-                triggerService.save(entity);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            addCommandRegistration(command);
+        }
+    }
+
+    public static void addCommandRegistration(RuntimeTrigger command) {
+        codeTriggerMap.put(command.id(), command);
+        if (triggerService.existsById(command.id())) {
+            return;
+        }
+        var patterns = command.patterns().stream().map(pattern -> new MessagePattern(pattern.pattern(), true, false, true)).toList();
+        TriggerEntity entity = new TriggerEntity(command.id(), "", patterns, command.permission(), command.userCooldown(), command.globalCooldown(), true, null);
+        try {
+            triggerService.save(entity);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

From 9a8cc97e7281543cfb5ba847c4804b01e418c52d Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 29 Jan 2025 17:15:36 +0100
Subject: [PATCH 07/58] move WatchtimeUpdateService initialization

---
 bot/main/talium/TwitchBot.java                               | 2 ++
 .../talium/system/coinsWatchtime/WatchtimeUpdateService.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 5c179793..16717819 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -6,6 +6,7 @@
 import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.system.StopWatch;
 import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
+import talium.system.coinsWatchtime.WatchtimeUpdateService;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.InputManager;
@@ -40,6 +41,7 @@ public static void startup() {
         startInput(new TipeeeInput(), "Tipeee");
 
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
+        WatchtimeUpdateService.init();
         WIPWatchtimeCommandServer.init();
 
         TriggerProvider.rebuildTriggerCache();
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
index 051194e2..d86edce4 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
+++ b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
@@ -40,6 +40,11 @@ public void setChatterService(ChatterService chatterService) {
         CHATTER_UPDATE_SERVICE.scheduleAtFixedRate(WatchtimeUpdateService::update, 1, POLLING_INTERVAL_SECONDS, TimeUnit.SECONDS);
     }
 
+    public static void init() {
+        //noop to load class
+        //initialization is done via static initialization because we don't need anything from the outside environment, and then we can assume that they are always there
+    }
+
     private static List<String> getUserList() {
         return TwitchApi.getUserList().stream().map(Chatter::getUserId).toList();
     }

From 62e3d034b2a9e24899d4413dece60bbd741df029 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 29 Jan 2025 18:19:09 +0100
Subject: [PATCH 08/58] remove registration from botinput, add ui
 customizations for health reporter, make HealthManager work for things other
 than Inputs

---
 bot/main/talium/Registrar.java                | 11 ++++
 bot/main/talium/TwitchBot.java                | 49 ++++++++-------
 .../inputs/TipeeeStream/TipeeeInput.java      | 34 +++-------
 .../talium/inputs/Twitch4J/Twitch4JInput.java | 42 +++----------
 bot/main/talium/system/StopWatch.java         |  2 +-
 .../talium/system/inputSystem/BotInput.java   |  7 ---
 .../system/inputSystem/HealthManager.java     | 63 +++++++++++++------
 .../system/inputSystem/InputManager.java      | 10 +--
 .../triggerEngine/TriggerProvider.java        | 11 +---
 bot/resources/logback.xml                     |  4 +-
 10 files changed, 111 insertions(+), 122 deletions(-)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index cc24b2df..14077509 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -3,6 +3,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.system.inputSystem.HealthManager;
 import talium.system.stringTemplates.Template;
 import talium.system.stringTemplates.TemplateService;
 import talium.system.twitchCommands.cooldown.ChatCooldown;
@@ -30,6 +31,16 @@ public Registrar(TemplateService templateService) {
     public Registrar() {
     }
 
+    /// 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.getSimpleName(), title, description);
+    }
+
     /// Registers an automatically generated command with a callback
     public static void registerCallbackCommand(RuntimeTrigger command) {
         TriggerProvider.addCommandRegistration(command);
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 16717819..17182821 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -29,6 +29,9 @@ public static void main(String[] args) {
         startup();
     }
 
+    private static BotInput twitch;
+    private static BotInput tipeee;
+
     public static void startup() {
         StopWatch time = new StopWatch(StopWatch.TYPE.STARTUP);
         SpringApplication.run(TwitchBot.class);
@@ -37,9 +40,10 @@ public static void startup() {
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
 
-        startInput(new Twitch4JInput(), "Twitch");
-        startInput(new TipeeeInput(), "Tipeee");
+        twitch = startInput(new Twitch4JInput());
+        tipeee = startInput(new TipeeeInput());
 
+        logger.info("Inputs started, initializing other system components...");
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
         WatchtimeUpdateService.init();
         WIPWatchtimeCommandServer.init();
@@ -47,36 +51,37 @@ public static void startup() {
         TriggerProvider.rebuildTriggerCache();
         //TODO remove all templates that were once registered automatically, but are no longer
 
-        InputManager.startAllInputs();
-        HealthManager.subscribeNextChange(_ -> time.close(), InputStatus.HEALTHY);
+        time.close();
     }
 
     @PreDestroy
     @PreRemove
     public static void shutdown() {
-        try {
-            StopWatch time = new StopWatch(StopWatch.TYPE.SHUTDOWN);
-            requestedShutdown = true;
-            InputManager.stopAllInputs();
-            //Because we stop all inputs in separate Threads,
-            //(so that one broken shutdown does not stop the other once from shutting down)
-            //we need to wait here until all Inputs are shut down, because otherwise it will
-            //clean up all the Spring Objects, who may be needed in a shutdown routine
-            while (InputManager.finishedShutdown()) {
-                Thread.onSpinWait();
-            }
-            time.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        StopWatch time = new StopWatch(StopWatch.TYPE.SHUTDOWN);
+        requestedShutdown = true;
+        stopInput(twitch);
+        stopInput(tipeee);
+        time.close();
     }
 
-    private static void startInput(BotInput input, String name) {
+    private static BotInput startInput(BotInput input) {
         try {
             input.run();
         } catch (RuntimeException e) {
-            logger.error("Exception starting Input: {} because: {}",  name, e.getMessage());
-            HealthManager.reportStatus(input, InputStatus.DEAD);
+            logger.error("Exception starting Input: {} because: {}", input.getClass().getSimpleName(), e.getMessage());
+            HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
+        }
+        return input;
+    }
+
+    private static void stopInput(BotInput input) {
+        if (input != null) {
+            try {
+                input.shutdown();
+            } catch (Exception e) {
+                logger.error("Exception stopping Input: {} because: {}", input.getClass().getSimpleName(), e.getMessage());
+                HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
+            }
         }
     }
 }
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index a4f2b321..8f70c8a7 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -4,6 +4,7 @@
 import io.socket.client.Socket;
 import io.socket.engineio.client.EngineIOException;
 import org.apache.commons.lang.StringUtils;
+import talium.Registrar;
 import talium.TwitchBot;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
@@ -14,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import talium.system.inputSystem.configuration.InputConfiguration;
 
 import java.io.IOException;
 import java.net.URI;
@@ -52,7 +52,6 @@ public void setChannelName(String channelName) {
     private static String channelName;
 
     private Socket socket;
-    private InputStatus health;
     private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
 
     @Override
@@ -61,17 +60,19 @@ public void shutdown() {
             socket.close();
         }
         LOGGER.info("Shut down Tipeee input");
-        report(InputStatus.STOPPED);
+        HealthManager.reportStatus(TipeeeInput.class, InputStatus.STOPPED);
     }
 
     @Override
     public void run() {
+        Registrar.registerHealthDescription(TipeeeInput.class, "TipeeeStreamInput", "");
+
         if (apiKey == null || apiKey.isEmpty() && channelName == null || channelName.isEmpty()) {
             LOGGER.warn("TipeeeStream Module is disabled");
-            report(InputStatus.STOPPED);
+            HealthManager.reportStatus(TipeeeInput.class, InputStatus.STOPPED);
             return;
         }
-        report(InputStatus.STARTING);
+        HealthManager.reportStatus(TipeeeInput.class, InputStatus.STARTING);
         LOGGER.info("Stating TipeeeInput for Channel {}", channelName);
         if (tipeeeSocketUrl == null || tipeeeSocketUrl.isEmpty()) {
             LOGGER.info("Getting current Tipeee Socket.io url...");
@@ -83,7 +84,7 @@ public void run() {
             socketUrl = new URI(tipeeeSocketUrl + apiKey);
         } catch (URISyntaxException e) {
             LOGGER.error("tipeeeSocketUrl is not a valid url", e);
-            report(InputStatus.DEAD);
+            HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
             throw new RuntimeException(e);
         }
 
@@ -92,7 +93,7 @@ public void run() {
 
 
         socket.on(Socket.EVENT_CONNECT_ERROR, objects -> {
-            report(InputStatus.DEAD);
+            HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
             if (objects.length == 1 && objects[0] instanceof EngineIOException && ((EngineIOException) objects[0]).getCause() instanceof IOException io) {
                 if (io.getMessage().equals("403")) {
                     LOGGER.error("TipeeeStream Authentication failed, likely because the Apikey is invalid");
@@ -109,7 +110,7 @@ public void run() {
 
         socket.on(Socket.EVENT_CONNECT, _ -> {
             socket.emit("join-room", STR."{ room: '\{apiKey}', username: '\{channelName}'}");
-            report(InputStatus.HEALTHY);
+            HealthManager.reportStatus(TipeeeInput.class, InputStatus.HEALTHY);
         });
 
         socket.on("new-event", data -> TipeeeEventHandler.handleDonationEvent(Arrays.toString(data)));
@@ -140,21 +141,4 @@ private String getSocketUrlFromUrl() {
         }
     }
 
-    @Override
-    public InputStatus getHealth() {
-        return health;
-    }
-
-    @Override
-    public void runRegistration() {}
-
-    @Override
-    public String threadName() {
-        return "TipeeeWebsocket";
-    }
-
-    private void report(InputStatus health) {
-        HealthManager.reportStatus(this, health);
-        this.health = health;
-    }
 }
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 6e419e28..e43122a8 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -10,9 +10,10 @@
 import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.helix.TwitchHelix;
 import org.apache.commons.lang.RandomStringUtils;
+import org.springframework.stereotype.Component;
+import talium.Registrar;
 import talium.inputs.shared.oauth.OAuthEndpoint;
 import talium.inputs.shared.oauth.OauthAccount;
-import talium.system.coinsWatchtime.WatchtimeUpdateService;
 import talium.system.eventSystem.EventDispatcher;
 import talium.system.eventSystem.Subscriber;
 import talium.system.inputSystem.BotInput;
@@ -22,7 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import talium.system.inputSystem.configuration.InputConfiguration;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Optional;
 
-@Input
+@Component
 public class Twitch4JInput implements BotInput {
     protected static String channelName;
     protected static String chatAccountName;
@@ -70,14 +70,14 @@ public void setApp_clientSecret(String app_clientSecret) {
     protected static OAuth2Credential oAuth2Credential;
     private TwitchIdentityProvider iProvider;
     private TwitchClient twitchClient;
-    private InputStatus health;
 
     protected static String broadCasterChannelId;
 
     @Override
     public void run() {
         logger.debug("Starting... ");
-        report(InputStatus.STARTING);
+        Registrar.registerHealthDescription(Twitch4JInput.class, "Twitch4JInput", "");
+        HealthManager.reportStatus(Twitch4JInput.class, InputStatus.STARTING);
         if (chatAccountName == null || chatAccountName.isEmpty()) {
             logger.warn("Using twitchChannelName as botAccountName: {}", channelName);
             logger.warn("Consider setting the botAccountName explicitly to avoid accidental misconfiguration.");
@@ -95,17 +95,17 @@ public void run() {
         if (creds.isEmpty()) {
             logger.warn("Twitch credentials could not be found or refreshed, waiting for new Oauth Token to be created!");
             logger.warn(STR."Head to \{OAuthEndpoint.getOauthSetupUrl()} to Setup a new Oauth connection");
-            report(InputStatus.INJURED);
+            HealthManager.reportStatus(Twitch4JInput.class, InputStatus.INJURED);
             creds = createNewOauth();
         }
         //check if still empty after oauth
         if (creds.isEmpty()) {
             logger.error("Could neither load old credentials, nor create new once, aborting input startup!");
-            report(InputStatus.DEAD);
+            HealthManager.reportStatus(Twitch4JInput.class, InputStatus.DEAD);
             return;
         } else {
             logger.warn("Created new Oauth. Warning resolved!");
-            report(InputStatus.STARTING);
+            HealthManager.reportStatus(Twitch4JInput.class, InputStatus.STARTING);
         }
         oAuth2Credential = creds.get();
 
@@ -130,15 +130,7 @@ public void run() {
                 .getFirst()
                 .getId();
         logger.debug("Start successful!");
-        report(InputStatus.HEALTHY);
-
-        // trigger Init of watchtime Service
-        new WatchtimeUpdateService();
-    }
-
-    @Override
-    public InputStatus getHealth() {
-        return health;
+        HealthManager.reportStatus(Twitch4JInput.class, InputStatus.HEALTHY);
     }
 
     @Override
@@ -153,14 +145,6 @@ public void shutdown() {
         logger.debug("Shutdown successful!");
     }
 
-    @Override
-    public void runRegistration() {}
-
-    @Override
-    public String threadName() {
-        return "TwitchReading";
-    }
-
     private Optional<OAuth2Credential> getRefreshedOauthFromDB(TwitchIdentityProvider iProvider) {
         Optional<OauthAccount> dbCreds = OauthAccount.repo.getByAccNameAndService(chatAccountName, "twitch");
         if (dbCreds.isEmpty()) {
@@ -201,16 +185,10 @@ private Optional<OAuth2Credential> createNewOauth() {
         return code.map(s -> iProvider.getCredentialByCode(s));
     }
 
-    private void report(InputStatus health) {
-        HealthManager.reportStatus(this, health);
-        this.health = health;
-    }
-
-
     private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("DD-HH:mm:ss.SSS");
 
     @Subscriber
-    public static void converTwitchMessage(ChannelMessageEvent messageEvent) {
+    public static void convertTwitchMessage(ChannelMessageEvent messageEvent) {
         if (messageEvent.getMessage().toCharArray()[0] == '!') {
             System.out.println(simpleDateFormat.format(new Date()) + " |CHAT | " + messageEvent.getUser().getName() + ": " + messageEvent.getMessage());
         }
diff --git a/bot/main/talium/system/StopWatch.java b/bot/main/talium/system/StopWatch.java
index de6d5d1b..86c266da 100644
--- a/bot/main/talium/system/StopWatch.java
+++ b/bot/main/talium/system/StopWatch.java
@@ -35,7 +35,7 @@ public StopWatch(TYPE type) {
                 endMessage = "Finished Bot shutdown";
             }
         }
-        if (startMessage.length() > 0)
+        if (!startMessage.isEmpty())
             logger.info("{}...", startMessage.trim());
     }
 
diff --git a/bot/main/talium/system/inputSystem/BotInput.java b/bot/main/talium/system/inputSystem/BotInput.java
index c9d7ff2d..0c12314d 100644
--- a/bot/main/talium/system/inputSystem/BotInput.java
+++ b/bot/main/talium/system/inputSystem/BotInput.java
@@ -5,11 +5,4 @@ public interface BotInput extends Runnable {
     void run();
 
     void shutdown();
-
-    InputStatus getHealth();
-
-    void runRegistration();
-
-    String threadName();
-
 }
diff --git a/bot/main/talium/system/inputSystem/HealthManager.java b/bot/main/talium/system/inputSystem/HealthManager.java
index 72c8d0be..5ee9b5ad 100644
--- a/bot/main/talium/system/inputSystem/HealthManager.java
+++ b/bot/main/talium/system/inputSystem/HealthManager.java
@@ -4,23 +4,35 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Consumer;
 
 public class HealthManager {
 
-    public static class Status {
+    public static class StatusDescription {
         InputStatus status;
-        BotInput input;
+        String identifier;
+        String title;
+        String description;
 
-        public Status(InputStatus status, BotInput input) {
+        public StatusDescription(InputStatus status, String identifier, String title, String description) {
             this.status = status;
-            this.input = input;
+            this.identifier = identifier;
+            this.title = title;
+            this.description = description;
         }
     }
 
+    public record Customization(
+            String title,
+            String description
+    ) {}
+
     private static final Logger logger = LoggerFactory.getLogger(HealthManager.class);
-    private static final ArrayList<Status> statuses = new ArrayList<>();
+    private static final ArrayList<StatusDescription> STATUS_DESCRIPTIONS = new ArrayList<>();
+    private static final HashMap<String, Customization> reporterCustomisation = new HashMap<>();
     private static volatile InputStatus inputStatus = InputStatus.STOPPED;
     private static volatile Consumer<InputStatus> callback;
     private static volatile InputStatus filter;
@@ -40,11 +52,17 @@ private static void checkCallback() {
         callback = null;
     }
 
-    public static void reportStatus(BotInput input, InputStatus status) {
-        var statusOptional = statuses.stream().filter(s -> s.input == input).findFirst();
+    public static void reportStatus(Class self, InputStatus status) {
+        reportStatus(self.getSimpleName(), status);
+    }
+
+    public static void reportStatus(String self, InputStatus status) {
+        var statusOptional = STATUS_DESCRIPTIONS.stream().filter(s -> s.identifier.equals(self)).findFirst();
         if (statusOptional.isEmpty()) {
-            synchronized (statuses) {
-                statuses.add(new Status(status, input));
+            var customization = reporterCustomisation.getOrDefault(self, new Customization(self, ""));
+            StatusDescription e = new StatusDescription(status, self, customization.title, customization.description);
+            synchronized (STATUS_DESCRIPTIONS) {
+                STATUS_DESCRIPTIONS.add(e);
             }
         } else {
             statusOptional.get().status = status;
@@ -53,6 +71,10 @@ public static void reportStatus(BotInput input, InputStatus status) {
         checkCallback();
     }
 
+    public static void addCustomization(String self, String title, String description) {
+        reporterCustomisation.put(self, new Customization(title, description));
+    }
+
     private static void checkOverallStatusChange() {
         var worstFound = calcOverallStatus();
         if (inputStatus != worstFound) {
@@ -63,11 +85,11 @@ private static void checkOverallStatusChange() {
 
     private static InputStatus calcOverallStatus() {
         InputStatus worstYet = InputStatus.STOPPED;
-        ArrayList<Status> copyied;
-        synchronized (statuses) {
-            copyied = (ArrayList<Status>) statuses.clone();
+        ArrayList<StatusDescription> copyied;
+        synchronized (STATUS_DESCRIPTIONS) {
+            copyied = (ArrayList<StatusDescription>) STATUS_DESCRIPTIONS.clone();
         }
-        for (Status status : copyied) {
+        for (StatusDescription status : copyied) {
             if (status.status.compareTo(worstYet) > 0) {
                 worstYet = status.status;
             }
@@ -75,17 +97,18 @@ private static InputStatus calcOverallStatus() {
         return worstYet;
     }
 
-    public static InputStatus inputStatus() {
-        return inputStatus;
+    public record StringStatus(String name, InputStatus status) {
     }
 
-    public record StringStatus(String name, InputStatus status) {}
-
     public static List<StringStatus> allStatuses() {
-        return statuses.stream().map(status -> new StringStatus(status.input.threadName(), status.status)).toList();
+        return STATUS_DESCRIPTIONS.stream().map(status -> new StringStatus(status.title, status.status)).toList();
+    }
+
+    public static InputStatus get(Class identifier) {
+        return get(identifier.getSimpleName());
     }
 
-    public static InputStatus get(BotInput input) {
-        return statuses.stream().filter(s -> s.input.equals(input)).findFirst().get().status;
+    public static InputStatus get(String identifier) {
+        return STATUS_DESCRIPTIONS.stream().filter(s -> s.identifier.equals(identifier)).findFirst().get().status;
     }
 }
diff --git a/bot/main/talium/system/inputSystem/InputManager.java b/bot/main/talium/system/inputSystem/InputManager.java
index 8bac0c6c..b374c0da 100644
--- a/bot/main/talium/system/inputSystem/InputManager.java
+++ b/bot/main/talium/system/inputSystem/InputManager.java
@@ -43,7 +43,7 @@ public static void startInput(BotInput input) {
             inputs.add(input);
         } catch (RuntimeException e) {
             logger.error("Exception starting Input: {} because: {}", input.getClass().getName(), e.getMessage());
-            HealthManager.reportStatus(input, InputStatus.DEAD);
+//            HealthManager.reportStatus(input, InputStatus.DEAD);
         }
         try {
 //            var conf = input.runRegistration();
@@ -54,7 +54,7 @@ public static void startInput(BotInput input) {
 //            templateService.saveIfAbsent(conf.templates());
         } catch (RuntimeException e) {
             logger.error("Exception while setting Input Configuration: {} because: {}", input.getClass().getName(), e.getMessage());
-            HealthManager.reportStatus(input, InputStatus.INJURED);
+//            HealthManager.reportStatus(input, InputStatus.INJURED);
         }
     }
 
@@ -69,13 +69,13 @@ public static void stopInput(BotInput input) {
         new Thread(() -> {
             try {
                 input.shutdown();
-                HealthManager.reportStatus(input, InputStatus.STOPPED);
+//                HealthManager.reportStatus(input, InputStatus.STOPPED);
             } catch (Exception e) {
                 logger.error("Exception stopping Input: {} because: {}", input.getClass().getName(), e.getMessage());
-                HealthManager.reportStatus(input, InputStatus.DEAD);
+//                HealthManager.reportStatus(input, InputStatus.DEAD);
             }
             inputs.remove(input);
-        }, "CLOSER-" + input.threadName()).start();
+        }, "CLOSER-").start();
     }
 
     public static boolean finishedShutdown() {
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
index de889fd9..f354a7cb 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
@@ -125,16 +125,9 @@ public static RuntimeTrigger transformTrigger(TriggerEntity trigger, TriggerCall
     }
 
     /**
-     * Add the commands are specified in the InputConfiguration to an internal list to use while building the final cache of commands.
-     * @param commands list of commands to add
-     * @implNote Only to be used by the InputManager
+     * Add the command to an internal list to use while building the final cache of commands.
+     * @param command command
      */
-    public static void addCommandsFromCodeConfig(List<RuntimeTrigger> commands) {
-        for (RuntimeTrigger command : commands) {
-            addCommandRegistration(command);
-        }
-    }
-
     public static void addCommandRegistration(RuntimeTrigger command) {
         codeTriggerMap.put(command.id(), command);
         if (triggerService.existsById(command.id())) {
diff --git a/bot/resources/logback.xml b/bot/resources/logback.xml
index df6af213..955cefac 100644
--- a/bot/resources/logback.xml
+++ b/bot/resources/logback.xml
@@ -14,8 +14,10 @@
     </appender>
 
     <logger name="talium.inputs" level="WARN"/>
-    <logger name="talium.modules" level="INFO"/>
     <logger name="talium.system" level="INFO"/>
+    <logger name="talium.TwitchBot" level="INFO" additivity="false">
+        <appender-ref ref="SYSTEM"/>
+    </logger>
     <logger name="talium.system.inputSystem.HealthManager" level="INFO" additivity="false">
         <appender-ref ref="SYSTEM"/>
     </logger>

From 172052a8372fe15cc27cb3417fadb59670372810 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 29 Jan 2025 18:24:17 +0100
Subject: [PATCH 09/58] remove InputManager, remove @Input

---
 bot/main/talium/TwitchBot.java                |   1 -
 .../inputs/TipeeeStream/TipeeeInput.java      |   4 +-
 .../talium/inputs/Twitch4J/Twitch4JInput.java |   1 -
 bot/main/talium/system/inputSystem/Input.java |  12 --
 .../system/inputSystem/InputManager.java      | 106 ------------------
 .../system/inputSystem/InputStatus.java       |  10 +-
 .../configuration/InputConfiguration.java     |  81 -------------
 7 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 bot/main/talium/system/inputSystem/Input.java
 delete mode 100644 bot/main/talium/system/inputSystem/InputManager.java
 delete mode 100644 bot/main/talium/system/inputSystem/configuration/InputConfiguration.java

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 17182821..49f1a664 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -9,7 +9,6 @@
 import talium.system.coinsWatchtime.WatchtimeUpdateService;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.InputManager;
 import talium.system.inputSystem.InputStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index 8f70c8a7..0f36d341 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -4,11 +4,11 @@
 import io.socket.client.Socket;
 import io.socket.engineio.client.EngineIOException;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Component;
 import talium.Registrar;
 import talium.TwitchBot;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.Input;
 import talium.system.inputSystem.InputStatus;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -25,7 +25,7 @@
 import java.time.Instant;
 import java.util.Arrays;
 
-@Input
+@Component
 public class TipeeeInput implements BotInput {
     private static final String tipeeeSocketInfoUrl = "https://api.tipeeestream.com/v2.0/site/socket";
 
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index e43122a8..55099513 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -18,7 +18,6 @@
 import talium.system.eventSystem.Subscriber;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.Input;
 import talium.system.inputSystem.InputStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bot/main/talium/system/inputSystem/Input.java b/bot/main/talium/system/inputSystem/Input.java
deleted file mode 100644
index 5289e323..00000000
--- a/bot/main/talium/system/inputSystem/Input.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package talium.system.inputSystem;
-
-import org.springframework.stereotype.Component;
-
-import java.lang.annotation.*;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Component
-public @interface Input {
-}
diff --git a/bot/main/talium/system/inputSystem/InputManager.java b/bot/main/talium/system/inputSystem/InputManager.java
deleted file mode 100644
index b374c0da..00000000
--- a/bot/main/talium/system/inputSystem/InputManager.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package talium.system.inputSystem;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import talium.system.ASCIIProgressbar;
-import org.reflections.Reflections;
-import org.reflections.scanners.Scanners;
-import org.reflections.util.ConfigurationBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import talium.system.stringTemplates.TemplateService;
-import talium.system.twitchCommands.triggerEngine.TriggerProvider;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
-@Component
-public class InputManager {
-
-    private static final Logger logger = LoggerFactory.getLogger(InputManager.class);
-    private static final List<BotInput> inputs = new ArrayList<>();
-    private static boolean startupFinished = false;
-    private static TemplateService templateService;
-
-    @Autowired
-    public InputManager(TemplateService templateService) {
-        InputManager.templateService = templateService;
-    }
-
-    public static void startAllInputs() {
-        var scannedInputs = scanForInputs().stream().toList();
-        logger.info("Starting Inputs...");
-        for (BotInput input : scannedInputs) {
-            startInput(input);
-        }
-        TriggerProvider.rebuildTriggerCache();
-        startupFinished = true;
-    }
-
-    public static void startInput(BotInput input) {
-        try {
-//            new Thread(input, "LAUNCHER-" + input.threadName()).start();
-            inputs.add(input);
-        } catch (RuntimeException e) {
-            logger.error("Exception starting Input: {} because: {}", input.getClass().getName(), e.getMessage());
-//            HealthManager.reportStatus(input, InputStatus.DEAD);
-        }
-        try {
-//            var conf = input.runRegistration();
-//            if (conf == null) {
-//                return;
-//            }
-//            TriggerProvider.addCommandsFromCodeConfig(conf.commands());
-//            templateService.saveIfAbsent(conf.templates());
-        } catch (RuntimeException e) {
-            logger.error("Exception while setting Input Configuration: {} because: {}", input.getClass().getName(), e.getMessage());
-//            HealthManager.reportStatus(input, InputStatus.INJURED);
-        }
-    }
-
-    public static void stopAllInputs() {
-        logger.info("Stopping Inputs...");
-        for (BotInput input : inputs) {
-            stopInput(input);
-        }
-    }
-
-    public static void stopInput(BotInput input) {
-        new Thread(() -> {
-            try {
-                input.shutdown();
-//                HealthManager.reportStatus(input, InputStatus.STOPPED);
-            } catch (Exception e) {
-                logger.error("Exception stopping Input: {} because: {}", input.getClass().getName(), e.getMessage());
-//                HealthManager.reportStatus(input, InputStatus.DEAD);
-            }
-            inputs.remove(input);
-        }, "CLOSER-").start();
-    }
-
-    public static boolean finishedShutdown() {
-        return !inputs.isEmpty();
-    }
-
-    private static HashSet<BotInput> scanForInputs() {
-        Reflections reflections = new Reflections(new ConfigurationBuilder().forPackages("talium.inputs").addScanners(Scanners.TypesAnnotated));
-        Set<Class<?>> typesAnnotatedWith = reflections.getTypesAnnotatedWith(Input.class);
-        HashSet<BotInput> inputSet = new HashSet<>();
-
-        //get all Classes Annotated with Input.class, and if they implement the TwitchBotInput interface,
-        //then a new instance will be created, and get added to the Set of Inputs
-        for (Class<?> aClass : typesAnnotatedWith) {
-            if (Arrays.stream(aClass.getInterfaces()).toList().contains(BotInput.class)) {
-                //Try to create a new instance of that class
-                try {
-                    inputSet.add((BotInput) (aClass.getConstructor().newInstance()));
-                } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
-                         NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-        logger.info("Scanned for Inputs, found: {}, configured correctly: {}", typesAnnotatedWith.size(), ASCIIProgressbar.consoleBar(inputSet.size(), typesAnnotatedWith.size()));
-        return inputSet;
-    }
-}
diff --git a/bot/main/talium/system/inputSystem/InputStatus.java b/bot/main/talium/system/inputSystem/InputStatus.java
index 7230ce4f..4f1c3661 100644
--- a/bot/main/talium/system/inputSystem/InputStatus.java
+++ b/bot/main/talium/system/inputSystem/InputStatus.java
@@ -11,13 +11,5 @@ public enum InputStatus {
     HEALTHY,
     STARTING,
     INJURED,
-    DEAD;
-
-    public boolean isWorseThan(InputStatus status) {
-        return (this.compareTo(status) < 0);
-    }
-
-    public boolean isBetterThan(InputStatus status) {
-        return (this.compareTo(status) > 0);
-    }
+    DEAD
 }
diff --git a/bot/main/talium/system/inputSystem/configuration/InputConfiguration.java b/bot/main/talium/system/inputSystem/configuration/InputConfiguration.java
deleted file mode 100644
index 036aa9db..00000000
--- a/bot/main/talium/system/inputSystem/configuration/InputConfiguration.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package talium.system.inputSystem.configuration;
-
-import talium.inputs.Twitch4J.TwitchUserPermission;
-import talium.system.stringTemplates.Template;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
-import talium.system.twitchCommands.cooldown.CooldownType;
-import talium.system.twitchCommands.triggerEngine.RuntimeTrigger;
-import talium.system.twitchCommands.triggerEngine.TriggerCallback;
-import talium.system.twitchCommands.triggerEngine.TriggerEngine;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-public record InputConfiguration(List<RuntimeTrigger> commands, List<Template> templates) {
-
-    public static class Builder {
-        private static final ChatCooldown DEFAULT_COOLDOWN = new ChatCooldown(CooldownType.MESSAGES, 0);
-        List<RuntimeTrigger> commands = new ArrayList<>();
-        List<Template> templates = new ArrayList<>();
-
-        public Builder addCallbackCommand(RuntimeTrigger command) {
-            commands.add(command);
-            return this;
-        }
-
-        public Builder addCallbackCommand(String commandId, String pattern, TriggerCallback callback) {
-            commands.add(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
-            return this;
-        }
-
-        public Builder addCallbackCommand(String commandId, List<String> pattern, TriggerCallback callback) {
-            commands.add(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
-            return this;
-        }
-
-        public Builder addTextCommand(String commandId, String pattern, String template) {
-            templates.add(new Template(commandId, template, null));
-            commands.add(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-            return this;
-        }
-
-        public Builder addTextCommand(String commandId, List<String> pattern, String template) {
-            templates.add(new Template(commandId, template, null));
-            commands.add(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-            return this;
-        }
-
-        public Builder addTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template) {
-            templates.add(new Template(commandId, template, null));
-            commands.add(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-            return this;
-        }
-
-        public Builder addTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template, String messageColor) {
-            templates.add(new Template(commandId, template, messageColor));
-            commands.add(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-            return this;
-        }
-
-
-        public Builder addTemplate(Template template) {
-            templates.add(template);
-            return this;
-        }
-
-        public Builder addTemplate(String templateId, String template, String messageColor) {
-            templates.add(new Template(templateId, template, messageColor));
-            return this;
-        }
-
-        public Builder addTemplate(String templateId, String template) {
-            templates.add(new Template(templateId, template, null));
-            return this;
-        }
-
-        public InputConfiguration build() {
-            return new InputConfiguration(commands, templates);
-        }
-    }
-}

From 344d742b14142c781e9a39928a900f8a42f77739 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 29 Jan 2025 18:32:24 +0100
Subject: [PATCH 10/58] add stub for resetableCaches in Registrar

---
 bot/main/talium/Registrar.java                         |  9 +++++++++
 .../talium/system/resetableCache/ResetableCache.java   | 10 ----------
 2 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 bot/main/talium/system/resetableCache/ResetableCache.java

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 14077509..772ceaf3 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -41,6 +41,15 @@ public static void registerHealthDescription(Class self, String title, String de
         HealthManager.addCustomization(self.getSimpleName(), 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
+    }
+
     /// Registers an automatically generated command with a callback
     public static void registerCallbackCommand(RuntimeTrigger command) {
         TriggerProvider.addCommandRegistration(command);
diff --git a/bot/main/talium/system/resetableCache/ResetableCache.java b/bot/main/talium/system/resetableCache/ResetableCache.java
deleted file mode 100644
index 0a456d96..00000000
--- a/bot/main/talium/system/resetableCache/ResetableCache.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package main.system.resetableCache;
-
-public interface ResetableCache {
-
-    public String cacheName();
-
-    public String cacheDescription();
-
-    public void rebuildCache();
-}

From 262bbae91a86b65d40336f6701cef6a60745fea8 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 30 Jan 2025 16:57:34 +0100
Subject: [PATCH 11/58] add Command builder Pattern in the Registrar

---
 bot/main/talium/Registrar.java                | 122 ++++++++++++------
 .../WIPWatchtimeCommandServer.java            |   4 +-
 2 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 772ceaf3..fbc96046 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -13,6 +13,7 @@
 import talium.system.twitchCommands.triggerEngine.TriggerEngine;
 import talium.system.twitchCommands.triggerEngine.TriggerProvider;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -20,7 +21,6 @@
 @Component
 public class Registrar {
 
-    private static final ChatCooldown DEFAULT_COOLDOWN = new ChatCooldown(CooldownType.MESSAGES, 0);
     static TemplateService templateService;
 
     @Autowired
@@ -34,8 +34,8 @@ public Registrar() {
     /// 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.getSimpleName(), title, description);
@@ -50,58 +50,94 @@ public static void registerResetableChache(String name, String description, Rese
         //TODO register cache, show in ui, act on reset HTTP post
     }
 
-    /// Registers an automatically generated command with a callback
-    public static void registerCallbackCommand(RuntimeTrigger command) {
-        TriggerProvider.addCommandRegistration(command);
-    }
-
-    /// Registers an automatically generated command with a callback
-    public static void registerCallbackCommand(String commandId, String pattern, TriggerCallback callback) {
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
-    }
-
-    /// Registers an automatically generated command with a callback
-    public static void registerCallbackCommand(String commandId, List<String> pattern, TriggerCallback callback) {
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, callback));
-    }
-
-
-    /// Registers an automatically generated command without a callback, but with a template
-    public static void registerTextCommand(String commandId, String pattern, String template) {
-        templateService.saveIfAbsent(new Template(commandId, template, null));
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, List.of(Pattern.compile(pattern)), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-    }
-    
-    /// Registers an automatically generated command without a callback, but with a template
-    public static void registerTextCommand(String commandId, List<String> pattern, String template) {
-        templateService.saveIfAbsent(new Template(commandId, template, null));
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), TwitchUserPermission.EVERYONE, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
-    }
-
-    /// Registers an automatically generated command without a callback, but with a template
-    public static void registerTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template) {
-        templateService.saveIfAbsent(new Template(commandId, template, null));
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, TriggerEngine.TEXT_COMMAND_CALLBACK));
+    /// 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 an automatically generated command without a callback, but with a template
-    public static void registerTextCommand(String commandId, List<String> pattern, TwitchUserPermission permission, String template, String messageColor) {
-        templateService.saveIfAbsent(new Template(commandId, template, messageColor));
-        TriggerProvider.addCommandRegistration(new RuntimeTrigger(commandId, pattern.stream().map(Pattern::compile).toList(), permission, DEFAULT_COOLDOWN, DEFAULT_COOLDOWN, 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));
diff --git a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
index fd494442..04447a8a 100644
--- a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -27,8 +27,8 @@ public void setChatterService(ChatterService chatterService) {
     }
 
     public static void init() {
-        Registrar.registerCallbackCommand("watchtime.getwatchtime", "!watchtime", WIPWatchtimeCommandServer::triggerGetWatchtime);
-        Registrar.registerCallbackCommand("watchtime.getCoins", "!coins", WIPWatchtimeCommandServer::triggerGetCoins);
+        new Registrar.Command("watchtime.getwatchtime", "!watchtime").registerActionCommand(WIPWatchtimeCommandServer::triggerGetWatchtime);
+        new Registrar.Command("watchtime.getCoins", "!coins").registerActionCommand(WIPWatchtimeCommandServer::triggerGetCoins);
         Registrar.registerTemplate("coins.coins", "${wt.username} has ${wt.coins} Coins!");
         Registrar.registerTemplate("coins.watchtime", "${wt.username} has ${wt.daysRounded2} Days of watchtime!");
     }

From c167b80f172cf9a912b164635582644c00de2517 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 12:04:36 +0100
Subject: [PATCH 12/58] add ascii fuzzing test, rename
 ArgumentValueNullException

---
 bot/main/talium/system/Out.java               |  5 +--
 .../templateParser/TemplateInterpreter.java   | 18 ++++++--
 .../system/templateParser/TemplateLexer.java  |  7 +--
 .../exeptions/ArgumentValueNullException.java |  7 ---
 .../exeptions/UnsupportedDirective.java       |  7 +++
 .../exeptions/VariableValueNullException.java |  8 ++++
 .../TemplateInterpreterTest.java              | 30 ++++++-------
 .../templateParser/TemplateParserTest.java    | 45 +++++++++++++++++++
 8 files changed, 95 insertions(+), 32 deletions(-)
 delete mode 100644 bot/main/talium/system/templateParser/exeptions/ArgumentValueNullException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java

diff --git a/bot/main/talium/system/Out.java b/bot/main/talium/system/Out.java
index 318f46bb..84548000 100644
--- a/bot/main/talium/system/Out.java
+++ b/bot/main/talium/system/Out.java
@@ -2,11 +2,10 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 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.VariableValueNullException;
 import talium.system.templateParser.exeptions.UnIterableArgumentException;
 import talium.system.templateParser.exeptions.UnsupportedComparandType;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
@@ -50,7 +49,7 @@ public static String sendRawTemplate(String template, HashMap<String, Object> va
             try {
                 var parsed = new TemplateParser(template).parse();
                 message = populate(parsed, values);
-            } catch (UnsupportedComparisonOperator | NoSuchFieldException | ArgumentValueNullException |
+            } catch (UnsupportedComparisonOperator | NoSuchFieldException | VariableValueNullException |
                      IllegalAccessException | UnIterableArgumentException | UnsupportedComparandType e) {
                 //TODO handle exceptions
                 // the exceptions should be displayed in the console and in the webconsole with a fairly high priority
diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index 1a29b70b..daa9c553 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser;
 
-import talium.system.templateParser.exeptions.ArgumentValueNullException;
+import talium.system.templateParser.exeptions.VariableValueNullException;
 import talium.system.templateParser.exeptions.UnIterableArgumentException;
 import talium.system.templateParser.exeptions.UnsupportedComparandType;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
@@ -24,7 +24,10 @@ public class TemplateInterpreter {
      * @param values a map with all top level variables and their names
      * @return the resulting string
      */
-    public static String populate(List<Statement> template, HashMap<String, Object> values) throws NoSuchFieldException, ArgumentValueNullException, IllegalAccessException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+    public static String populate(List<Statement> template, HashMap<String, Object> values) throws NoSuchFieldException, VariableValueNullException, IllegalAccessException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        if (values == null) {
+            values = new HashMap<>();
+        }
         String out = "";
         for (Statement statement : template) {
             if (statement instanceof TextStatement textStatement) {
@@ -98,17 +101,24 @@ public static Object castToValidInput(Object input) {
      * @return value of the variable
      * @apiNote Does not support getters or any functions
      */
-    public static Object getNestedReplacement(String varName, HashMap<String, Object> values) throws ArgumentValueNullException, NoSuchFieldException, IllegalAccessException {
+    public static Object getNestedReplacement(String varName, HashMap<String, Object> values) throws VariableValueNullException, NoSuchFieldException, IllegalAccessException {
         String[] variableNames = varName.split("\\.");
+        //TODO make explicit check if key exists, and throw specific error if it doesn't exist
+        if (!values.containsKey(variableNames[0])) {
+            throw new NoSuchFieldException("No key with name " + variableNames[0] + " in variable map");
+        }
         Object variable = values.get(variableNames[0]);
         for (int i = 1; i < variableNames.length; i++) {
             if (variable == null) {
-                throw new ArgumentValueNullException(variableNames[i - 1]);
+                throw new VariableValueNullException(variableNames[i - 1]);
             }
             Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
             declaredField.setAccessible(true);
             variable = declaredField.get(variable);
         }
+        if (variable == null) {
+            //TODO
+        }
         return variable;
     }
 }
diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index 8520a1eb..b1c80652 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -3,6 +3,7 @@
 
 import talium.system.templateParser.exeptions.TemplateSyntaxException;
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.system.templateParser.exeptions.UnsupportedDirective;
 import talium.system.templateParser.tokens.TemplateTokenKind;
 import talium.system.templateParser.tokens.TemplateToken;
 
@@ -87,14 +88,14 @@ private TemplateToken parseToken() throws UnexpectedEndOfInputException {
         if (src.isEOF()) {
             return null;
         }
-        if (src.peek() == '$' && src.future() == '{') {
+        if (src.peek() == '$') {
             src.consume('$');
             src.consume('{');
             String varName = src.readUntil('}');
             src.consume('}');
             return new TemplateToken(TemplateTokenKind.VAR, varName);
 
-        } else if (src.peek() == '%' && src.future() == '{') {
+        } else if (src.peek() == '%') {
             // Get type of directive if or for
             src.consume('%');
             src.consume('{');
@@ -124,7 +125,7 @@ private TemplateToken parseToken() throws UnexpectedEndOfInputException {
                 src.consume('}');
                 return new TemplateToken(TemplateTokenKind.FOR_END, "");
             } else {
-                throw new RuntimeException(STR."Directive not supported: \{directive}");
+                throw new UnsupportedDirective(STR."Directive not supported: \{directive}");
             }
         } else {
             String buffer = "";
diff --git a/bot/main/talium/system/templateParser/exeptions/ArgumentValueNullException.java b/bot/main/talium/system/templateParser/exeptions/ArgumentValueNullException.java
deleted file mode 100644
index b641ca79..00000000
--- a/bot/main/talium/system/templateParser/exeptions/ArgumentValueNullException.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package talium.system.templateParser.exeptions;
-
-public class ArgumentValueNullException extends Exception {
-    public ArgumentValueNullException(String argName) {
-        super(STR."\{argName == null ? "Argument" : argName} must not be null.");
-    }
-}
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java b/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
new file mode 100644
index 00000000..6320b0fb
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
@@ -0,0 +1,7 @@
+package talium.system.templateParser.exeptions;
+
+public class UnsupportedDirective extends RuntimeException {
+    public UnsupportedDirective(String message) {
+        super(message);
+    }
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java b/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
new file mode 100644
index 00000000..cc6feba4
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
@@ -0,0 +1,8 @@
+package talium.system.templateParser.exeptions;
+
+/// Is thrown when a variable in a variable reference is null, but is not the final reference (field on this object are supposed to be 'opened')
+public class VariableValueNullException extends Exception {
+    public VariableValueNullException(String argName) {
+        super(STR."\{argName == null ? "Argument" : STR."\"\{argName}\""} must not be null.");
+    }
+}
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index a232a229..a93d2b33 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser;
 
-import talium.system.templateParser.exeptions.ArgumentValueNullException;
+import talium.system.templateParser.exeptions.VariableValueNullException;
 import talium.system.templateParser.exeptions.UnIterableArgumentException;
 import talium.system.templateParser.exeptions.UnsupportedComparandType;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
@@ -52,7 +52,7 @@ public class TemplateInterpreterTest {
     @Nested
     class Populate {
         @Test
-        void iterate_non_iterable() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void iterate_non_iterable() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnsupportedComparandType, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             map.put("loopVar", "this_is_not_a_list");
             try {
@@ -63,21 +63,21 @@ void iterate_non_iterable() throws NoSuchFieldException, IllegalAccessException,
         }
 
         @Test
-        void var() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void var() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             map.put("name", "dummy name");
             assert populate(TEMPLATE_VAR, map).equals("Hello, dummy name!");
         }
 
         @Test
-        void iterate_empty_list() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void iterate_empty_list() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             map.put("loopVar", new ArrayList<>());
             assert populate(TEMPLATE_LOOP, map).equals("Hello,!");
         }
 
         @Test
-        void nestedLoop() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void nestedLoop() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             ArrayList<List<String>> list = new ArrayList<>();
             list.add(List.of("t-1.1", "t-1.2"));
@@ -87,14 +87,14 @@ void nestedLoop() throws NoSuchFieldException, IllegalAccessException, ArgumentV
         }
 
         @Test
-        void if_() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void if_() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             map.put("compLeft", "testString");
             assert populate(TEMPLATE_IF, map).equals("Hello, testString!");
         }
 
         @Test
-        void wrong_condition_type() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException, UnIterableArgumentException, UnsupportedComparisonOperator {
+        void wrong_condition_type() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparisonOperator {
             HashMap<String, Object> map = new HashMap<>();
             map.put("compLeft", false);
             try {
@@ -111,7 +111,7 @@ private record TestClass(String testString, int testInteger) {
         }
 
         @Test
-        void string() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void string() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("test", "testing String");
             map.put("dummyVar", 23899);
@@ -119,7 +119,7 @@ void string() throws NoSuchFieldException, IllegalAccessException, ArgumentValue
         }
 
         @Test
-        void integer() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void integer() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("integerValue", 23899);
             map.put("dummyVar", "testing String");
@@ -127,7 +127,7 @@ void integer() throws NoSuchFieldException, IllegalAccessException, ArgumentValu
         }
 
         @Test
-        void object_path() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void object_path() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             TestClass testClass = new TestClass("testString", 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
@@ -136,7 +136,7 @@ void object_path() throws NoSuchFieldException, IllegalAccessException, Argument
         }
 
         @Test
-        void list() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void list() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             HashMap<String, Object> map = new HashMap<>();
             ArrayList<String> list = new ArrayList<>();
             list.add("dummyValue");
@@ -154,12 +154,12 @@ void toplevel_null() throws NoSuchFieldException, IllegalAccessException {
             try {
                 getNestedReplacement("testObject.testInteger", map);
                 fail("Should have thrown NullArgumentException");
-            } catch (ArgumentValueNullException _) {
+            } catch (VariableValueNullException _) {
             }
         }
 
         @Test
-        void end_value_null() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void end_value_null() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             TestClass testClass = new TestClass(null, 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
@@ -168,7 +168,7 @@ void end_value_null() throws NoSuchFieldException, IllegalAccessException, Argum
         }
 
         @Test
-        void private_var() throws NoSuchFieldException, IllegalAccessException, ArgumentValueNullException {
+        void private_var() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
             class PrivateClass {
                 private final String testString;
                 final int testInteger;
@@ -186,7 +186,7 @@ public PrivateClass(String testString, int testInteger) {
         }
 
         @Test
-        void missing_field() throws IllegalAccessException, ArgumentValueNullException {
+        void missing_field() throws IllegalAccessException, VariableValueNullException {
             TestClass testClass = new TestClass("testString", 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index f6bc3edb..28418557 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -1,5 +1,50 @@
 package talium.system.templateParser;
 
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.math.RandomUtils;
+import org.junit.jupiter.api.Test;
+import talium.system.templateParser.exeptions.TemplateSyntaxException;
+import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.UnsupportedDirective;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class TemplateParserTest {
 
+    @Test
+    public void fuzzing1M() {
+        randomFuzzing(1000000, 200);
+    }
+
+    @Test
+    public void fuzzing10K() {
+        randomFuzzing(10000, 200);
+    }
+
+    @Test
+    public void fuzzing10KLong() {
+        randomFuzzing(10000, 2000);
+    }
+
+    private void test(String src, int iteration) {
+        try {
+            var statements = new TemplateParser(src).parse();
+            TemplateInterpreter.populate(statements, null);
+            if (src.contains("$") || src.contains("%")) {
+                System.out.println("i: " + iteration + " -> Statement Stream:");
+                System.out.println(statements);
+                fail("Should  likely have thrown for " + src);
+            }
+        } catch (TemplateSyntaxException | UnexpectedEndOfInputException | UnsupportedComparisonOperator |
+                 UnsupportedDirective | NoSuchFieldException _) {
+        } catch (Exception e) {
+            System.out.println("i: " + iteration + " -> Source Input: " + src);
+            fail("Unexpected Exception thrown: " + e.getMessage(), e);
+        }
+    }
 }
\ No newline at end of file

From f02c26d078be05124c59e7030a46c0e739bbd438 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 12:16:27 +0100
Subject: [PATCH 13/58] impl tests in TemplateLexerTest, add token string
 fuzzing

---
 .../templateParser/CharakterStream.java       | 13 ----
 .../system/templateParser/TemplateParser.java |  3 +
 .../templateParser/TemplateLexerTest.java     | 51 +++++++++++--
 .../templateParser/TemplateParserTest.java    | 75 +++++++++++++++++++
 4 files changed, 122 insertions(+), 20 deletions(-)

diff --git a/bot/main/talium/system/templateParser/CharakterStream.java b/bot/main/talium/system/templateParser/CharakterStream.java
index 132d5c5b..aecfd024 100644
--- a/bot/main/talium/system/templateParser/CharakterStream.java
+++ b/bot/main/talium/system/templateParser/CharakterStream.java
@@ -45,19 +45,6 @@ public void consume(Character c) {
         }
     }
 
-
-    /**
-     * peeks the character after the next one
-     *
-     * @return the character after the next one
-     */
-    public Character future() throws UnexpectedEndOfInputException {
-        if (pos + 1 >= src.length()) {
-            return ' ';
-        }
-        return src.charAt(pos + 1);
-    }
-
     @Override
     public boolean isEOF() {
         return pos == src.length();
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index ea67ccef..7d2afbca 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -50,6 +50,9 @@ public Statement parseToken() throws UnsupportedComparisonOperator {
             return new TextStatement(current.value());
         }
         if (current.kind() == TemplateTokenKind.VAR) {
+            //TODO check for valid java object references
+            // make illegal:
+            // VarStatement[name=;kO'!1NQD;Mdejc/QF>hs=43LCl@!3yB4+*|I%YGH&Z]
             return new VarStatement(current.value());
         }
         if (current.kind() == TemplateTokenKind.IF_HEAD) {
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index d3546e0f..32746627 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -1,29 +1,39 @@
 package talium.system.templateParser;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import talium.system.templateParser.exeptions.TemplateSyntaxException;
+import talium.system.templateParser.tokens.TemplateTokenKind;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 // the correct behaviour is not entirely specified, thats why this test is disabled by default.
 // more or less: if a token is started it has to be finished, otherwise it is a syntax error
 // completion of a statement is not yet checked at this stage, so a missing else directive is not an error at this stage
-@Disabled
 public class TemplateLexerTest {
     @Test
     void missing_closing_bracket() {
         TemplateLexer lex = new TemplateLexer("Hello, ${var.name!");
-        System.out.println(lex.parse());
+        try {
+            lex.parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
     }
 
     @Test
     void missing_dollar() {
-        TemplateLexer lex = new TemplateLexer("Hello, {var.name}!");
-        System.out.println(lex.parse());
+        var tokens = new TemplateLexer("Hello, {var.name}!").parse();
+        assert tokens.size() == 1;
+        assert tokens.getFirst().kind() == TemplateTokenKind.TEXT;
+        assert tokens.getFirst().value().equals("Hello, {var.name}!");
     }
 
     @Test
     void missing_closing_bracket_directive() {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed%{ endif ");
-        System.out.println(lex.parse());
+        try {
+            lex.parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
     }
 
     @Test
@@ -35,6 +45,33 @@ void missing_percent() {
     @Test
     void malformed_endIf() {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed%{ endif dadasdadad }");
-        System.out.println(lex.parse());
+        try {
+            lex.parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
+    }
+
+    @Test
+    void directive_start_in_text() {
+        try {
+            new TemplateLexer("template text % mehr text").parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
+        try {
+            new TemplateLexer("template text %c mehr text").parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
+    }
+
+    @Test
+    void variable_start_in_text() {
+        try {
+            new TemplateLexer("template text $ mehr text").parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
+        try {
+            new TemplateLexer("template text $c mehr text").parse();
+            fail("Should have thrown an TemplateSyntaxException");
+        } catch (TemplateSyntaxException _) {}
     }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 28418557..719a3975 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -15,6 +15,50 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class TemplateParserTest {
+    private static final List<String> tokensStrings = new ArrayList<>();
+
+    static {
+        tokensStrings.add(" ");
+        tokensStrings.add(" ");
+        tokensStrings.add(" ");
+        tokensStrings.add(" ");
+        tokensStrings.add(" ");
+        tokensStrings.add(" ");
+        tokensStrings.add("text");
+        tokensStrings.add("string");
+        tokensStrings.add("something else");
+        tokensStrings.add("SPECIAL TEXT");
+        tokensStrings.add("121");
+        tokensStrings.add("1");
+        tokensStrings.add("0");
+        tokensStrings.add("894903890238948389");
+        tokensStrings.add("829.1");
+        tokensStrings.add("2838.19489494");
+        tokensStrings.add("333.33333");
+        tokensStrings.add("true");
+        tokensStrings.add("false");
+        tokensStrings.add("$");
+        tokensStrings.add("${");
+        tokensStrings.add("}");
+        tokensStrings.add("%");
+        tokensStrings.add("%{");
+        tokensStrings.add("}");
+        tokensStrings.add("}");
+        tokensStrings.add("if");
+        tokensStrings.add("else");
+        tokensStrings.add("endif");
+        tokensStrings.add("=");
+        tokensStrings.add("==");
+        tokensStrings.add("!=");
+        tokensStrings.add("<");
+        tokensStrings.add("<=");
+        tokensStrings.add(">");
+        tokensStrings.add(">=");
+        tokensStrings.add("for");
+        tokensStrings.add("endfor");
+        tokensStrings.add(".");
+        tokensStrings.add("\"");
+    }
 
     @Test
     public void fuzzing1M() {
@@ -31,6 +75,37 @@ public void fuzzing10KLong() {
         randomFuzzing(10000, 2000);
     }
 
+    @Test
+    public void tokenFuzzing1M() {
+        tokenFuzzing(1000000, 20);
+    }
+
+    @Test
+    public void tokenFuzzing10K() {
+        tokenFuzzing(10000, 20);
+    }
+
+    @Test
+    public void tokenFuzzing10KLong() {
+        tokenFuzzing(10000, 200);
+    }
+
+    private void randomFuzzing(int n, int length) {
+        for (int i = 0; i < n; i++) {
+            test(RandomStringUtils.randomAscii(length), i);
+        }
+    }
+
+    private void tokenFuzzing(int n, int length) {
+        for (int i = 0; i < n; i++) {
+            StringBuilder builder = new StringBuilder();
+            for (int j = 0; j < length; j++) {
+                builder.append(tokensStrings.get(RandomUtils.nextInt(tokensStrings.size())));
+            }
+            test(builder.toString(), i);
+        }
+    }
+
     private void test(String src, int iteration) {
         try {
             var statements = new TemplateParser(src).parse();

From 44cd541d1bac86f7c2d05d741738dc7691fd636a Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 12:16:50 +0100
Subject: [PATCH 14/58] remove dead code

---
 bot/main/talium/Registrar.java                |  1 -
 .../system/stringTemplates/TemplateID.java    | 35 -------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 bot/main/talium/system/stringTemplates/TemplateID.java

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index fbc96046..1a998439 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -135,7 +135,6 @@ public static void registerTemplate(Template 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)
diff --git a/bot/main/talium/system/stringTemplates/TemplateID.java b/bot/main/talium/system/stringTemplates/TemplateID.java
deleted file mode 100644
index c8bad00a..00000000
--- a/bot/main/talium/system/stringTemplates/TemplateID.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package talium.system.stringTemplates;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class TemplateID implements Serializable {
-    private String module;
-    private String type;
-    private String object;
-
-    public TemplateID() {
-    }
-
-    public TemplateID(String module, String type, String object) {
-        this.module = module;
-        this.type = type;
-        this.object = object;
-    }
-
-    @Override
-    public final boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof TemplateID that)) return false;
-
-        return Objects.equals(module, that.module) && Objects.equals(type, that.type) && Objects.equals(object, that.object);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = Objects.hashCode(module);
-        result = 31 * result + Objects.hashCode(type);
-        result = 31 * result + Objects.hashCode(object);
-        return Objects.hashCode(result);
-    }
-}

From 8f8b10a9ab00635fff07b15f7d1c5c0089cbd338 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 12:45:50 +0100
Subject: [PATCH 15/58] adds error for malformed for loop head,

---
 .../system/templateParser/TemplateInterpreter.java   | 12 +++++-------
 .../talium/system/templateParser/TemplateParser.java |  6 +++++-
 .../system/templateParser/TemplateParserTest.java    |  8 +++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index daa9c553..90998aef 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -1,9 +1,6 @@
 package talium.system.templateParser;
 
-import talium.system.templateParser.exeptions.VariableValueNullException;
-import talium.system.templateParser.exeptions.UnIterableArgumentException;
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.ifParser.IfInterpreter;
 import talium.system.templateParser.statements.*;
 import talium.system.templateParser.tokens.Comparison;
@@ -103,16 +100,17 @@ public static Object castToValidInput(Object input) {
      */
     public static Object getNestedReplacement(String varName, HashMap<String, Object> values) throws VariableValueNullException, NoSuchFieldException, IllegalAccessException {
         String[] variableNames = varName.split("\\.");
-        //TODO make explicit check if key exists, and throw specific error if it doesn't exist
-        if (!values.containsKey(variableNames[0])) {
-            throw new NoSuchFieldException("No key with name " + variableNames[0] + " in variable map");
+        if (variableNames.length == 0) {
+            throw new TemplateSyntaxException("\""+varName+"\" is not a valid field access expression");
         }
         Object variable = values.get(variableNames[0]);
         for (int i = 1; i < variableNames.length; i++) {
             if (variable == null) {
                 throw new VariableValueNullException(variableNames[i - 1]);
             }
+            //TODO wrap getDeclaredField errors
             Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
+            //TODO wrap setAccessible errors
             declaredField.setAccessible(true);
             variable = declaredField.get(variable);
         }
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index 7d2afbca..d2adb5cd 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -1,5 +1,6 @@
 package talium.system.templateParser;
 
+import talium.system.templateParser.exeptions.TemplateSyntaxException;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
 import talium.system.templateParser.ifParser.IfParser;
 import talium.system.templateParser.statements.*;
@@ -81,8 +82,11 @@ public Statement parseToken() throws UnsupportedComparisonOperator {
         }
         if (current.kind() == TemplateTokenKind.FOR_HEAD) {
             String[] head = current.value().split(" in ");
+            if (head.length < 2) {
+                throw new TemplateSyntaxException("Missing \"in\" in for definition!");
+            }
             if (StringUtils.countMatches(head[1], "[*]") > 1) {
-                throw new RuntimeException("Only one wildcard allowed in a for statement");
+                throw new TemplateSyntaxException("Only one wildcard allowed in a for statement");
             }
             List<Statement> body = new ArrayList<>();
             while (!src.isEOF()) { // mostly equivalent to while(true), but with a overrun check
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 719a3975..563ff694 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -113,7 +113,7 @@ private void test(String src, int iteration) {
             if (src.contains("$") || src.contains("%")) {
                 System.out.println("i: " + iteration + " -> Statement Stream:");
                 System.out.println(statements);
-                fail("Should  likely have thrown for " + src);
+                fail("Should likely have thrown for: " + src);
             }
         } catch (TemplateSyntaxException | UnexpectedEndOfInputException | UnsupportedComparisonOperator |
                  UnsupportedDirective | NoSuchFieldException _) {
@@ -122,4 +122,10 @@ private void test(String src, int iteration) {
             fail("Unexpected Exception thrown: " + e.getMessage(), e);
         }
     }
+
+    @Test
+    void testWeirdFor() {
+        //TODO this procudes a weird null in the statement list
+        test("for\"!=   1}for%{   endif }==<  ", 1);
+    }
 }
\ No newline at end of file

From 519c0c620896766720f79e3ed73a8d81de7a6bd4 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 12:47:16 +0100
Subject: [PATCH 16/58] wip higher-order-function to improve TwitchApi
 connector

---
 .../talium/inputs/Twitch4J/TwitchApi.java     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApi.java b/bot/main/talium/inputs/Twitch4J/TwitchApi.java
index 051bdfd0..b5e339ce 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApi.java
+++ b/bot/main/talium/inputs/Twitch4J/TwitchApi.java
@@ -1,6 +1,8 @@
 package talium.inputs.Twitch4J;
 
 import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
+import com.github.twitch4j.common.exception.UnauthorizedException;
+import com.github.twitch4j.helix.TwitchHelix;
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
 
@@ -11,6 +13,23 @@
 // maybe add no-op version of helix api and just switch them when they are assigned, that way we should be able to remove all these null checking methods
 public class TwitchApi {
 
+    // wip: use higher-order-function to reduce boilerplate
+    private interface Call<T> {
+        T call(TwitchHelix helix);
+    }
+
+    private static<T> T doHelixCall(Call<T> call) {
+        try {
+            return call.call(Twitch4JInput.helix);
+        }  catch (UnauthorizedException e) {
+            //fix handle missing auth
+            return call.call(Twitch4JInput.helix);
+        } catch (Exception e) {
+            // ehh, log and throw i guess
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * Sends a message in the chat specified by the twitchOutputToChannel Env with the bot account specified by the twitchBotAccountName env
      *

From bb3f69a83e659bad8cbd56441d744f58528d1d91 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 13:33:47 +0100
Subject: [PATCH 17/58] adds syntax checking to VarStatement field access
 expressions, change getNestedReplacement to use VarStatement to preserve
 invariance, adds FieldDoesNotExistException

---
 .../templateParser/TemplateInterpreter.java   | 38 ++++++++++++-------
 .../system/templateParser/TemplateParser.java |  7 +---
 .../exeptions/FieldDoesNotExistException.java | 13 +++++++
 .../templateParser/ifParser/IfParser.java     |  2 +-
 .../statements/VarStatement.java              | 27 ++++++++++++-
 .../TemplateInterpreterTest.java              | 27 ++++++-------
 .../templateParser/ifParser/IfParserTest.java | 20 +++++-----
 7 files changed, 90 insertions(+), 44 deletions(-)
 create mode 100644 bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index 90998aef..f727dc55 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -30,16 +30,16 @@ public static String populate(List<Statement> template, HashMap<String, Object>
             if (statement instanceof TextStatement textStatement) {
                 out += textStatement.text();
             } else if (statement instanceof VarStatement varStatement) {
-                out += getNestedReplacement(varStatement.name(), values).toString();
+                out += getNestedReplacement(varStatement, values).toString();
             } else if (statement instanceof IfStatement ifStatement) {
                 // replace Vars with actual values
                 Object left = ifStatement.comparison().left();
                 if (left instanceof VarStatement leftVar) {
-                    left = castToValidInput(getNestedReplacement(leftVar.name(), values));
+                    left = castToValidInput(getNestedReplacement(leftVar, values));
                 }
                 Object right = ifStatement.comparison().right();
                 if (right instanceof VarStatement rightVar) {
-                    right = castToValidInput(getNestedReplacement(rightVar.name(), values));
+                    right = castToValidInput(getNestedReplacement(rightVar, values));
                 }
 
                 boolean condition = IfInterpreter.compare(new Comparison(left, ifStatement.comparison().equals(), right));
@@ -50,7 +50,8 @@ public static String populate(List<Statement> template, HashMap<String, Object>
                 }
             } else if (statement instanceof LoopStatement loop) {
                 String[] varParts = loop.var().split("\\[*]");
-                Object nestedReplacement = getNestedReplacement(varParts[0], values);
+                //TODO here is probably also an error
+                Object nestedReplacement = getNestedReplacement(VarStatement.create(varParts[0]), values);
 
                 if (!(nestedReplacement instanceof Iterable<?>)) {
                     throw new UnIterableArgumentException(varParts[0]);
@@ -60,7 +61,7 @@ public static String populate(List<Statement> template, HashMap<String, Object>
                 for (Object item : (Iterable<Object>) nestedReplacement) {
                     values.put(loop.name(), item);
                     if (varParts.length > 1) {
-                        values.put(loop.name(), getNestedReplacement(varParts[1], values));
+                        values.put(loop.name(), getNestedReplacement(VarStatement.create(varParts[1]), values));
                     }
                     out += populate(loop.body(), values);
                 }
@@ -93,28 +94,37 @@ public static Object castToValidInput(Object input) {
      * Tries to resolve and get the Value at the given variable path.
      * Throws an Exception if the path does not exist.
      *
-     * @param varName dot . delimited path of variable names
+     * @param varExpr dot . delimited path of variable names
      * @param values  List of top level variables
      * @return value of the variable
      * @apiNote Does not support getters or any functions
      */
-    public static Object getNestedReplacement(String varName, HashMap<String, Object> values) throws VariableValueNullException, NoSuchFieldException, IllegalAccessException {
-        String[] variableNames = varName.split("\\.");
+    public static Object getNestedReplacement(VarStatement varExpr, HashMap<String, Object> values) throws VariableValueNullException, NoSuchFieldException, IllegalAccessException {
+        String[] variableNames = varExpr.accessExpr().split("\\.");
         if (variableNames.length == 0) {
-            throw new TemplateSyntaxException("\""+varName+"\" is not a valid field access expression");
+            throw new TemplateSyntaxException("\""+varExpr.accessExpr()+"\" is not a valid field access expression");
+        }
+        if (!values.containsKey(variableNames[0])) {
+            throw new FieldDoesNotExistException(variableNames[0], values.keySet());
         }
         Object variable = values.get(variableNames[0]);
         for (int i = 1; i < variableNames.length; i++) {
             if (variable == null) {
                 throw new VariableValueNullException(variableNames[i - 1]);
             }
-            //TODO wrap getDeclaredField errors
-            Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
-            //TODO wrap setAccessible errors
-            declaredField.setAccessible(true);
-            variable = declaredField.get(variable);
+            try {
+                //TODO check if variable name is null
+                //TODO wrap getDeclaredField errors
+                //TODO wrap setAccessible errors
+                Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
+                declaredField.setAccessible(true);
+                variable = declaredField.get(variable);
+            } catch (NoSuchFieldException _) {
+                throw new FieldDoesNotExistException(variableNames[i], variable.getClass());
+            }
         }
         if (variable == null) {
+            System.out.println("input: " + varExpr.accessExpr());
             //TODO
         }
         return variable;
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index d2adb5cd..a97c1246 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -51,10 +51,7 @@ public Statement parseToken() throws UnsupportedComparisonOperator {
             return new TextStatement(current.value());
         }
         if (current.kind() == TemplateTokenKind.VAR) {
-            //TODO check for valid java object references
-            // make illegal:
-            // VarStatement[name=;kO'!1NQD;Mdejc/QF>hs=43LCl@!3yB4+*|I%YGH&Z]
-            return new VarStatement(current.value());
+            return VarStatement.create(current.value());
         }
         if (current.kind() == TemplateTokenKind.IF_HEAD) {
             Comparison comparison = IfParser.parse(current.value());
@@ -114,7 +111,7 @@ public static void debugPrint(List<Statement> statements, int depth) {
                 System.out.println(STR."\{indent}Text(\{textStatement.text()}),");
             }
             if (statement instanceof VarStatement varStatement) {
-                System.out.println(STR."\{indent}Var(\{varStatement.name()}),");
+                System.out.println(STR."\{indent}Var(\{varStatement.accessExpr()}),");
             }
             if (statement instanceof IfStatement ifStatement) {
                 System.out.println(STR."\{indent}IF: \{ifStatement.comparison()}");
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java b/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
new file mode 100644
index 00000000..1d2c65da
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
@@ -0,0 +1,13 @@
+package talium.system.templateParser.exeptions;
+
+import java.util.Arrays;
+import java.util.Set;
+
+public class FieldDoesNotExistException extends RuntimeException {
+    public FieldDoesNotExistException(String name, Set<String> envNames) {
+        super("No Field with name " + name + " exists in environment. Env: " + Arrays.toString(envNames.toArray()));
+    }
+    public FieldDoesNotExistException(String name, Class<?> onClass) {
+        super("No Field with name " + name + " exists on class " + onClass);
+    }
+}
diff --git a/bot/main/talium/system/templateParser/ifParser/IfParser.java b/bot/main/talium/system/templateParser/ifParser/IfParser.java
index 177be12c..9e3bd493 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfParser.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfParser.java
@@ -107,7 +107,7 @@ private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInp
     private static Object tokenToObject(IfToken token) {
         return switch (token.kind()) {
             case STRING -> token.value();
-            case VAR -> new VarStatement(token.value());
+            case VAR -> VarStatement.create(token.value());
             case INT -> {
                 var initialLong = Long.parseLong(token.value());
                 if (initialLong > Integer.MIN_VALUE && initialLong < Integer.MAX_VALUE) {
diff --git a/bot/main/talium/system/templateParser/statements/VarStatement.java b/bot/main/talium/system/templateParser/statements/VarStatement.java
index 4877bf2b..2d30c770 100644
--- a/bot/main/talium/system/templateParser/statements/VarStatement.java
+++ b/bot/main/talium/system/templateParser/statements/VarStatement.java
@@ -1,3 +1,28 @@
 package talium.system.templateParser.statements;
 
-public record VarStatement(String name) implements Statement {}
+import talium.system.templateParser.exeptions.TemplateSyntaxException;
+
+import java.util.regex.Pattern;
+
+public final class VarStatement implements Statement {
+
+    // Matches for valid field access expressions. (https://www.w3schools.com/java/java_variables_identifiers.asp)
+    // matches correct variable name first, and then any number of field accesses (with are . followed by the variable name check)
+    private static final Pattern syntax = Pattern.compile("^[\\w_$]\\w*(?:\\.[\\w_$]\\w*)*$");
+    private final String accessExpr;
+
+    private VarStatement(String accessExpr) {
+        this.accessExpr = accessExpr;
+    }
+
+    public static VarStatement create(String expression) throws TemplateSyntaxException {
+        if (!syntax.matcher(expression).matches()) {
+            throw new TemplateSyntaxException(expression + " is not a correct field access expression!");
+        }
+        return new VarStatement(expression);
+    }
+
+    public String accessExpr() {
+        return accessExpr;
+    }
+}
\ No newline at end of file
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index a93d2b33..afb1cc9f 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -1,5 +1,6 @@
 package talium.system.templateParser;
 
+import org.aspectj.weaver.ast.Var;
 import talium.system.templateParser.exeptions.VariableValueNullException;
 import talium.system.templateParser.exeptions.UnIterableArgumentException;
 import talium.system.templateParser.exeptions.UnsupportedComparandType;
@@ -18,13 +19,13 @@
 public class TemplateInterpreterTest {
     static List<Statement> TEMPLATE_VAR = Arrays.asList(
             new TextStatement("Hello, "),
-            new VarStatement("name"),
+            VarStatement.create("name"),
             new TextStatement("!")
     );
     static List<Statement> TEMPLATE_IF = Arrays.asList(
             new TextStatement("Hello, "),
-            new IfStatement(new Comparison(new VarStatement("compLeft"), Equals.EQUALS, "testString"),
-                    List.of(new VarStatement("compLeft")),
+            new IfStatement(new Comparison(VarStatement.create("compLeft"), Equals.EQUALS, "testString"),
+                    List.of(VarStatement.create("compLeft")),
                     List.of(new TextStatement("unnamed"))
             ),
             new TextStatement("!")
@@ -33,7 +34,7 @@ public class TemplateInterpreterTest {
             new TextStatement("Hello,"),
             new LoopStatement("varName", "loopVar", Arrays.asList(
                     new TextStatement(" "),
-                    new VarStatement("varName")
+                    VarStatement.create("varName")
             )),
             new TextStatement("!")
     );
@@ -42,7 +43,7 @@ public class TemplateInterpreterTest {
             new LoopStatement("innerLoop", "loopVar", Arrays.asList(
                     new LoopStatement("varName", "innerLoop", Arrays.asList(
                             new TextStatement(" "),
-                            new VarStatement("varName")
+                            VarStatement.create("varName")
                     )),
                     new TextStatement(" |")
             )),
@@ -115,7 +116,7 @@ void string() throws NoSuchFieldException, IllegalAccessException, VariableValue
             HashMap<String, Object> map = new HashMap<>();
             map.put("test", "testing String");
             map.put("dummyVar", 23899);
-            assert getNestedReplacement("test", map).equals("testing String");
+            assert getNestedReplacement(VarStatement.create("test"), map).equals("testing String");
         }
 
         @Test
@@ -123,7 +124,7 @@ void integer() throws NoSuchFieldException, IllegalAccessException, VariableValu
             HashMap<String, Object> map = new HashMap<>();
             map.put("integerValue", 23899);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement("integerValue", map).equals(23899);
+            assert getNestedReplacement(VarStatement.create("integerValue"), map).equals(23899);
         }
 
         @Test
@@ -132,7 +133,7 @@ void object_path() throws NoSuchFieldException, IllegalAccessException, Variable
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement("testObject.testInteger", map).equals(23899);
+            assert getNestedReplacement(VarStatement.create("testObject.testInteger"), map).equals(23899);
         }
 
         @Test
@@ -143,7 +144,7 @@ void list() throws NoSuchFieldException, IllegalAccessException, VariableValueNu
             list.add("dummyString");
             map.put("listVar", list);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement("listVar", map).equals(list);
+            assert getNestedReplacement(VarStatement.create("listVar"), map).equals(list);
         }
 
         @Test
@@ -152,7 +153,7 @@ void toplevel_null() throws NoSuchFieldException, IllegalAccessException {
             map.put("testObject", null);
             map.put("dummyVar", "testing String");
             try {
-                getNestedReplacement("testObject.testInteger", map);
+                getNestedReplacement(VarStatement.create("testObject.testInteger"), map);
                 fail("Should have thrown NullArgumentException");
             } catch (VariableValueNullException _) {
             }
@@ -164,7 +165,7 @@ void end_value_null() throws NoSuchFieldException, IllegalAccessException, Varia
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement("testObject.testString", map) == null;
+            assert getNestedReplacement(VarStatement.create("testObject.testString"), map) == null;
         }
 
         @Test
@@ -182,7 +183,7 @@ public PrivateClass(String testString, int testInteger) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement("testObject.testString", map).equals("testString");
+            assert getNestedReplacement(VarStatement.create("testObject.testString"), map).equals("testString");
         }
 
         @Test
@@ -192,7 +193,7 @@ void missing_field() throws IllegalAccessException, VariableValueNullException {
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
             try {
-                getNestedReplacement("testObject.testBoolean", map);
+                getNestedReplacement(VarStatement.create("testObject.testBoolean"), map);
             } catch (NoSuchFieldException _) {
             }
         }
diff --git a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
index 39e3a5fe..64782dd1 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
@@ -14,7 +14,7 @@ public class IfParserTest {
 
     @Test
     void test_success() throws UnsupportedComparisonOperator {
-        var comp = new Comparison(new VarStatement("var.name"), Equals.NOT_EQUALS, "test");
+        var comp = new Comparison(VarStatement.create("var.name"), Equals.NOT_EQUALS, "test");
         assert parse("var.name != \"test\"").equals(comp);
     }
 
@@ -34,31 +34,31 @@ void invalid_operator() throws UnsupportedComparisonOperator {
 
     @Test
     void test_types() throws UnsupportedComparisonOperator {
-        var bool = new Comparison(new VarStatement("var.name"), Equals.EQUALS, false);
+        var bool = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, false);
         assert parse("var.name == false").equals(bool);
 
-        var string = new Comparison(new VarStatement("var.name"), Equals.EQUALS, "test");
+        var string = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, "test");
         assert parse("var.name == \"test\"").equals(string);
 
-        var character = new Comparison(new VarStatement("var.name"), Equals.EQUALS, "a");
+        var character = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, "a");
         assert parse("var.name == \"a\"").equals(character);
 
-        var byte_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 159);
+        var byte_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 159);
         assert parse("var.name == 159").equals(byte_);
 
-        var short_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 16000);
+        var short_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 16000);
         assert parse("var.name == 16000").equals(short_);
 
-        var int_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 273650);
+        var int_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 273650);
         assert parse("var.name == 273650").equals(int_);
 
-        var long_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 1729010172331L);
+        var long_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 1729010172331L);
         assert parse("var.name == 1729010172331").equals(long_);
 
-        var float_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 69.4200);
+        var float_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 69.4200);
         assert parse("var.name == 69.4200").equals(float_);
 
-        var double_ = new Comparison(new VarStatement("var.name"), Equals.EQUALS, 3.1415d);
+        var double_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 3.1415d);
         assert parse("var.name == 3.1415").equals(double_);
     }
 }

From fd0ddbdfdc0206ca496b65b61888ea15094ba2f4 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 18:13:54 +0100
Subject: [PATCH 18/58] rework string template Exception hierarchy, and adjust
 non-test code

---
 bot/main/talium/system/Out.java               | 18 ++++---
 .../templateParser/CharakterStream.java       | 15 +++---
 .../templateParser/TemplateInterpreter.java   | 48 ++++++++++++++-----
 .../system/templateParser/TemplateLexer.java  | 32 +++++--------
 .../system/templateParser/TemplateParser.java | 11 ++---
 .../system/templateParser/TokenStream.java    | 20 --------
 .../FieldNotAccessibleException.java          |  7 +++
 .../ImpossibleComparisonException.java        | 23 +++++++++
 .../exeptions/InterpretationException.java    | 23 +++++++++
 .../exeptions/ParsingException.java           | 23 +++++++++
 .../exeptions/StringTemplateException.java    | 22 +++++++++
 .../exeptions/TemplateSyntaxException.java    |  2 +-
 .../UnIterableArgumentException.java          |  2 +-
 .../UnexpectedEndOfInputException.java        |  8 +++-
 .../exeptions/UnexpectedTokenException.java   | 16 +++++++
 .../exeptions/UnsupportedComparandType.java   |  2 +-
 .../UnsupportedComparisonOperator.java        |  2 +-
 .../exeptions/UnsupportedDirective.java       |  2 +-
 .../exeptions/VariableValueNullException.java |  2 +-
 .../ifParser/IfInterpreter.java               | 11 ++---
 .../templateParser/ifParser/IfParser.java     | 12 ++---
 21 files changed, 204 insertions(+), 97 deletions(-)
 delete mode 100644 bot/main/talium/system/templateParser/TokenStream.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/InterpretationException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/ParsingException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/StringTemplateException.java
 create mode 100644 bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java

diff --git a/bot/main/talium/system/Out.java b/bot/main/talium/system/Out.java
index 84548000..a5c09277 100644
--- a/bot/main/talium/system/Out.java
+++ b/bot/main/talium/system/Out.java
@@ -5,13 +5,12 @@
 import talium.inputs.Twitch4J.TwitchApi;
 import talium.system.stringTemplates.Template;
 import talium.system.stringTemplates.TemplateService;
-import talium.system.templateParser.exeptions.VariableValueNullException;
-import talium.system.templateParser.exeptions.UnIterableArgumentException;
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.TemplateParser;
+import talium.system.templateParser.statements.Statement;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
@@ -46,11 +45,16 @@ 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 | VariableValueNullException |
-                     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);
diff --git a/bot/main/talium/system/templateParser/CharakterStream.java b/bot/main/talium/system/templateParser/CharakterStream.java
index aecfd024..17312d5c 100644
--- a/bot/main/talium/system/templateParser/CharakterStream.java
+++ b/bot/main/talium/system/templateParser/CharakterStream.java
@@ -1,12 +1,12 @@
 package talium.system.templateParser;
 
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.system.templateParser.exeptions.UnexpectedTokenException;
 
 /**
  * A indexed Stream of characters for parsing.
  */
-public class CharakterStream implements TokenStream<Character> {
+public class CharakterStream {
     String src;
     int pos;
 
@@ -14,14 +14,12 @@ public CharakterStream(String src) {
         this.src = src;
     }
 
-    @Override
-    public Character peek() throws UnsupportedOperationException {
+    public Character peek() throws UnexpectedEndOfInputException {
         if (isEOF())
             throw new UnexpectedEndOfInputException();
         return src.charAt(pos);
     }
 
-    @Override
     public Character next() throws UnexpectedEndOfInputException {
         if (isEOF())
             throw new UnexpectedEndOfInputException();
@@ -35,17 +33,16 @@ public Character next() throws UnexpectedEndOfInputException {
      * If a different character is encountered, a syntax exception is thrown.
      * @param c the next expected character
      */
-    public void consume(Character c) {
+    public void consume(Character c) throws UnexpectedTokenException, UnexpectedEndOfInputException {
         if (isEOF()) {
-            throw new TemplateSyntaxException(String.valueOf(c), "END-OF-INPUT", pos - 1, src);
+            throw new UnexpectedTokenException(c, "END-OF-INPUT", pos - 1, src);
         }
         Character next = next();
         if (next != c) {
-            throw new TemplateSyntaxException(c, next, pos - 1, src);
+            throw new UnexpectedTokenException(c, next, pos - 1, src);
         }
     }
 
-    @Override
     public boolean isEOF() {
         return pos == src.length();
     }
diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index f727dc55..8e9f150c 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -6,6 +6,7 @@
 import talium.system.templateParser.tokens.Comparison;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InaccessibleObjectException;
 import java.util.HashMap;
 import java.util.List;
 
@@ -21,7 +22,7 @@ public class TemplateInterpreter {
      * @param values a map with all top level variables and their names
      * @return the resulting string
      */
-    public static String populate(List<Statement> template, HashMap<String, Object> values) throws NoSuchFieldException, VariableValueNullException, IllegalAccessException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+    public static String populate(List<Statement> template, HashMap<String, Object> values) throws InterpretationException  {
         if (values == null) {
             values = new HashMap<>();
         }
@@ -51,7 +52,11 @@ public static String populate(List<Statement> template, HashMap<String, Object>
             } else if (statement instanceof LoopStatement loop) {
                 String[] varParts = loop.var().split("\\[*]");
                 //TODO here is probably also an error
-                Object nestedReplacement = getNestedReplacement(VarStatement.create(varParts[0]), values);
+                // this varstatement should be created in parsing
+                Object nestedReplacement = null;
+                try {
+                    nestedReplacement = getNestedReplacement(VarStatement.create(varParts[0]), values);
+                } catch (TemplateSyntaxException _) {}
 
                 if (!(nestedReplacement instanceof Iterable<?>)) {
                     throw new UnIterableArgumentException(varParts[0]);
@@ -61,7 +66,9 @@ public static String populate(List<Statement> template, HashMap<String, Object>
                 for (Object item : (Iterable<Object>) nestedReplacement) {
                     values.put(loop.name(), item);
                     if (varParts.length > 1) {
+                        try {
                         values.put(loop.name(), getNestedReplacement(VarStatement.create(varParts[1]), values));
+                        } catch (TemplateSyntaxException _) {}
                     }
                     out += populate(loop.body(), values);
                 }
@@ -90,6 +97,7 @@ public static Object castToValidInput(Object input) {
         }
     }
 
+    //TODO this should probably be tested more
     /**
      * Tries to resolve and get the Value at the given variable path.
      * Throws an Exception if the path does not exist.
@@ -99,33 +107,47 @@ public static Object castToValidInput(Object input) {
      * @return value of the variable
      * @apiNote Does not support getters or any functions
      */
-    public static Object getNestedReplacement(VarStatement varExpr, HashMap<String, Object> values) throws VariableValueNullException, NoSuchFieldException, IllegalAccessException {
+    public static Object getNestedReplacement(VarStatement varExpr, HashMap<String, Object> values) throws InterpretationException  {
         String[] variableNames = varExpr.accessExpr().split("\\.");
         if (variableNames.length == 0) {
-            throw new TemplateSyntaxException("\""+varExpr.accessExpr()+"\" is not a valid field access expression");
+            //TODO kinda a panic, we should never be here
+            throw new InterpretationException("");
         }
         if (!values.containsKey(variableNames[0])) {
             throw new FieldDoesNotExistException(variableNames[0], values.keySet());
         }
         Object variable = values.get(variableNames[0]);
+        if (variable == null) {
+            throw new VariableValueNullException(variableNames[0]);
+        }
         for (int i = 1; i < variableNames.length; i++) {
-            if (variable == null) {
-                throw new VariableValueNullException(variableNames[i - 1]);
-            }
             try {
                 //TODO check if variable name is null
-                //TODO wrap getDeclaredField errors
-                //TODO wrap setAccessible errors
                 Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
                 declaredField.setAccessible(true);
                 variable = declaredField.get(variable);
             } catch (NoSuchFieldException _) {
                 throw new FieldDoesNotExistException(variableNames[i], variable.getClass());
+            } catch (IllegalAccessException | InaccessibleObjectException | SecurityException e) {
+                throw new FieldNotAccessibleException(variableNames[i], variable.getClass(), e);
+            }
+            catch (IllegalArgumentException _) {
+                //TODO kinda panic, because we should never be here, this means we have mixed up the underlying type of
+                // declaredField, because of type erasure in getDeclaredField(...)
+                throw new InterpretationException("");
+            }
+            catch (ExceptionInInitializerError e) {
+                //TODO kinda panic, because this indicates something very weird that should not happen.
+                // not sure what this is, but sounds above my pay grade
+                throw new InterpretationException("", e);
+            }
+            catch (NullPointerException _) {
+                //TODO kinda panic, the name should never be null, not allowed by parsing
+                throw new InterpretationException("");
+            }
+            if (variable == null) {
+                throw new VariableValueNullException(variableNames[i]);
             }
-        }
-        if (variable == null) {
-            System.out.println("input: " + varExpr.accessExpr());
-            //TODO
         }
         return variable;
     }
diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index b1c80652..9f293791 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -1,8 +1,8 @@
 package talium.system.templateParser;
 
 
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.system.templateParser.exeptions.UnexpectedTokenException;
 import talium.system.templateParser.exeptions.UnsupportedDirective;
 import talium.system.templateParser.tokens.TemplateTokenKind;
 import talium.system.templateParser.tokens.TemplateToken;
@@ -13,7 +13,7 @@
 /**
  * A Lexer for String Templates that consumes a CharacterStream and provides the tokens as a TokenStream
  */
-public class TemplateLexer implements TokenStream<TemplateToken> {
+public class TemplateLexer {
     CharakterStream src;
     List<TemplateToken> tokens;
     int pos;
@@ -28,16 +28,10 @@ public TemplateLexer(String src) {
      *
      * @return list of major tokens
      */
-    public List<TemplateToken> parse() {
+    public List<TemplateToken> parse() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         List<TemplateToken> list = new ArrayList<>();
         while (!src.isEOF()) {
-            TemplateToken next;
-            try {
-                next = next();
-            } catch (UnexpectedEndOfInputException e) {
-                e.printStackTrace();
-                break;
-            }
+            TemplateToken next = next();
             if (next == null) {
                 break;
             }
@@ -46,16 +40,14 @@ public List<TemplateToken> parse() {
         return list;
     }
 
-    @Override
-    public TemplateToken peek() {
+    public TemplateToken peek() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         if (pos >= tokens.size()) {
             tokens.add(parseToken());
         }
         return tokens.get(pos);
     }
 
-    @Override
-    public TemplateToken next() {
+    public TemplateToken next() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         if (pos >= tokens.size()) {
             tokens.add(parseToken());
         }
@@ -70,12 +62,13 @@ public TemplateToken next() {
      *
      * @param token the next expected token
      */
-    public void consume(TemplateTokenKind token) {
+    public void consume(TemplateTokenKind token) throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         if (isEOF()) {
-            throw new TemplateSyntaxException(token.name(), "END-OF-INPUT", src.pos() - 1, src.src());
-        } TemplateToken next = next();
+            throw new UnexpectedTokenException(token.name(), "END-OF-INPUT", src.pos() - 1, src.src());
+        }
+        TemplateToken next = next();
         if (next.kind() != token) {
-            throw new TemplateSyntaxException(token.name(), next.kind().name(), src.pos() - 1, src.src());
+            throw new UnexpectedTokenException(token.name(), next.kind().name(), src.pos() - 1, src.src());
         }
     }
 
@@ -84,7 +77,7 @@ public void consume(TemplateTokenKind token) {
      *
      * @return the next token
      */
-    private TemplateToken parseToken() throws UnexpectedEndOfInputException {
+    private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEndOfInputException, UnsupportedDirective {
         if (src.isEOF()) {
             return null;
         }
@@ -137,7 +130,6 @@ private TemplateToken parseToken() throws UnexpectedEndOfInputException {
         }
     }
 
-    @Override
     public boolean isEOF() {
         return src.isEOF();
     }
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index a97c1246..7ef97b08 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -1,7 +1,6 @@
 package talium.system.templateParser;
 
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.ifParser.IfParser;
 import talium.system.templateParser.statements.*;
 import talium.system.templateParser.tokens.Comparison;
@@ -23,15 +22,11 @@ public TemplateParser(String src) {
         this.src = new TemplateLexer(src);
     }
 
-    public TemplateParser(TemplateLexer src) {
-        this.src = src;
-    }
-
     /**
      * Parses the stream of major tokens into a stream of statements.
      * Invokes minor if and for parsers if needed.
      */
-    public List<Statement> parse() throws UnsupportedComparisonOperator {
+    public List<Statement> parse() throws ParsingException {
         List<Statement> statements = new ArrayList<>();
         while (!src.isEOF()) {
             statements.add(parseToken());
@@ -42,7 +37,7 @@ public List<Statement> parse() throws UnsupportedComparisonOperator {
     /**
      * Parses the next statement out of the stream of tokens
      */
-    public Statement parseToken() throws UnsupportedComparisonOperator {
+    public Statement parseToken() throws ParsingException {
         TemplateToken current = src.next();
         if (current == null) {
             return null;
diff --git a/bot/main/talium/system/templateParser/TokenStream.java b/bot/main/talium/system/templateParser/TokenStream.java
deleted file mode 100644
index 589fa0f4..00000000
--- a/bot/main/talium/system/templateParser/TokenStream.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package talium.system.templateParser;
-/**
- * A generic indexed Stream of Objects for parsing.
- */
-public interface TokenStream<T> {
-    /**
-     * returns the next token, without increasing the index
-     */
-    T peek();
-
-    /**
-     * returns the next token, increases the index by one token
-     */
-    T next();
-
-    /**
-     * Indicates end-of-file or end of the tokenStream
-     */
-    boolean isEOF();
-}
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java b/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
new file mode 100644
index 00000000..12daf997
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
@@ -0,0 +1,7 @@
+package talium.system.templateParser.exeptions;
+
+public class FieldNotAccessibleException extends InterpretationException {
+    public FieldNotAccessibleException(String fieldName, Class<?> onClass, Throwable cause) {
+        super("Field " + fieldName + " on + " + onClass.getSimpleName() + " is not accessible. Consider making the class and member fields public", cause);
+    }
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java b/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
new file mode 100644
index 00000000..3cc168ac
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
@@ -0,0 +1,23 @@
+package talium.system.templateParser.exeptions;
+
+public class ImpossibleComparisonException extends InterpretationException {
+    public ImpossibleComparisonException(String message) {
+        super(message);
+    }
+
+    public ImpossibleComparisonException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ImpossibleComparisonException(Throwable cause) {
+        super(cause);
+    }
+
+    public ImpossibleComparisonException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public ImpossibleComparisonException() {
+    }
+
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/InterpretationException.java b/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
new file mode 100644
index 00000000..e3a743b3
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
@@ -0,0 +1,23 @@
+package talium.system.templateParser.exeptions;
+
+public class InterpretationException extends StringTemplateException {
+    public InterpretationException(String message) {
+        super(message);
+    }
+
+    public InterpretationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InterpretationException(Throwable cause) {
+        super(cause);
+    }
+
+    public InterpretationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public InterpretationException() {
+    }
+
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/ParsingException.java b/bot/main/talium/system/templateParser/exeptions/ParsingException.java
new file mode 100644
index 00000000..6b99b78d
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/ParsingException.java
@@ -0,0 +1,23 @@
+package talium.system.templateParser.exeptions;
+
+public class ParsingException extends StringTemplateException {
+    public ParsingException(String message) {
+        super(message);
+    }
+
+    public ParsingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public ParsingException(Throwable cause) {
+        super(cause);
+    }
+
+    public ParsingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public ParsingException() {
+    }
+
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/StringTemplateException.java b/bot/main/talium/system/templateParser/exeptions/StringTemplateException.java
new file mode 100644
index 00000000..c72fcf85
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/StringTemplateException.java
@@ -0,0 +1,22 @@
+package talium.system.templateParser.exeptions;
+
+public class StringTemplateException extends Exception {
+    public StringTemplateException(String message) {
+        super(message);
+    }
+
+    public StringTemplateException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public StringTemplateException(Throwable cause) {
+        super(cause);
+    }
+
+    public StringTemplateException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public StringTemplateException() {
+    }
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java b/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
index 6c6b216d..5dee51c8 100644
--- a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
+++ b/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser.exeptions;
 
-public class TemplateSyntaxException extends RuntimeException {
+public class TemplateSyntaxException extends ParsingException {
     public TemplateSyntaxException(String expected, String actual, int atIndex, String source) {
         super(STR."Excepted: '\{expected}' but found '\{actual}', at Index: \{atIndex} in template \"\{source}\"");
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java b/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
index f46a3133..efca26ad 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser.exeptions;
 
-public class UnIterableArgumentException extends Exception {
+public class UnIterableArgumentException extends InterpretationException {
     public UnIterableArgumentException(String argName) {
         super(STR."\{argName == null ? "Argument" : argName} must implement Iterable.");
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java b/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
index 5c51cfcb..ef4d9bdb 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
@@ -1,3 +1,9 @@
 package talium.system.templateParser.exeptions;
 
-public class UnexpectedEndOfInputException extends IllegalArgumentException {}
+
+public class UnexpectedEndOfInputException extends ParsingException {
+    //TODO maybe this should only be thrown be low level api's and higher level API's should about not getting an expected token
+    public UnexpectedEndOfInputException() {
+        super();
+    }
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java b/bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java
new file mode 100644
index 00000000..f276da5a
--- /dev/null
+++ b/bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java
@@ -0,0 +1,16 @@
+package talium.system.templateParser.exeptions;
+
+public class UnexpectedTokenException extends TemplateSyntaxException {
+    public UnexpectedTokenException(String expected, String actual, int atIndex, String source) {
+        super(expected, actual, atIndex, source);
+    }
+
+    public UnexpectedTokenException(Character expected, String actual, int atIndex, String source) {
+        super(String.valueOf(expected), actual, atIndex, source);
+    }
+
+    public UnexpectedTokenException(Character expected, Character actual, int atIndex, String source) {
+        super(expected, actual, atIndex, source);
+    }
+
+}
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java b/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java
index 78e89dac..74b2c9d8 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java
@@ -3,7 +3,7 @@
 /**
  * Comparison is not supported between two types for a specific operator
  */
-public class UnsupportedComparandType extends Exception {
+public class UnsupportedComparandType extends InterpretationException {
     public UnsupportedComparandType(String s) {
         super(s);
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java b/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java
index 41a0f7ef..313548a1 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java
@@ -3,7 +3,7 @@
 /**
  * Comparison Operator (==, >, >=, ...) not supported
  */
-public class UnsupportedComparisonOperator extends Exception {
+public class UnsupportedComparisonOperator extends ParsingException {
     public UnsupportedComparisonOperator(String s) {
         super(s);
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java b/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
index 6320b0fb..4b1f5bc6 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser.exeptions;
 
-public class UnsupportedDirective extends RuntimeException {
+public class UnsupportedDirective extends ParsingException {
     public UnsupportedDirective(String message) {
         super(message);
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java b/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
index cc6feba4..2deb8325 100644
--- a/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
+++ b/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
@@ -1,7 +1,7 @@
 package talium.system.templateParser.exeptions;
 
 /// Is thrown when a variable in a variable reference is null, but is not the final reference (field on this object are supposed to be 'opened')
-public class VariableValueNullException extends Exception {
+public class VariableValueNullException extends InterpretationException {
     public VariableValueNullException(String argName) {
         super(STR."\{argName == null ? "Argument" : STR."\"\{argName}\""} must not be null.");
     }
diff --git a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
index d63d5c0b..0ad7c744 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
@@ -1,7 +1,6 @@
 package talium.system.templateParser.ifParser;
 
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.ImpossibleComparisonException;
 import talium.system.templateParser.statements.Equals;
 import talium.system.templateParser.tokens.Comparison;
 
@@ -27,7 +26,7 @@ public class IfInterpreter {
      * @param comp prepared comparison
      * @return boolean result
      */
-    public static boolean compare(Comparison comp) throws UnsupportedComparisonOperator, UnsupportedComparandType {
+    public static boolean compare(Comparison comp) throws ImpossibleComparisonException {
         Object l = comp.left();
         Object r = comp.right();
         if (l instanceof String || l instanceof Character && r instanceof String || r instanceof Character) {
@@ -37,14 +36,14 @@ public static boolean compare(Comparison comp) throws UnsupportedComparisonOpera
                 case EQUALS -> l.equals(r);
                 case NOT_EQUALS -> !l.equals(r);
                 case LESS_THAN, LESS_THAN_OR_EQUALS, GREATER_THAN, GREATER_THAN_OR_EQUALS ->
-                        throw new UnsupportedComparisonOperator(STR."\{comp.equals().name()} is not a supported comparison operation between Strings/Charactern");
+                        throw new ImpossibleComparisonException(STR."\{comp.equals().name()} is not a supported comparison operation between Strings/Charactern");
             };
         } else if (l instanceof Boolean && r instanceof Boolean) {
             return switch (comp.equals()) {
                 case EQUALS -> l.equals(r);
                 case NOT_EQUALS -> !l.equals(r);
                 case LESS_THAN, LESS_THAN_OR_EQUALS, GREATER_THAN, GREATER_THAN_OR_EQUALS ->
-                        throw new UnsupportedComparisonOperator(STR."\{comp.equals().name()} is not a supported comparison operation between booleans");
+                        throw new ImpossibleComparisonException(STR."\{comp.equals().name()} is not a supported comparison operation between booleans");
             };
         } else if ((l instanceof Double || l instanceof Float) && (r instanceof Double || r instanceof Float)) {
             Double ld = ((Number) l).doubleValue();
@@ -55,7 +54,7 @@ public static boolean compare(Comparison comp) throws UnsupportedComparisonOpera
             Long rl = ((Number) r).longValue();
             return compareLongs(ll, comp.equals(), rl);
         } else {
-            throw new UnsupportedComparandType(STR."Types \{l.getClass()} and \{r.getClass()} are not comparable to each other");
+            throw new ImpossibleComparisonException(STR."Types \{l.getClass()} and \{r.getClass()} are not comparable to each other");
         }
     }
 
diff --git a/bot/main/talium/system/templateParser/ifParser/IfParser.java b/bot/main/talium/system/templateParser/ifParser/IfParser.java
index 9e3bd493..b2fdd86c 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfParser.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfParser.java
@@ -1,9 +1,7 @@
 package talium.system.templateParser.ifParser;
 
 import talium.system.templateParser.CharakterStream;
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.statements.Equals;
 import talium.system.templateParser.statements.VarStatement;
 import talium.system.templateParser.tokens.Comparison;
@@ -30,7 +28,7 @@ public class IfParser {
      * @param srcString entire unparsed if head
      * @return Comparison object
      */
-    public static Comparison parse(String srcString) throws UnsupportedComparisonOperator {
+    public static Comparison parse(String srcString) throws UnexpectedEndOfInputException, TemplateSyntaxException, UnsupportedComparisonOperator {
         CharakterStream src = new CharakterStream(srcString);
         IfToken[] tokens = new IfToken[3];
         for (int i = 0; i < 3; i++) {
@@ -65,7 +63,7 @@ public static Comparison parse(String srcString) throws UnsupportedComparisonOpe
      * @param src source character stream
      * @return the parsed token
      */
-    private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInputException {
+    private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInputException, UnexpectedTokenException {
         //TODO rebuild to consume one character per loop, save current state in var
         if (src.isEOF()) {
             throw new UnexpectedEndOfInputException();
@@ -104,7 +102,7 @@ private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInp
     /**
      * get inner value out of token
      */
-    private static Object tokenToObject(IfToken token) {
+    private static Object tokenToObject(IfToken token) throws TemplateSyntaxException {
         return switch (token.kind()) {
             case STRING -> token.value();
             case VAR -> VarStatement.create(token.value());
@@ -117,7 +115,7 @@ private static Object tokenToObject(IfToken token) {
             }
             case DOUBLE -> Double.parseDouble(token.value());
             case BOOLEAN -> Boolean.parseBoolean(token.value());
-            case COMPARISON -> throw new RuntimeException("Another Comparison not a valid Object for an comparison comparand");
+            case COMPARISON -> throw new TemplateSyntaxException("Another Comparison not a valid Object for an comparison comparand");
         };
     }
 }

From 1d3b7af652279912ed026111ca5c868809969393 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 18:14:19 +0100
Subject: [PATCH 19/58] start fixing test code for Exception changes

---
 .../templateParser/CharacterStreamTest.java   |   9 +-
 .../TemplateInterpreterTest.java              | 104 +++++++++---------
 .../templateParser/TemplateLexerTest.java     |  32 +++---
 .../templateParser/TemplateParserTest.java    |   8 +-
 .../ifParser/IfInterpreterTest.java           |  53 ++++-----
 .../templateParser/ifParser/IfParserTest.java |   7 +-
 6 files changed, 109 insertions(+), 104 deletions(-)

diff --git a/bot/test/talium/system/templateParser/CharacterStreamTest.java b/bot/test/talium/system/templateParser/CharacterStreamTest.java
index ec24e582..51f0ef9d 100644
--- a/bot/test/talium/system/templateParser/CharacterStreamTest.java
+++ b/bot/test/talium/system/templateParser/CharacterStreamTest.java
@@ -1,11 +1,12 @@
 package talium.system.templateParser;
 
 import org.junit.jupiter.api.Test;
+import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 
 class CharacterStreamTest {
 
     @Test
-    void peek_shows_next_character() {
+    void peek_shows_next_character() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
         assert stream.peek() == 'T';
         assert stream.peek() == 'T';
@@ -14,7 +15,7 @@ void peek_shows_next_character() {
     }
 
     @Test
-    void next_advances_to_next_character() {
+    void next_advances_to_next_character() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
         assert stream.next() == 'T';
         assert stream.next() == 'E';
@@ -25,7 +26,7 @@ void next_advances_to_next_character() {
     }
 
     @Test
-    void eof_true_at_end() {
+    void eof_true_at_end() throws UnexpectedEndOfInputException {
         String testStream = "TEST STREAM";
         var stream = new CharakterStream(testStream);
         for (int i = 0; i < testStream.length() ; i++) {
@@ -35,7 +36,7 @@ void eof_true_at_end() {
     }
 
     @Test
-    void eof_false_at_not_end() {
+    void eof_false_at_not_end() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
         assert !stream.isEOF();
         stream.next();
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index afb1cc9f..79db6acd 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -1,10 +1,6 @@
 package talium.system.templateParser;
 
-import org.aspectj.weaver.ast.Var;
-import talium.system.templateParser.exeptions.VariableValueNullException;
-import talium.system.templateParser.exeptions.UnIterableArgumentException;
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.statements.*;
 import talium.system.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Nested;
@@ -17,43 +13,52 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class TemplateInterpreterTest {
-    static List<Statement> TEMPLATE_VAR = Arrays.asList(
-            new TextStatement("Hello, "),
-            VarStatement.create("name"),
-            new TextStatement("!")
-    );
-    static List<Statement> TEMPLATE_IF = Arrays.asList(
-            new TextStatement("Hello, "),
-            new IfStatement(new Comparison(VarStatement.create("compLeft"), Equals.EQUALS, "testString"),
-                    List.of(VarStatement.create("compLeft")),
-                    List.of(new TextStatement("unnamed"))
-            ),
-            new TextStatement("!")
-    );
-    static List<Statement> TEMPLATE_LOOP = List.of(
-            new TextStatement("Hello,"),
-            new LoopStatement("varName", "loopVar", Arrays.asList(
-                    new TextStatement(" "),
-                    VarStatement.create("varName")
-            )),
-            new TextStatement("!")
-    );
-    static List<Statement> NESTED_LOOP = Arrays.asList(
-            new TextStatement("Hello,"),
-            new LoopStatement("innerLoop", "loopVar", Arrays.asList(
-                    new LoopStatement("varName", "innerLoop", Arrays.asList(
+    static List<Statement> TEMPLATE_VAR;
+    static List<Statement> TEMPLATE_IF;
+    static List<Statement> TEMPLATE_LOOP;
+    static List<Statement> NESTED_LOOP;
+
+    static {
+        try {
+            TEMPLATE_VAR = Arrays.asList(
+                    new TextStatement("Hello, "),
+                    VarStatement.create("name"),
+                    new TextStatement("!")
+            );
+            TEMPLATE_IF = Arrays.asList(
+                    new TextStatement("Hello, "),
+                    new IfStatement(new Comparison(VarStatement.create("compLeft"), Equals.EQUALS, "testString"),
+                            List.of(VarStatement.create("compLeft")),
+                            List.of(new TextStatement("unnamed"))
+                    ),
+                    new TextStatement("!")
+            );
+            TEMPLATE_LOOP = List.of(
+                    new TextStatement("Hello,"),
+                    new LoopStatement("varName", "loopVar", Arrays.asList(
                             new TextStatement(" "),
                             VarStatement.create("varName")
                     )),
-                    new TextStatement(" |")
-            )),
-            new TextStatement("!")
-    );
+                    new TextStatement("!")
+            );
+            NESTED_LOOP = Arrays.asList(
+                    new TextStatement("Hello,"),
+                    new LoopStatement("innerLoop", "loopVar", Arrays.asList(
+                            new LoopStatement("varName", "innerLoop", Arrays.asList(
+                                    new TextStatement(" "),
+                                    VarStatement.create("varName")
+                            )),
+                            new TextStatement(" |")
+                    )),
+                    new TextStatement("!")
+            );
+        } catch (TemplateSyntaxException _) {}
+    }
 
     @Nested
     class Populate {
         @Test
-        void iterate_non_iterable() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void iterate_non_iterable() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("loopVar", "this_is_not_a_list");
             try {
@@ -64,21 +69,21 @@ void iterate_non_iterable() throws NoSuchFieldException, IllegalAccessException,
         }
 
         @Test
-        void var() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void var() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("name", "dummy name");
             assert populate(TEMPLATE_VAR, map).equals("Hello, dummy name!");
         }
 
         @Test
-        void iterate_empty_list() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void iterate_empty_list() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("loopVar", new ArrayList<>());
             assert populate(TEMPLATE_LOOP, map).equals("Hello,!");
         }
 
         @Test
-        void nestedLoop() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void nestedLoop() throws InterpretationException  {
             HashMap<String, Object> map = new HashMap<>();
             ArrayList<List<String>> list = new ArrayList<>();
             list.add(List.of("t-1.1", "t-1.2"));
@@ -88,14 +93,14 @@ void nestedLoop() throws NoSuchFieldException, IllegalAccessException, VariableV
         }
 
         @Test
-        void if_() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparandType, UnsupportedComparisonOperator {
+        void if_() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("compLeft", "testString");
             assert populate(TEMPLATE_IF, map).equals("Hello, testString!");
         }
 
         @Test
-        void wrong_condition_type() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException, UnIterableArgumentException, UnsupportedComparisonOperator {
+        void wrong_condition_type() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("compLeft", false);
             try {
@@ -112,7 +117,7 @@ private record TestClass(String testString, int testInteger) {
         }
 
         @Test
-        void string() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void string() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("test", "testing String");
             map.put("dummyVar", 23899);
@@ -120,7 +125,7 @@ void string() throws NoSuchFieldException, IllegalAccessException, VariableValue
         }
 
         @Test
-        void integer() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void integer() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("integerValue", 23899);
             map.put("dummyVar", "testing String");
@@ -128,7 +133,7 @@ void integer() throws NoSuchFieldException, IllegalAccessException, VariableValu
         }
 
         @Test
-        void object_path() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void object_path() throws InterpretationException, TemplateSyntaxException {
             TestClass testClass = new TestClass("testString", 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
@@ -137,7 +142,7 @@ void object_path() throws NoSuchFieldException, IllegalAccessException, Variable
         }
 
         @Test
-        void list() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void list() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             ArrayList<String> list = new ArrayList<>();
             list.add("dummyValue");
@@ -148,7 +153,7 @@ void list() throws NoSuchFieldException, IllegalAccessException, VariableValueNu
         }
 
         @Test
-        void toplevel_null() throws NoSuchFieldException, IllegalAccessException {
+        void toplevel_null() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", null);
             map.put("dummyVar", "testing String");
@@ -160,7 +165,7 @@ void toplevel_null() throws NoSuchFieldException, IllegalAccessException {
         }
 
         @Test
-        void end_value_null() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void end_value_null() throws InterpretationException, TemplateSyntaxException {
             TestClass testClass = new TestClass(null, 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
@@ -169,7 +174,7 @@ void end_value_null() throws NoSuchFieldException, IllegalAccessException, Varia
         }
 
         @Test
-        void private_var() throws NoSuchFieldException, IllegalAccessException, VariableValueNullException {
+        void private_var() throws InterpretationException, TemplateSyntaxException {
             class PrivateClass {
                 private final String testString;
                 final int testInteger;
@@ -187,15 +192,14 @@ public PrivateClass(String testString, int testInteger) {
         }
 
         @Test
-        void missing_field() throws IllegalAccessException, VariableValueNullException {
+        void missing_field() throws InterpretationException, TemplateSyntaxException {
             TestClass testClass = new TestClass("testString", 23899);
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
             try {
                 getNestedReplacement(VarStatement.create("testObject.testBoolean"), map);
-            } catch (NoSuchFieldException _) {
-            }
+            } catch (FieldDoesNotExistException _) {}
         }
     }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index 32746627..59d71f3f 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -1,7 +1,9 @@
 package talium.system.templateParser;
 
 import org.junit.jupiter.api.Test;
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
+import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.system.templateParser.exeptions.UnexpectedTokenException;
+import talium.system.templateParser.exeptions.UnsupportedDirective;
 import talium.system.templateParser.tokens.TemplateTokenKind;
 
 import static org.junit.jupiter.api.Assertions.fail;
@@ -11,16 +13,16 @@
 // completion of a statement is not yet checked at this stage, so a missing else directive is not an error at this stage
 public class TemplateLexerTest {
     @Test
-    void missing_closing_bracket() {
+    void missing_closing_bracket() throws UnsupportedDirective, UnexpectedEndOfInputException {
         TemplateLexer lex = new TemplateLexer("Hello, ${var.name!");
         try {
             lex.parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) {}
     }
 
     @Test
-    void missing_dollar() {
+    void missing_dollar() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         var tokens = new TemplateLexer("Hello, {var.name}!").parse();
         assert tokens.size() == 1;
         assert tokens.getFirst().kind() == TemplateTokenKind.TEXT;
@@ -28,50 +30,50 @@ void missing_dollar() {
     }
 
     @Test
-    void missing_closing_bracket_directive() {
+    void missing_closing_bracket_directive() throws UnexpectedTokenException, UnsupportedDirective {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed%{ endif ");
         try {
             lex.parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedEndOfInputException _) { }
     }
 
     @Test
-    void missing_percent() {
+    void missing_percent() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed{ endif }");
         System.out.println(lex.parse());
     }
 
     @Test
-    void malformed_endIf() {
+    void malformed_endIf() throws UnsupportedDirective, UnexpectedEndOfInputException {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed%{ endif dadasdadad }");
         try {
             lex.parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) { }
     }
 
     @Test
-    void directive_start_in_text() {
+    void directive_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputException {
         try {
             new TemplateLexer("template text % mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) { }
         try {
             new TemplateLexer("template text %c mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) { }
     }
 
     @Test
-    void variable_start_in_text() {
+    void variable_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputException {
         try {
             new TemplateLexer("template text $ mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) { }
         try {
             new TemplateLexer("template text $c mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (TemplateSyntaxException _) {}
+        } catch (UnexpectedTokenException _) { }
     }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 563ff694..2675155b 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -3,10 +3,7 @@
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.junit.jupiter.api.Test;
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
-import talium.system.templateParser.exeptions.UnsupportedDirective;
+import talium.system.templateParser.exeptions.*;
 
 
 import java.util.ArrayList;
@@ -115,8 +112,7 @@ private void test(String src, int iteration) {
                 System.out.println(statements);
                 fail("Should likely have thrown for: " + src);
             }
-        } catch (TemplateSyntaxException | UnexpectedEndOfInputException | UnsupportedComparisonOperator |
-                 UnsupportedDirective | NoSuchFieldException _) {
+        } catch (StringTemplateException _) {
         } catch (Exception e) {
             System.out.println("i: " + iteration + " -> Source Input: " + src);
             fail("Unexpected Exception thrown: " + e.getMessage(), e);
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
index b09695ec..018af197 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
@@ -1,6 +1,7 @@
 package talium.system.templateParser.ifParser;
 
 import org.junit.jupiter.api.Disabled;
+import talium.system.templateParser.exeptions.ImpossibleComparisonException;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
 import talium.system.templateParser.exeptions.UnsupportedComparandType;
 import talium.system.templateParser.statements.Equals;
@@ -17,7 +18,7 @@ public class IfInterpreterTest {
     @Nested
     class OperatorTests {
         @Test
-        void ints() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void ints() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 348));
             assert !IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 34993497));
 
@@ -40,7 +41,7 @@ void ints() throws UnsupportedComparandType, UnsupportedComparisonOperator {
         }
 
         @Test
-        void longs() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void longs() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 19282L));
             assert !IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 6323833349178L));
 
@@ -62,7 +63,7 @@ void longs() throws UnsupportedComparandType, UnsupportedComparisonOperator {
             assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN_OR_EQUALS, 6323833349178L));
         }
         @Test
-        void floats() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void floats() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 12.28434F));
             assert !IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 687.000033339284F));
 
@@ -90,122 +91,122 @@ void floats() throws UnsupportedComparandType, UnsupportedComparisonOperator {
     @Nested
     class TypeTests {
         @Test
-        void boolean_boolean() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void boolean_boolean() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, false));
             assert IfInterpreter.compare(new Comparison(false, Equals.EQUALS, false));
             assert !IfInterpreter.compare(new Comparison(false, Equals.EQUALS, true));
         }
 
         @Test
-        void string_string() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void string_string() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison("test", Equals.NOT_EQUALS, "wort"));
             assert IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "test"));
             assert !IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "wort"));
         }
 
         @Test
-        void int_int() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void int_int() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11));
             assert IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10));
             assert !IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11));
         }
 
         @Test
-        void long_long() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void long_long() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10L, Equals.NOT_EQUALS, 11L));
             assert IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 10L));
             assert !IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 11L));
         }
 
         @Test
-        void float_float() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void float_float() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323F));
             assert IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F));
             assert !IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323F));
         }
 
         @Test
-        void double_double() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void double_double() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10.32323D, Equals.NOT_EQUALS, 10.52323D));
             assert IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.32323D));
             assert !IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.52323D));
         }
 
         @Test
-        void char_char() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void char_char() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison('t', Equals.NOT_EQUALS, 'w'));
             assert IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 't'));
             assert !IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 'w'));
         }
 
         @Test
-        void int_long() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void int_long() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11L));
             assert IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10));
             assert !IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11L));
         }
 
         @Test
-        void float_double() throws UnsupportedComparandType, UnsupportedComparisonOperator {
+        void float_double() throws ImpossibleComparisonException {
             assert IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323D));
             assert IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F));
             assert !IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323D));
         }
 
         @Test
-        void string_int() throws UnsupportedComparisonOperator {
+        void string_int()  {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, 1));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void string_double() throws UnsupportedComparisonOperator {
+        void string_double() {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, 10.52323D));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void string_boolean() throws UnsupportedComparisonOperator {
+        void string_boolean() {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, true));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void int_boolean() throws UnsupportedComparisonOperator {
+        void int_boolean() {
             try {
                 IfInterpreter.compare(new Comparison(123, Equals.EQUALS, true));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void long_float() throws UnsupportedComparisonOperator {
+        void long_float() {
             try {
                 IfInterpreter.compare(new Comparison(10L, Equals.NOT_EQUALS, 10.52323F));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void object_object() throws UnsupportedComparisonOperator {
+        void object_object() {
             try {
                 IfInterpreter.compare(new Comparison(123, Equals.EQUALS, new ArrayList<Exception>()));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
 
         @Test
-        void object_boolean() throws UnsupportedComparisonOperator {
+        void object_boolean() {
             try {
                 IfInterpreter.compare(new Comparison(new ArrayList<Exception>(), Equals.EQUALS, true));
                 fail("UnsupportedOperationException not thrown!");
-            } catch (UnsupportedComparandType _) {}
+            } catch (ImpossibleComparisonException _) {}
         }
     }
 }
diff --git a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
index 64782dd1..2c95b906 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
@@ -1,6 +1,7 @@
 package talium.system.templateParser.ifParser;
 
 import talium.system.templateParser.exeptions.TemplateSyntaxException;
+import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
 import talium.system.templateParser.statements.Equals;
 import talium.system.templateParser.statements.VarStatement;
@@ -13,13 +14,13 @@
 public class IfParserTest {
 
     @Test
-    void test_success() throws UnsupportedComparisonOperator {
+    void test_success() throws UnsupportedComparisonOperator, TemplateSyntaxException, UnexpectedEndOfInputException {
         var comp = new Comparison(VarStatement.create("var.name"), Equals.NOT_EQUALS, "test");
         assert parse("var.name != \"test\"").equals(comp);
     }
 
     @Test
-    void invalid_operator() throws UnsupportedComparisonOperator {
+    void invalid_operator() throws UnsupportedComparisonOperator, TemplateSyntaxException, UnexpectedEndOfInputException {
         try {
             parse("var.name !!== \"test\"");
             fail("Should have thrown UnsupportedComparisonOperator");
@@ -33,7 +34,7 @@ void invalid_operator() throws UnsupportedComparisonOperator {
     }
 
     @Test
-    void test_types() throws UnsupportedComparisonOperator {
+    void test_types() throws UnsupportedComparisonOperator, TemplateSyntaxException, UnexpectedEndOfInputException {
         var bool = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, false);
         assert parse("var.name == false").equals(bool);
 

From e4573a4e0a930cb8d966f2e267bb8fc7443a060c Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sat, 1 Feb 2025 19:14:54 +0100
Subject: [PATCH 20/58] fix no .equals for VarStatement, remove dead
 UnsupportedComparandType, fix handling of replacement being null

---
 .../templateParser/TemplateInterpreter.java   | 18 +++++++++--------
 .../exeptions/FieldDoesNotExistException.java |  2 +-
 .../exeptions/UnsupportedComparandType.java   | 10 ----------
 .../ifParser/IfInterpreter.java               | 14 ++++++++-----
 .../statements/VarStatement.java              | 18 +++++++++++++++++
 .../TemplateInterpreterTest.java              |  5 ++---
 .../templateParser/TemplateLexerTest.java     |  4 ++--
 .../templateParser/TemplateParserTest.java    |  2 +-
 .../ifParser/IfInterpreterTest.java           | 20 ++++++++-----------
 9 files changed, 51 insertions(+), 42 deletions(-)
 delete mode 100644 bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index 8e9f150c..52b00e56 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -31,7 +31,12 @@ public static String populate(List<Statement> template, HashMap<String, Object>
             if (statement instanceof TextStatement textStatement) {
                 out += textStatement.text();
             } else if (statement instanceof VarStatement varStatement) {
-                out += getNestedReplacement(varStatement, values).toString();
+                Object nestedReplacement = getNestedReplacement(varStatement, values);
+                if (nestedReplacement == null) {
+                    out += "null";
+                } else {
+                    out += nestedReplacement.toString();
+                }
             } else if (statement instanceof IfStatement ifStatement) {
                 // replace Vars with actual values
                 Object left = ifStatement.comparison().left();
@@ -104,7 +109,7 @@ public static Object castToValidInput(Object input) {
      *
      * @param varExpr dot . delimited path of variable names
      * @param values  List of top level variables
-     * @return value of the variable
+     * @return value of the variable, this can be null, if the last field is returning the null value
      * @apiNote Does not support getters or any functions
      */
     public static Object getNestedReplacement(VarStatement varExpr, HashMap<String, Object> values) throws InterpretationException  {
@@ -117,10 +122,10 @@ public static Object getNestedReplacement(VarStatement varExpr, HashMap<String,
             throw new FieldDoesNotExistException(variableNames[0], values.keySet());
         }
         Object variable = values.get(variableNames[0]);
-        if (variable == null) {
-            throw new VariableValueNullException(variableNames[0]);
-        }
         for (int i = 1; i < variableNames.length; i++) {
+            if (variable == null) {
+                throw new VariableValueNullException(variableNames[i - 1]);
+            }
             try {
                 //TODO check if variable name is null
                 Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
@@ -145,9 +150,6 @@ public static Object getNestedReplacement(VarStatement varExpr, HashMap<String,
                 //TODO kinda panic, the name should never be null, not allowed by parsing
                 throw new InterpretationException("");
             }
-            if (variable == null) {
-                throw new VariableValueNullException(variableNames[i]);
-            }
         }
         return variable;
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java b/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
index 1d2c65da..9db8acaa 100644
--- a/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
+++ b/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.Set;
 
-public class FieldDoesNotExistException extends RuntimeException {
+public class FieldDoesNotExistException extends InterpretationException {
     public FieldDoesNotExistException(String name, Set<String> envNames) {
         super("No Field with name " + name + " exists in environment. Env: " + Arrays.toString(envNames.toArray()));
     }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java b/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java
deleted file mode 100644
index 74b2c9d8..00000000
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparandType.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package talium.system.templateParser.exeptions;
-
-/**
- * Comparison is not supported between two types for a specific operator
- */
-public class UnsupportedComparandType extends InterpretationException {
-    public UnsupportedComparandType(String s) {
-        super(s);
-    }
-}
\ No newline at end of file
diff --git a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
index 0ad7c744..790c5315 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
@@ -29,12 +29,16 @@ public class IfInterpreter {
     public static boolean compare(Comparison comp) throws ImpossibleComparisonException {
         Object l = comp.left();
         Object r = comp.right();
-        if (l instanceof String || l instanceof Character && r instanceof String || r instanceof Character) {
-            l = l.toString();
-            r = r.toString();
+        if (l == null && r == null) {
+            return true;
+        } else if (l == null || r == null) {
+            return false;
+        } else if ((l instanceof String || l instanceof Character) && (r instanceof String || r instanceof Character)) {
+            String left = l.toString();
+            String right = r.toString();
             return switch (comp.equals()) {
-                case EQUALS -> l.equals(r);
-                case NOT_EQUALS -> !l.equals(r);
+                case EQUALS -> left.equals(right);
+                case NOT_EQUALS -> !left.equals(right);
                 case LESS_THAN, LESS_THAN_OR_EQUALS, GREATER_THAN, GREATER_THAN_OR_EQUALS ->
                         throw new ImpossibleComparisonException(STR."\{comp.equals().name()} is not a supported comparison operation between Strings/Charactern");
             };
diff --git a/bot/main/talium/system/templateParser/statements/VarStatement.java b/bot/main/talium/system/templateParser/statements/VarStatement.java
index 2d30c770..5d4cd06f 100644
--- a/bot/main/talium/system/templateParser/statements/VarStatement.java
+++ b/bot/main/talium/system/templateParser/statements/VarStatement.java
@@ -2,6 +2,7 @@
 
 import talium.system.templateParser.exeptions.TemplateSyntaxException;
 
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 public final class VarStatement implements Statement {
@@ -25,4 +26,21 @@ public static VarStatement create(String expression) throws TemplateSyntaxExcept
     public String accessExpr() {
         return accessExpr;
     }
+
+    @Override
+    public String toString() {
+        return "VarStatement(" + accessExpr + ')';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof VarStatement that)) return false;
+
+        return Objects.equals(accessExpr, that.accessExpr);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(accessExpr);
+    }
 }
\ No newline at end of file
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index 79db6acd..46f70dfe 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -105,9 +105,8 @@ void wrong_condition_type() throws InterpretationException {
             map.put("compLeft", false);
             try {
                 populate(TEMPLATE_IF, map);
-                fail("Should have thrown UnIterableArgumentException");
-            } catch (UnsupportedComparandType _) {
-            }
+                fail("Should have thrown ImpossibleComparisonException");
+            } catch (ImpossibleComparisonException _) {}
         }
     }
 
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index 59d71f3f..dfa489a1 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -30,12 +30,12 @@ void missing_dollar() throws UnexpectedTokenException, UnsupportedDirective, Une
     }
 
     @Test
-    void missing_closing_bracket_directive() throws UnexpectedTokenException, UnsupportedDirective {
+    void missing_closing_bracket_directive() throws UnsupportedDirective, UnexpectedEndOfInputException {
         TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed%{ endif ");
         try {
             lex.parse();
             fail("Should have thrown an TemplateSyntaxException");
-        } catch (UnexpectedEndOfInputException _) { }
+        } catch (UnexpectedTokenException _) { }
     }
 
     @Test
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 2675155b..51d3b062 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -106,7 +106,7 @@ private void tokenFuzzing(int n, int length) {
     private void test(String src, int iteration) {
         try {
             var statements = new TemplateParser(src).parse();
-            TemplateInterpreter.populate(statements, null);
+            var res = TemplateInterpreter.populate(statements, null);
             if (src.contains("$") || src.contains("%")) {
                 System.out.println("i: " + iteration + " -> Statement Stream:");
                 System.out.println(statements);
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
index 018af197..cf3affee 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
@@ -1,9 +1,6 @@
 package talium.system.templateParser.ifParser;
 
-import org.junit.jupiter.api.Disabled;
 import talium.system.templateParser.exeptions.ImpossibleComparisonException;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
-import talium.system.templateParser.exeptions.UnsupportedComparandType;
 import talium.system.templateParser.statements.Equals;
 import talium.system.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Nested;
@@ -14,6 +11,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class IfInterpreterTest {
+    //TODO add nulls
 
     @Nested
     class OperatorTests {
@@ -86,8 +84,6 @@ void floats() throws ImpossibleComparisonException {
         }
     }
 
-    //TODO investigate failing tests
-    @Disabled
     @Nested
     class TypeTests {
         @Test
@@ -157,7 +153,7 @@ void float_double() throws ImpossibleComparisonException {
         void string_int()  {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, 1));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -165,7 +161,7 @@ void string_int()  {
         void string_double() {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, 10.52323D));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -173,7 +169,7 @@ void string_double() {
         void string_boolean() {
             try {
                 IfInterpreter.compare(new Comparison("test", Equals.EQUALS, true));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -181,7 +177,7 @@ void string_boolean() {
         void int_boolean() {
             try {
                 IfInterpreter.compare(new Comparison(123, Equals.EQUALS, true));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -189,7 +185,7 @@ void int_boolean() {
         void long_float() {
             try {
                 IfInterpreter.compare(new Comparison(10L, Equals.NOT_EQUALS, 10.52323F));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -197,7 +193,7 @@ void long_float() {
         void object_object() {
             try {
                 IfInterpreter.compare(new Comparison(123, Equals.EQUALS, new ArrayList<Exception>()));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
 
@@ -205,7 +201,7 @@ void object_object() {
         void object_boolean() {
             try {
                 IfInterpreter.compare(new Comparison(new ArrayList<Exception>(), Equals.EQUALS, true));
-                fail("UnsupportedOperationException not thrown!");
+                fail("ImpossibleComparisonException not thrown!");
             } catch (ImpossibleComparisonException _) {}
         }
     }

From 65315a0279ed7ef7e1bc651d5edaf80829aa9e47 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 15:13:21 +0100
Subject: [PATCH 21/58] add builder methods for TemplateToken, fix parsers
 returning null tokens and statements

---
 .../system/templateParser/TemplateLexer.java  | 27 +++++++++--------
 .../system/templateParser/TemplateParser.java | 21 +++++++-------
 .../templateParser/tokens/TemplateToken.java  | 29 +++++++++++++++++++
 .../templateParser/TemplateLexerTest.java     | 15 ++++++++++
 .../templateParser/TemplateParserTest.java    | 19 ++++++++++--
 .../ifParser/IfInterpreterTest.java           |  2 +-
 6 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index 9f293791..6f043dd1 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -1,6 +1,6 @@
 package talium.system.templateParser;
 
-
+import org.springframework.lang.NonNull;
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 import talium.system.templateParser.exeptions.UnexpectedTokenException;
 import talium.system.templateParser.exeptions.UnsupportedDirective;
@@ -32,9 +32,6 @@ public List<TemplateToken> parse() throws UnexpectedTokenException, UnsupportedD
         List<TemplateToken> list = new ArrayList<>();
         while (!src.isEOF()) {
             TemplateToken next = next();
-            if (next == null) {
-                break;
-            }
             list.add(next);
         }
         return list;
@@ -47,6 +44,7 @@ public TemplateToken peek() throws UnexpectedTokenException, UnsupportedDirectiv
         return tokens.get(pos);
     }
 
+    @NonNull
     public TemplateToken next() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         if (pos >= tokens.size()) {
             tokens.add(parseToken());
@@ -77,16 +75,17 @@ public void consume(TemplateTokenKind token) throws UnexpectedTokenException, Un
      *
      * @return the next token
      */
+    @NonNull
     private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEndOfInputException, UnsupportedDirective {
         if (src.isEOF()) {
-            return null;
+            throw new UnexpectedEndOfInputException();
         }
         if (src.peek() == '$') {
             src.consume('$');
             src.consume('{');
             String varName = src.readUntil('}');
             src.consume('}');
-            return new TemplateToken(TemplateTokenKind.VAR, varName);
+            return TemplateToken.var(varName);
 
         } else if (src.peek() == '%') {
             // Get type of directive if or for
@@ -99,34 +98,34 @@ private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEn
                 String condition = src.readUntil('}');
                 src.skipWhitespace();
                 src.consume('}');
-                return new TemplateToken(TemplateTokenKind.IF_HEAD, condition);
+                return TemplateToken.if_head(condition);
             } else if (directive.equals("else")) {
                 src.skipWhitespace();
                 src.consume('}');
-                return new TemplateToken(TemplateTokenKind.IF_ELSE, "");
+                return TemplateToken.if_else();
             } else if (directive.equals("endif")) {
                 src.skipWhitespace();
                 src.consume('}');
-                return new TemplateToken(TemplateTokenKind.IF_END, "");
+                return TemplateToken.endif();
             } else if (directive.equals("for")) {
                 String head = src.readUntil('}');
                 src.skipWhitespace();
                 src.consume('}');
-                return new TemplateToken(TemplateTokenKind.FOR_HEAD, head);
+                return TemplateToken.for_head(head);
             } else if (directive.equals("endfor")) {
                 src.skipWhitespace();
                 src.consume('}');
-                return new TemplateToken(TemplateTokenKind.FOR_END, "");
+                return TemplateToken.for_end();
             } else {
                 throw new UnsupportedDirective(STR."Directive not supported: \{directive}");
             }
         } else {
-            String buffer = "";
+            StringBuilder buffer = new StringBuilder();
             // while no var or directive is encountered, all chars are consumed into a TEXT token
             while (!src.isEOF() && src.peek() != '$' && src.peek() != '%') {
-                buffer += src.next();
+                buffer.append(src.next());
             }
-            return new TemplateToken(TemplateTokenKind.TEXT, buffer);
+            return TemplateToken.text(buffer.toString());
         }
     }
 
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index 7ef97b08..624e5a44 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -1,5 +1,6 @@
 package talium.system.templateParser;
 
+import org.springframework.lang.NonNull;
 import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.ifParser.IfParser;
 import talium.system.templateParser.statements.*;
@@ -37,18 +38,14 @@ public List<Statement> parse() throws ParsingException {
     /**
      * Parses the next statement out of the stream of tokens
      */
+    @NonNull
     public Statement parseToken() throws ParsingException {
         TemplateToken current = src.next();
-        if (current == null) {
-            return null;
-        }
         if (current.kind() == TemplateTokenKind.TEXT) {
             return new TextStatement(current.value());
-        }
-        if (current.kind() == TemplateTokenKind.VAR) {
+        } else if (current.kind() == TemplateTokenKind.VAR) {
             return VarStatement.create(current.value());
-        }
-        if (current.kind() == TemplateTokenKind.IF_HEAD) {
+        } else if (current.kind() == TemplateTokenKind.IF_HEAD) {
             Comparison comparison = IfParser.parse(current.value());
             List<Statement> then = new ArrayList<>();
             List<Statement> other = new ArrayList<>();
@@ -71,8 +68,7 @@ public Statement parseToken() throws ParsingException {
                 }
             }
             return new IfStatement(comparison, then, other);
-        }
-        if (current.kind() == TemplateTokenKind.FOR_HEAD) {
+        } else if (current.kind() == TemplateTokenKind.FOR_HEAD) {
             String[] head = current.value().split(" in ");
             if (head.length < 2) {
                 throw new TemplateSyntaxException("Missing \"in\" in for definition!");
@@ -90,8 +86,13 @@ public Statement parseToken() throws ParsingException {
                 body.add(parseToken());
             }
             return new LoopStatement(head[0], head[1], body);
+        } else {
+            //covers:
+            //TemplateTokenKind.FOR_END
+            //TemplateTokenKind.IF_ELSE
+            //TemplateTokenKind.IF_END
+            return new TextStatement(current.value());
         }
-        return null;
     }
 
     /**
diff --git a/bot/main/talium/system/templateParser/tokens/TemplateToken.java b/bot/main/talium/system/templateParser/tokens/TemplateToken.java
index 625fc93c..dcfb765a 100644
--- a/bot/main/talium/system/templateParser/tokens/TemplateToken.java
+++ b/bot/main/talium/system/templateParser/tokens/TemplateToken.java
@@ -7,6 +7,35 @@
  * @param value string value of the token
  */
 public record TemplateToken(TemplateTokenKind kind, String value) {
+
+    public static TemplateToken text(String value) {
+        return new TemplateToken(TemplateTokenKind.TEXT, value);
+    }
+
+    public static TemplateToken var(String value) {
+        return new TemplateToken(TemplateTokenKind.VAR, value);
+    }
+
+    public static TemplateToken if_head(String value) {
+        return new TemplateToken(TemplateTokenKind.IF_HEAD, value);
+    }
+
+    public static TemplateToken if_else() {
+        return new TemplateToken(TemplateTokenKind.IF_ELSE, "%{ else }");
+    }
+
+    public static TemplateToken endif() {
+        return new TemplateToken(TemplateTokenKind.IF_END, "%{ endif }");
+    }
+
+    public static TemplateToken for_head(String value) {
+        return new TemplateToken(TemplateTokenKind.FOR_HEAD, value);
+    }
+
+    public static TemplateToken for_end() {
+        return new TemplateToken(TemplateTokenKind.FOR_END, "%{ endfor }");
+    }
+
     @Override
     public String toString() {
         return STR."\{kind}(\{value})";
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index dfa489a1..1dd8c542 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -4,8 +4,11 @@
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 import talium.system.templateParser.exeptions.UnexpectedTokenException;
 import talium.system.templateParser.exeptions.UnsupportedDirective;
+import talium.system.templateParser.tokens.TemplateToken;
 import talium.system.templateParser.tokens.TemplateTokenKind;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.fail;
 
 // the correct behaviour is not entirely specified, thats why this test is disabled by default.
@@ -76,4 +79,16 @@ void variable_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputE
             fail("Should have thrown an TemplateSyntaxException");
         } catch (UnexpectedTokenException _) { }
     }
+
+    @Test
+    void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
+        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
+    }
+
+    @Test
+    void unnecessary_tokens_to_text() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
+        assert new TemplateLexer("t%{ endif }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.endif()));
+        assert new TemplateLexer("t%{ endfor }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.for_end()));
+        assert new TemplateLexer("t%{ else }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.if_else()));
+    }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 51d3b062..1e46aa89 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -4,6 +4,7 @@
 import org.apache.commons.lang.math.RandomUtils;
 import org.junit.jupiter.api.Test;
 import talium.system.templateParser.exeptions.*;
+import talium.system.templateParser.statements.TextStatement;
 
 
 import java.util.ArrayList;
@@ -52,9 +53,15 @@ public class TemplateParserTest {
         tokensStrings.add(">");
         tokensStrings.add(">=");
         tokensStrings.add("for");
+        tokensStrings.add("in");
+        tokensStrings.add("[*]");
+        tokensStrings.add("item");
+        tokensStrings.add("itemList");
         tokensStrings.add("endfor");
         tokensStrings.add(".");
         tokensStrings.add("\"");
+        tokensStrings.add("%{ object in objectList }");
+        tokensStrings.add("%{ if variable.test == \"test\" }");
     }
 
     @Test
@@ -120,8 +127,14 @@ private void test(String src, int iteration) {
     }
 
     @Test
-    void testWeirdFor() {
-        //TODO this procudes a weird null in the statement list
-        test("for\"!=   1}for%{   endif }==<  ", 1);
+    void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
+        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
+    }
+
+    @Test
+    void unnecessary_tokens_to_text() throws ParsingException {
+        assert new TemplateParser("t%{ endif }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endif }")));
+        assert new TemplateParser("t%{ endfor }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")));
+        assert new TemplateParser("t%{ else }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ else }")));
     }
 }
\ No newline at end of file
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
index cf3affee..e913cfc7 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
@@ -11,7 +11,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class IfInterpreterTest {
-    //TODO add nulls
+    //TODO add checks for nulls
 
     @Nested
     class OperatorTests {

From 84f93cd784494c289554137117069de69011c9eb Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 15:50:42 +0100
Subject: [PATCH 22/58] with to using Class.getCanonicalName() to get package
 information

---
 bot/main/talium/Registrar.java                |  4 ++--
 .../system/inputSystem/HealthManager.java     |  9 ++++----
 .../system/stringTemplates/TemplateDTO.java   |  4 ++--
 .../FieldNotAccessibleException.java          |  2 +-
 .../ImpossibleComparisonException.java        | 22 ++++---------------
 .../ifParser/IfInterpreter.java               |  6 ++---
 .../templateParser/statements/Equals.java     | 14 +++++++++++-
 7 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 1a998439..94bd862f 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -37,8 +37,8 @@ public static void registerHealthDescription(String self, String title, String d
     }
 
     /// Register Custom HealthUI titel and description
-    public static void registerHealthDescription(Class self, String title, String description) {
-        HealthManager.addCustomization(self.getSimpleName(), title, description);
+    public static void registerHealthDescription(Class<?> self, String title, String description) {
+        HealthManager.addCustomization(self.getCanonicalName(), title, description);
     }
 
     public interface ResetableCache {
diff --git a/bot/main/talium/system/inputSystem/HealthManager.java b/bot/main/talium/system/inputSystem/HealthManager.java
index 5ee9b5ad..8fe510e5 100644
--- a/bot/main/talium/system/inputSystem/HealthManager.java
+++ b/bot/main/talium/system/inputSystem/HealthManager.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 public class HealthManager {
@@ -52,8 +51,8 @@ private static void checkCallback() {
         callback = null;
     }
 
-    public static void reportStatus(Class self, InputStatus status) {
-        reportStatus(self.getSimpleName(), status);
+    public static void reportStatus(Class<?> self, InputStatus status) {
+        reportStatus(self.getCanonicalName(), status);
     }
 
     public static void reportStatus(String self, InputStatus status) {
@@ -104,8 +103,8 @@ public static List<StringStatus> allStatuses() {
         return STATUS_DESCRIPTIONS.stream().map(status -> new StringStatus(status.title, status.status)).toList();
     }
 
-    public static InputStatus get(Class identifier) {
-        return get(identifier.getSimpleName());
+    public static InputStatus get(Class<?> identifier) {
+        return get(identifier.getCanonicalName());
     }
 
     public static InputStatus get(String identifier) {
diff --git a/bot/main/talium/system/stringTemplates/TemplateDTO.java b/bot/main/talium/system/stringTemplates/TemplateDTO.java
index c0e6cf8c..ca7e0fe2 100644
--- a/bot/main/talium/system/stringTemplates/TemplateDTO.java
+++ b/bot/main/talium/system/stringTemplates/TemplateDTO.java
@@ -21,7 +21,7 @@ public TemplateDTO(Template template) {
         this(template.id, template.template, template.messageColor, "");
     }
 
-    private static String buildJsonSchema(HashMap<String, Class> vars) {
+    private static String buildJsonSchema(HashMap<String, Class<?>> vars) {
         StringBuilder varJsonSchema = new StringBuilder("{");
         for (var var : vars.entrySet()) {
             varJsonSchema.append(STR."\"\{var.getKey()}\":\{generateSchema(var.getValue())}, ");
@@ -44,7 +44,7 @@ private static String generateSchema(Class clazz) {
                 || clazz == Double.class
                 || clazz == Boolean.class
         ) {
-            return STR."\"\{clazz.getSimpleName()}\"";
+            return STR."\"\{clazz.getCanonicalName()}\"";
         }
 
         if (clazz.isArray()) {
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java b/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
index 12daf997..1caee082 100644
--- a/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
+++ b/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
@@ -2,6 +2,6 @@
 
 public class FieldNotAccessibleException extends InterpretationException {
     public FieldNotAccessibleException(String fieldName, Class<?> onClass, Throwable cause) {
-        super("Field " + fieldName + " on + " + onClass.getSimpleName() + " is not accessible. Consider making the class and member fields public", cause);
+        super("Field " + fieldName + " on + " + onClass.getCanonicalName() + " is not accessible. Consider making the class and member fields public", cause);
     }
 }
diff --git a/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java b/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
index 3cc168ac..9306c947 100644
--- a/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
+++ b/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
@@ -1,23 +1,9 @@
 package talium.system.templateParser.exeptions;
 
-public class ImpossibleComparisonException extends InterpretationException {
-    public ImpossibleComparisonException(String message) {
-        super(message);
-    }
-
-    public ImpossibleComparisonException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ImpossibleComparisonException(Throwable cause) {
-        super(cause);
-    }
-
-    public ImpossibleComparisonException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
+import talium.system.templateParser.statements.Equals;
 
-    public ImpossibleComparisonException() {
+public class ImpossibleComparisonException extends InterpretationException {
+    public ImpossibleComparisonException(Object comparandA, Object comparandB, Equals operator) {
+        super("Impossible comparing " + (comparandA == null ? "null" : comparandA.getClass().getCanonicalName()) + " and " + (comparandB == null ? "null" : comparandB.getClass().getCanonicalName()) + " via operator " + operator);
     }
-
 }
diff --git a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
index 790c5315..1d888d42 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
@@ -40,14 +40,14 @@ public static boolean compare(Comparison comp) throws ImpossibleComparisonExcept
                 case EQUALS -> left.equals(right);
                 case NOT_EQUALS -> !left.equals(right);
                 case LESS_THAN, LESS_THAN_OR_EQUALS, GREATER_THAN, GREATER_THAN_OR_EQUALS ->
-                        throw new ImpossibleComparisonException(STR."\{comp.equals().name()} is not a supported comparison operation between Strings/Charactern");
+                        throw new ImpossibleComparisonException(l, r, comp.equals());
             };
         } else if (l instanceof Boolean && r instanceof Boolean) {
             return switch (comp.equals()) {
                 case EQUALS -> l.equals(r);
                 case NOT_EQUALS -> !l.equals(r);
                 case LESS_THAN, LESS_THAN_OR_EQUALS, GREATER_THAN, GREATER_THAN_OR_EQUALS ->
-                        throw new ImpossibleComparisonException(STR."\{comp.equals().name()} is not a supported comparison operation between booleans");
+                        throw new ImpossibleComparisonException(l, r, comp.equals());
             };
         } else if ((l instanceof Double || l instanceof Float) && (r instanceof Double || r instanceof Float)) {
             Double ld = ((Number) l).doubleValue();
@@ -58,7 +58,7 @@ public static boolean compare(Comparison comp) throws ImpossibleComparisonExcept
             Long rl = ((Number) r).longValue();
             return compareLongs(ll, comp.equals(), rl);
         } else {
-            throw new ImpossibleComparisonException(STR."Types \{l.getClass()} and \{r.getClass()} are not comparable to each other");
+            throw new ImpossibleComparisonException(l, r, comp.equals());
         }
     }
 
diff --git a/bot/main/talium/system/templateParser/statements/Equals.java b/bot/main/talium/system/templateParser/statements/Equals.java
index 3cdc567c..d737b7d9 100644
--- a/bot/main/talium/system/templateParser/statements/Equals.java
+++ b/bot/main/talium/system/templateParser/statements/Equals.java
@@ -6,5 +6,17 @@ public enum Equals {
     GREATER_THAN,
     GREATER_THAN_OR_EQUALS,
     LESS_THAN,
-    LESS_THAN_OR_EQUALS,
+    LESS_THAN_OR_EQUALS;
+
+    @Override
+    public String toString() {
+        return switch (this) {
+            case EQUALS -> "==";
+            case NOT_EQUALS -> "!=";
+            case GREATER_THAN -> ">";
+            case GREATER_THAN_OR_EQUALS -> ">=";
+            case LESS_THAN -> "<";
+            case LESS_THAN_OR_EQUALS -> "<=";
+        };
+    }
 }

From 68711e218bd811fea4b71e09d5ce805c0f2c6115 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 15:51:36 +0100
Subject: [PATCH 23/58] add template if comparator null tests

---
 .../ifParser/IfInterpreter.java               | 14 ++++++--
 .../ifParser/IfInterpreterTest.java           | 35 ++++++++++++++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
index 1d888d42..8cf11f76 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
@@ -23,6 +23,7 @@ public class IfInterpreter {
      * <br>
      * <br>
      * All ints and floats are cast into longs and floats respectively.
+     *
      * @param comp prepared comparison
      * @return boolean result
      */
@@ -30,9 +31,18 @@ public static boolean compare(Comparison comp) throws ImpossibleComparisonExcept
         Object l = comp.left();
         Object r = comp.right();
         if (l == null && r == null) {
-            return true;
+            //both are null
+            return switch (comp.equals()) {
+                case EQUALS, LESS_THAN_OR_EQUALS, GREATER_THAN_OR_EQUALS -> true;
+                case NOT_EQUALS, LESS_THAN, GREATER_THAN -> false;
+            };
         } else if (l == null || r == null) {
-            return false;
+            //one is null
+            return switch (comp.equals()) {
+                case EQUALS -> false;
+                case NOT_EQUALS -> true;
+                default -> throw new ImpossibleComparisonException(l, r, comp.equals());
+            };
         } else if ((l instanceof String || l instanceof Character) && (r instanceof String || r instanceof Character)) {
             String left = l.toString();
             String right = r.toString();
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
index e913cfc7..e5ea73eb 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
@@ -11,7 +11,6 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class IfInterpreterTest {
-    //TODO add checks for nulls
 
     @Nested
     class OperatorTests {
@@ -205,4 +204,38 @@ void object_boolean() {
             } catch (ImpossibleComparisonException _) {}
         }
     }
+
+    @Nested
+    class Nulls {
+        @Test
+        void null_null() throws ImpossibleComparisonException {
+            assert IfInterpreter.compare(new Comparison(null, Equals.EQUALS, null));
+            assert !IfInterpreter.compare(new Comparison(null, Equals.NOT_EQUALS, null));
+        }
+        @Test
+        void null_int() throws ImpossibleComparisonException {
+            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021));
+            assert IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null));
+        }
+        @Test
+        void null_double() throws ImpossibleComparisonException {
+            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 29.12939349232));
+            assert IfInterpreter.compare(new Comparison(9289498293.39323, Equals.NOT_EQUALS, null));
+        }
+        @Test
+        void null_string() throws ImpossibleComparisonException {
+            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021));
+            assert IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null));
+        }
+        @Test
+        void null_boolean() throws ImpossibleComparisonException {
+            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, false));
+            assert IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, null));
+        }
+        @Test
+        void null_Object() throws ImpossibleComparisonException {
+            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, new Object()));
+            assert IfInterpreter.compare(new Comparison(new ArrayList<Exception>(), Equals.NOT_EQUALS, null));
+        }
+    }
 }

From eb20611a76a79c12f51fcac32ca90df05cd26441 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 15:58:14 +0100
Subject: [PATCH 24/58] use record pattern, change to string builder to reduce
 reallocations

---
 .../templateParser/TemplateInterpreter.java   | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index 52b00e56..d04886e7 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -26,36 +26,32 @@ public static String populate(List<Statement> template, HashMap<String, Object>
         if (values == null) {
             values = new HashMap<>();
         }
-        String out = "";
+        StringBuilder out = new StringBuilder();
         for (Statement statement : template) {
-            if (statement instanceof TextStatement textStatement) {
-                out += textStatement.text();
+            if (statement instanceof TextStatement(String text)) {
+                out.append(text);
             } else if (statement instanceof VarStatement varStatement) {
                 Object nestedReplacement = getNestedReplacement(varStatement, values);
-                if (nestedReplacement == null) {
-                    out += "null";
-                } else {
-                    out += nestedReplacement.toString();
-                }
-            } else if (statement instanceof IfStatement ifStatement) {
+                out.append(nestedReplacement);
+            } else if (statement instanceof IfStatement(Comparison comparison, List<Statement> then, List<Statement> other)) {
                 // replace Vars with actual values
-                Object left = ifStatement.comparison().left();
+                Object left = comparison.left();
                 if (left instanceof VarStatement leftVar) {
                     left = castToValidInput(getNestedReplacement(leftVar, values));
                 }
-                Object right = ifStatement.comparison().right();
+                Object right = comparison.right();
                 if (right instanceof VarStatement rightVar) {
                     right = castToValidInput(getNestedReplacement(rightVar, values));
                 }
 
-                boolean condition = IfInterpreter.compare(new Comparison(left, ifStatement.comparison().equals(), right));
+                boolean condition = IfInterpreter.compare(new Comparison(left, comparison.equals(), right));
                 if (condition) {
-                    out += populate(ifStatement.then(), values);
+                    out.append(populate(then, values));
                 } else {
-                    out += populate(ifStatement.other(), values);
+                    out.append(populate(other, values));
                 }
-            } else if (statement instanceof LoopStatement loop) {
-                String[] varParts = loop.var().split("\\[*]");
+            } else if (statement instanceof LoopStatement(String name, String var, List<Statement> body)) {
+                String[] varParts = var.split("\\[*]");
                 //TODO here is probably also an error
                 // this varstatement should be created in parsing
                 Object nestedReplacement = null;
@@ -69,18 +65,18 @@ public static String populate(List<Statement> template, HashMap<String, Object>
 
                 //noinspection unchecked
                 for (Object item : (Iterable<Object>) nestedReplacement) {
-                    values.put(loop.name(), item);
+                    values.put(name, item);
                     if (varParts.length > 1) {
                         try {
-                        values.put(loop.name(), getNestedReplacement(VarStatement.create(varParts[1]), values));
+                        values.put(name, getNestedReplacement(VarStatement.create(varParts[1]), values));
                         } catch (TemplateSyntaxException _) {}
                     }
-                    out += populate(loop.body(), values);
+                    out.append(populate(body, values));
                 }
-                values.remove(loop.name());
+                values.remove(name);
             }
         }
-        return out;
+        return out.toString();
     }
 
     /**

From 45cab61ac5daa039d3d11845726bc6b44f34b0c4 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 16:50:40 +0100
Subject: [PATCH 25/58] fully parse loop directive in parsing step, fix
 missing_percent test, remove wildcard destructuring support in loops, add
 test environment for fuzzing

---
 .../templateParser/TemplateInterpreter.java   | 69 ++++++++-----------
 .../system/templateParser/TemplateParser.java |  8 +--
 .../UnIterableArgumentException.java          |  2 +-
 .../statements/LoopStatement.java             |  2 +-
 .../TemplateInterpreterTest.java              |  6 +-
 .../templateParser/TemplateLexerTest.java     | 11 ++-
 .../templateParser/TemplateParserTest.java    | 23 +++++--
 7 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index d04886e7..29d1e296 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -9,6 +9,7 @@
 import java.lang.reflect.InaccessibleObjectException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Populates variables and interprets parsed String templates
@@ -19,61 +20,48 @@ public class TemplateInterpreter {
      * Populates variables and interprets parsed String templates
      *
      * @param template parsed template as list of statements
-     * @param values a map with all top level variables and their names
+     * @param environment a map with all top level variables and their names
      * @return the resulting string
      */
-    public static String populate(List<Statement> template, HashMap<String, Object> values) throws InterpretationException  {
-        if (values == null) {
-            values = new HashMap<>();
+    public static String populate(List<Statement> template, Map<String, Object> environment) throws InterpretationException  {
+        if (environment == null) {
+            environment = new HashMap<>();
         }
         StringBuilder out = new StringBuilder();
         for (Statement statement : template) {
             if (statement instanceof TextStatement(String text)) {
                 out.append(text);
             } else if (statement instanceof VarStatement varStatement) {
-                Object nestedReplacement = getNestedReplacement(varStatement, values);
+                Object nestedReplacement = getNestedReplacement(varStatement, environment);
                 out.append(nestedReplacement);
             } else if (statement instanceof IfStatement(Comparison comparison, List<Statement> then, List<Statement> other)) {
                 // replace Vars with actual values
                 Object left = comparison.left();
                 if (left instanceof VarStatement leftVar) {
-                    left = castToValidInput(getNestedReplacement(leftVar, values));
+                    left = castToValidInput(getNestedReplacement(leftVar, environment));
                 }
                 Object right = comparison.right();
                 if (right instanceof VarStatement rightVar) {
-                    right = castToValidInput(getNestedReplacement(rightVar, values));
+                    right = castToValidInput(getNestedReplacement(rightVar, environment));
                 }
 
-                boolean condition = IfInterpreter.compare(new Comparison(left, comparison.equals(), right));
-                if (condition) {
-                    out.append(populate(then, values));
+                if (IfInterpreter.compare(new Comparison(left, comparison.equals(), right))) {
+                    out.append(populate(then, environment));
                 } else {
-                    out.append(populate(other, values));
+                    out.append(populate(other, environment));
                 }
-            } else if (statement instanceof LoopStatement(String name, String var, List<Statement> body)) {
-                String[] varParts = var.split("\\[*]");
-                //TODO here is probably also an error
-                // this varstatement should be created in parsing
-                Object nestedReplacement = null;
-                try {
-                    nestedReplacement = getNestedReplacement(VarStatement.create(varParts[0]), values);
-                } catch (TemplateSyntaxException _) {}
+            } else if (statement instanceof LoopStatement(String varName, VarStatement var, List<Statement> body)) {
+                Object list = getNestedReplacement(var, environment);
 
-                if (!(nestedReplacement instanceof Iterable<?>)) {
-                    throw new UnIterableArgumentException(varParts[0]);
+                if (!(list instanceof Iterable<?>)) {
+                    throw new UnIterableArgumentException(var.accessExpr());
                 }
 
-                //noinspection unchecked
-                for (Object item : (Iterable<Object>) nestedReplacement) {
-                    values.put(name, item);
-                    if (varParts.length > 1) {
-                        try {
-                        values.put(name, getNestedReplacement(VarStatement.create(varParts[1]), values));
-                        } catch (TemplateSyntaxException _) {}
-                    }
-                    out.append(populate(body, values));
+                for (Object item : (Iterable<?>) list) {
+                    environment.put(varName, item);
+                    out.append(populate(body, environment));
                 }
-                values.remove(name);
+                environment.remove(varName);
             }
         }
         return out.toString();
@@ -100,24 +88,27 @@ public static Object castToValidInput(Object input) {
 
     //TODO this should probably be tested more
     /**
-     * Tries to resolve and get the Value at the given variable path.
-     * Throws an Exception if the path does not exist.
+     * Tries to resolve and get the Value at the given field access expression from the environment map.
      *
      * @param varExpr dot . delimited path of variable names
-     * @param values  List of top level variables
+     * @param environment List of top level variables
      * @return value of the variable, this can be null, if the last field is returning the null value
-     * @apiNote Does not support getters or any functions
+     * @apiNote Does not support getters or executing any functions
+     * @throws FieldDoesNotExistException if the variable to be accessed does not exist on the object, or in the environment
+     * @throws VariableValueNullException if the value of a variable is null, but a field on this variable is supposed to be accessed
+     * @throws FieldNotAccessibleException if the value of the field can not be retrieved because of java visibility checks (e.g. private
+     * @throws InterpretationException is thrown when a state is reached that should not be possible. This indicates an actual bug, instead of an error with the template string.
      */
-    public static Object getNestedReplacement(VarStatement varExpr, HashMap<String, Object> values) throws InterpretationException  {
+    public static Object getNestedReplacement(VarStatement varExpr, Map<String, Object> environment) throws InterpretationException  {
         String[] variableNames = varExpr.accessExpr().split("\\.");
         if (variableNames.length == 0) {
             //TODO kinda a panic, we should never be here
             throw new InterpretationException("");
         }
-        if (!values.containsKey(variableNames[0])) {
-            throw new FieldDoesNotExistException(variableNames[0], values.keySet());
+        if (!environment.containsKey(variableNames[0])) {
+            throw new FieldDoesNotExistException(variableNames[0], environment.keySet());
         }
-        Object variable = values.get(variableNames[0]);
+        Object variable = environment.get(variableNames[0]);
         for (int i = 1; i < variableNames.length; i++) {
             if (variable == null) {
                 throw new VariableValueNullException(variableNames[i - 1]);
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index 624e5a44..79e0aa19 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -73,9 +73,6 @@ public Statement parseToken() throws ParsingException {
             if (head.length < 2) {
                 throw new TemplateSyntaxException("Missing \"in\" in for definition!");
             }
-            if (StringUtils.countMatches(head[1], "[*]") > 1) {
-                throw new TemplateSyntaxException("Only one wildcard allowed in a for statement");
-            }
             List<Statement> body = new ArrayList<>();
             while (!src.isEOF()) { // mostly equivalent to while(true), but with a overrun check
                 var curr = src.peek();
@@ -85,7 +82,8 @@ public Statement parseToken() throws ParsingException {
                 }
                 body.add(parseToken());
             }
-            return new LoopStatement(head[0], head[1], body);
+            VarStatement listVar = VarStatement.create(head[1].trim());
+            return new LoopStatement(head[0].trim(), listVar, body);
         } else {
             //covers:
             //TemplateTokenKind.FOR_END
@@ -117,7 +115,7 @@ public static void debugPrint(List<Statement> statements, int depth) {
                 System.out.println(STR."\{indent}},");
             }
             if (statement instanceof LoopStatement forStatement) {
-                System.out.println(STR."\{indent}FOR: \{forStatement.name()} in \{forStatement.var()} {");
+                System.out.println(STR."\{indent}FOR: \{forStatement.varName()} in \{forStatement.var()} {");
                 debugPrint(forStatement.body(), depth + 1);
                 System.out.println(STR."\{indent}},");
             }
diff --git a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java b/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
index efca26ad..95c2eb16 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
@@ -2,6 +2,6 @@
 
 public class UnIterableArgumentException extends InterpretationException {
     public UnIterableArgumentException(String argName) {
-        super(STR."\{argName == null ? "Argument" : argName} must implement Iterable.");
+        super(STR."\{argName == null ? "Argument" : argName} must implement java.lang.Iterable.");
     }
 }
diff --git a/bot/main/talium/system/templateParser/statements/LoopStatement.java b/bot/main/talium/system/templateParser/statements/LoopStatement.java
index f0f31e65..1f80b6ba 100644
--- a/bot/main/talium/system/templateParser/statements/LoopStatement.java
+++ b/bot/main/talium/system/templateParser/statements/LoopStatement.java
@@ -2,4 +2,4 @@
 
 import java.util.List;
 
-public record LoopStatement(String name, String var, List<Statement> body) implements Statement {}
+public record LoopStatement(String varName, VarStatement var, List<Statement> body) implements Statement {}
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index 46f70dfe..419c6c04 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -35,7 +35,7 @@ public class TemplateInterpreterTest {
             );
             TEMPLATE_LOOP = List.of(
                     new TextStatement("Hello,"),
-                    new LoopStatement("varName", "loopVar", Arrays.asList(
+                    new LoopStatement("varName", VarStatement.create("loopVar"), Arrays.asList(
                             new TextStatement(" "),
                             VarStatement.create("varName")
                     )),
@@ -43,8 +43,8 @@ public class TemplateInterpreterTest {
             );
             NESTED_LOOP = Arrays.asList(
                     new TextStatement("Hello,"),
-                    new LoopStatement("innerLoop", "loopVar", Arrays.asList(
-                            new LoopStatement("varName", "innerLoop", Arrays.asList(
+                    new LoopStatement("innerLoop", VarStatement.create("loopVar"), Arrays.asList(
+                            new LoopStatement("varName", VarStatement.create("innerLoop"), Arrays.asList(
                                     new TextStatement(" "),
                                     VarStatement.create("varName")
                             )),
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index 1dd8c542..74e2ec67 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -43,8 +43,15 @@ void missing_closing_bracket_directive() throws UnsupportedDirective, Unexpected
 
     @Test
     void missing_percent() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        TemplateLexer lex = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed{ endif }");
-        System.out.println(lex.parse());
+        var tokens = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed{ endif }").parse();
+        assert tokens.size() == 5;
+        assert tokens.get(0).kind() == TemplateTokenKind.TEXT;
+        assert tokens.get(0).value().equals("Hello, ");
+        assert tokens.get(1).kind() == TemplateTokenKind.IF_HEAD;
+        assert tokens.get(2).kind() == TemplateTokenKind.VAR;
+        assert tokens.get(3).kind() == TemplateTokenKind.IF_ELSE;
+        assert tokens.get(4).kind() == TemplateTokenKind.TEXT;
+        assert tokens.get(4).value().equals("unnamed{ endif }");
     }
 
     @Test
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 1e46aa89..572353de 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -8,12 +8,15 @@
 
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class TemplateParserTest {
     private static final List<String> tokensStrings = new ArrayList<>();
+    private static final Map<String, Object> environment = new HashMap<>();
 
     static {
         tokensStrings.add(" ");
@@ -62,6 +65,14 @@ public class TemplateParserTest {
         tokensStrings.add("\"");
         tokensStrings.add("%{ object in objectList }");
         tokensStrings.add("%{ if variable.test == \"test\" }");
+
+        environment.put("test", "test");
+        environment.put("object", new Object());
+        environment.put("list", List.of("1", "2", "3"));
+        environment.put("b", true);
+        environment.put("f", 90293.129);
+        environment.put("n", 2828);
+        environment.put("nu", null);
     }
 
     @Test
@@ -113,12 +124,10 @@ private void tokenFuzzing(int n, int length) {
     private void test(String src, int iteration) {
         try {
             var statements = new TemplateParser(src).parse();
-            var res = TemplateInterpreter.populate(statements, null);
-            if (src.contains("$") || src.contains("%")) {
-                System.out.println("i: " + iteration + " -> Statement Stream:");
-                System.out.println(statements);
-                fail("Should likely have thrown for: " + src);
+            if (statements.contains(null)) {
+                fail("Statementlist contains null statement");
             }
+            TemplateInterpreter.populate(statements, environment);
         } catch (StringTemplateException _) {
         } catch (Exception e) {
             System.out.println("i: " + iteration + " -> Source Input: " + src);
@@ -137,4 +146,8 @@ void unnecessary_tokens_to_text() throws ParsingException {
         assert new TemplateParser("t%{ endfor }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")));
         assert new TemplateParser("t%{ else }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ else }")));
     }
+
+    //TODO add end-to-end tests, input string and environment, test result string
+
+    //TODO probably not this file, but test loop directive
 }
\ No newline at end of file

From e918453753c8732bbbdd37c73f4ff70805e0f443 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 19:57:02 +0100
Subject: [PATCH 26/58] fixed if_parser exception with malformed number

---
 .../exeptions/TemplateSyntaxException.java    |  4 ++
 .../templateParser/ifParser/IfParser.java     | 38 ++++++++++++-------
 .../templateParser/ifParser/IfParserTest.java | 12 ++++++
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java b/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
index 5dee51c8..49d535ee 100644
--- a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
+++ b/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
@@ -12,4 +12,8 @@ public TemplateSyntaxException(Character expected, Character actual, int atIndex
     public TemplateSyntaxException(String message) {
         super(message);
     }
+
+    public TemplateSyntaxException(String message, Throwable cause) {
+        super(message, cause);
+    }
 }
diff --git a/bot/main/talium/system/templateParser/ifParser/IfParser.java b/bot/main/talium/system/templateParser/ifParser/IfParser.java
index b2fdd86c..04e64719 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfParser.java
+++ b/bot/main/talium/system/templateParser/ifParser/IfParser.java
@@ -1,5 +1,6 @@
 package talium.system.templateParser.ifParser;
 
+import org.springframework.lang.NonNull;
 import talium.system.templateParser.CharakterStream;
 import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.statements.Equals;
@@ -63,6 +64,7 @@ public static Comparison parse(String srcString) throws UnexpectedEndOfInputExce
      * @param src source character stream
      * @return the parsed token
      */
+    @NonNull
     private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInputException, UnexpectedTokenException {
         //TODO rebuild to consume one character per loop, save current state in var
         if (src.isEOF()) {
@@ -103,19 +105,29 @@ private static IfToken parseToken(CharakterStream src) throws UnexpectedEndOfInp
      * get inner value out of token
      */
     private static Object tokenToObject(IfToken token) throws TemplateSyntaxException {
-        return switch (token.kind()) {
-            case STRING -> token.value();
-            case VAR -> VarStatement.create(token.value());
-            case INT -> {
-                var initialLong = Long.parseLong(token.value());
-                if (initialLong > Integer.MIN_VALUE && initialLong < Integer.MAX_VALUE) {
-                    yield (int) initialLong;
+        if (token == null) {
+            throw new TemplateSyntaxException("Panik: IfToken is null");
+        }
+        try {
+            return switch (token.kind()) {
+                case STRING -> token.value();
+                case VAR -> VarStatement.create(token.value());
+                case INT -> {
+                    var initialLong = Long.parseLong(token.value());
+                    if (initialLong > Integer.MIN_VALUE && initialLong < Integer.MAX_VALUE) {
+                        yield (int) initialLong;
+                    }
+                    yield initialLong;
                 }
-                yield initialLong;
-            }
-            case DOUBLE -> Double.parseDouble(token.value());
-            case BOOLEAN -> Boolean.parseBoolean(token.value());
-            case COMPARISON -> throw new TemplateSyntaxException("Another Comparison not a valid Object for an comparison comparand");
-        };
+                case DOUBLE -> Double.parseDouble(token.value());
+                case BOOLEAN -> Boolean.parseBoolean(token.value());
+                case COMPARISON ->
+                        throw new TemplateSyntaxException("Another Comparison not a valid Object for an comparison comparand");
+            };
+        } catch (NumberFormatException e) {
+            throw new TemplateSyntaxException(token.value() + " is not a valid number", e);
+        } catch (NullPointerException e) {
+            throw new TemplateSyntaxException("null is not a valid number", e);
+        }
     }
 }
diff --git a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
index 2c95b906..350b1da8 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
@@ -62,4 +62,16 @@ void test_types() throws UnsupportedComparisonOperator, TemplateSyntaxException,
         var double_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 3.1415d);
         assert parse("var.name == 3.1415").equals(double_);
     }
+
+    @Test
+    void malformed_number() throws UnexpectedEndOfInputException, UnsupportedComparisonOperator, TemplateSyntaxException {
+        try {
+            parse("  1\"string%{ <= .SPECIAL TEXTendfor[*]SPECIAL TEXT");
+            fail();
+        } catch (TemplateSyntaxException e) {
+            if (!(e.getCause() instanceof NumberFormatException)) {
+                throw e;
+            }
+        }
+    }
 }

From eca4536a90c263985ad6f43ea07d03f0fd805e60 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 21:56:33 +0100
Subject: [PATCH 27/58] run test scripts on pull requests

---
 .github/workflows/build.yml |  6 +++---
 .github/workflows/test.yml  | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3eee7d8e..5d260dcd 100644
--- a/.github/workflows/build.yml
+++ b/.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:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..4e0a74ca
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,23 @@
+name: Test
+
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    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

From 6bc6550e71842868e54daf4808de980bacd6a589 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 21:57:47 +0100
Subject: [PATCH 28/58] fix pipeline

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4e0a74ca..847126c3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,3 +21,6 @@ jobs:
           JAVA_TOOL_OPTIONS: --enable-preview
       - name: Run all Tests
         run: mvn test
+        working-directory: bot
+        env:
+          JAVA_TOOL_OPTIONS: --enable-preview

From cff08d232b9992bb2a1709ed609c5dcfeb5ecaf0 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Sun, 2 Feb 2025 23:38:37 +0100
Subject: [PATCH 29/58] upgrade package.json

---
 panel/package-lock.json | 2369 +++++++++++++++++++++++----------------
 panel/package.json      |    8 +-
 2 files changed, 1391 insertions(+), 986 deletions(-)

diff --git a/panel/package-lock.json b/panel/package-lock.json
index 0904752b..2b200fe3 100644
--- a/panel/package-lock.json
+++ b/panel/package-lock.json
@@ -20,6 +20,8 @@
         "@radix-ui/react-tabs": "^1.1.1",
         "@radix-ui/react-toast": "^1.1.5",
         "@radix-ui/react-tooltip": "^1.1.3",
+        "@tailwindcss/postcss": "^4.0.3",
+        "@tailwindcss/vite": "^4.0.3",
         "class-variance-authority": "^0.7.0",
         "clsx": "^2.1.1",
         "date-fns": "^3.6.0",
@@ -36,9 +38,9 @@
         "@types/node": "^20.12.7",
         "@types/react": "^18.2.66",
         "@types/react-dom": "^18.2.22",
-        "@typescript-eslint/eslint-plugin": "^7.2.0",
-        "@typescript-eslint/parser": "^7.2.0",
-        "@vitejs/plugin-react": "^4.2.1",
+        "@typescript-eslint/eslint-plugin": "^8.22.0",
+        "@typescript-eslint/parser": "^8.22.0",
+        "@vitejs/plugin-react": "^4.3.4",
         "autoprefixer": "^10.4.19",
         "eslint": "^8.57.0",
         "eslint-plugin-react-hooks": "^4.6.0",
@@ -46,7 +48,7 @@
         "postcss": "^8.4.38",
         "tailwindcss": "^3.4.3",
         "typescript": "^5.2.2",
-        "vite": "^5.2.0"
+        "vite": "^6.0.11"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -62,6 +64,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -83,12 +86,13 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.24.2",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -96,30 +100,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz",
-      "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
+      "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz",
-      "integrity": "sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
+      "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.4",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.4",
-        "@babel/parser": "^7.24.4",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.5",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helpers": "^7.26.7",
+        "@babel/parser": "^7.26.7",
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.26.7",
+        "@babel/types": "^7.26.7",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -144,29 +148,30 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-      "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.0",
+        "@babel/parser": "^7.26.5",
+        "@babel/types": "^7.26.5",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
-        "browserslist": "^4.22.2",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -183,63 +188,28 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
-      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.24.0"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -249,99 +219,62 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
-      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
-      "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz",
-      "integrity": "sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
+      "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+    "node_modules/@babel/parser": {
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/types": "^7.26.7"
       },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.24.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-      "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
-      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -350,12 +283,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz",
-      "integrity": "sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.25.9.tgz",
+      "integrity": "sha512-y8quW6p0WHkEhmErnfe58r7x0A70uKphQm8Sp8cV7tjNQwK56sNVK0M73LK3WuYmsuyrftut4xAkjjgU0twaMg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -365,12 +298,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.1.tgz",
-      "integrity": "sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.25.9.tgz",
+      "integrity": "sha512-+iqjT8xmXhhYv4/uiYd8FNQsraMFZIfxVSqxxVSZP0WbbSAWvBXAul0m/zu+7Vv4O/3WtApy9pmaTMiumEZgfg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -391,33 +324,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+      "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.7",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -426,385 +356,391 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
+      "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -993,6 +929,7 @@
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
       "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "license": "ISC",
       "dependencies": {
         "string-width": "^5.1.2",
         "string-width-cjs": "npm:string-width@^4.2.0",
@@ -1006,9 +943,10 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -1020,6 +958,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -1109,6 +1048,7 @@
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
       "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=14"
@@ -3704,272 +3644,541 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz",
-      "integrity": "sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.0.tgz",
+      "integrity": "sha512-Eeao7ewDq79jVEsrtWIj5RNqB8p2knlm9fhR6uJ2gqP7UfbLrTrxevudVrEPDM7Wkpn/HpRC2QfazH7MXLz3vQ==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz",
-      "integrity": "sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.0.tgz",
+      "integrity": "sha512-yVh0Kf1f0Fq4tWNf6mWcbQBCLDpDrDEl88lzPgKhrgTcDrTtlmun92ywEF9dCjmYO3EFiSuJeeo9cYRxl2FswA==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz",
-      "integrity": "sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.0.tgz",
+      "integrity": "sha512-gCs0ErAZ9s0Osejpc3qahTsqIPUDjSKIyxK/0BGKvL+Tn0n3Kwvj8BrCv7Y5sR1Ypz1K2qz9Ny0VvkVyoXBVUQ==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz",
-      "integrity": "sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.0.tgz",
+      "integrity": "sha512-aIB5Anc8hngk15t3GUkiO4pv42ykXHfmpXGS+CzM9CTyiWyT8HIS5ygRAy7KcFb/wiw4Br+vh1byqcHRTfq2tQ==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.0.tgz",
+      "integrity": "sha512-kpdsUdMlVJMRMaOf/tIvxk8TQdzHhY47imwmASOuMajg/GXpw8GKNd8LNwIHE5Yd1onehNpcUB9jHY6wgw9nHQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.0.tgz",
+      "integrity": "sha512-D0RDyHygOBCQiqookcPevrvgEarN0CttBecG4chOeIYCNtlKHmf5oi5kAVpXV7qs0Xh/WO2RnxeicZPtT50V0g==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz",
-      "integrity": "sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.0.tgz",
+      "integrity": "sha512-mCIw8j5LPDXmCOW8mfMZwT6F/Kza03EnSr4wGYEswrEfjTfVsFOxvgYfuRMxTuUF/XmRb9WSMD5GhCWDe2iNrg==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz",
-      "integrity": "sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.0.tgz",
+      "integrity": "sha512-AwwldAu4aCJPob7zmjuDUMvvuatgs8B/QiVB0KwkUarAcPB3W+ToOT+18TQwY4z09Al7G0BvCcmLRop5zBLTag==",
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz",
-      "integrity": "sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.0.tgz",
+      "integrity": "sha512-e7kDUGVP+xw05pV65ZKb0zulRploU3gTu6qH1qL58PrULDGxULIS0OSDQJLH7WiFnpd3ZKUU4VM3u/Z7Zw+e7Q==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz",
-      "integrity": "sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.0.tgz",
+      "integrity": "sha512-SXYJw3zpwHgaBqTXeAZ31qfW/v50wq4HhNVvKFhRr5MnptRX2Af4KebLWR1wpxGJtLgfS2hEPuALRIY3LPAAcA==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.0.tgz",
+      "integrity": "sha512-e5XiCinINCI4RdyU3sFyBH4zzz7LiQRvHqDtRe9Dt8o/8hTBaYpdPimayF00eY2qy5j4PaaWK0azRgUench6WQ==",
+      "cpu": [
+        "loong64"
+      ],
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz",
-      "integrity": "sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.0.tgz",
+      "integrity": "sha512-3SWN3e0bAsm9ToprLFBSro8nJe6YN+5xmB11N4FfNf92wvLye/+Rh5JGQtKOpwLKt6e61R1RBc9g+luLJsc23A==",
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz",
-      "integrity": "sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.0.tgz",
+      "integrity": "sha512-B1Oqt3GLh7qmhvfnc2WQla4NuHlcxAD5LyueUi5WtMc76ZWY+6qDtQYqnxARx9r+7mDGfamD+8kTJO0pKUJeJA==",
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz",
-      "integrity": "sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.0.tgz",
+      "integrity": "sha512-UfUCo0h/uj48Jq2lnhX0AOhZPSTAq3Eostas+XZ+GGk22pI+Op1Y6cxQ1JkUuKYu2iU+mXj1QjPrZm9nNWV9rg==",
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz",
-      "integrity": "sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.0.tgz",
+      "integrity": "sha512-chZLTUIPbgcpm+Z7ALmomXW8Zh+wE2icrG+K6nt/HenPLmtwCajhQC5flNSk1Xy5EDMt/QAOz2MhzfOfJOLSiA==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz",
-      "integrity": "sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.0.tgz",
+      "integrity": "sha512-jo0UolK70O28BifvEsFD/8r25shFezl0aUk2t0VJzREWHkq19e+pcLu4kX5HiVXNz5qqkD+aAq04Ct8rkxgbyQ==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz",
-      "integrity": "sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.0.tgz",
+      "integrity": "sha512-Vmg0NhAap2S54JojJchiu5An54qa6t/oKT7LmDaWggpIcaiL8WcWHEN6OQrfTdL6mQ2GFyH7j2T5/3YPEDOOGA==",
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz",
-      "integrity": "sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.0.tgz",
+      "integrity": "sha512-CV2aqhDDOsABKHKhNcs1SZFryffQf8vK2XrxP6lxC99ELZAdvsDgPklIBfd65R8R+qvOm1SmLaZ/Fdq961+m7A==",
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz",
-      "integrity": "sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.0.tgz",
+      "integrity": "sha512-g2ASy1QwHP88y5KWvblUolJz9rN+i4ZOsYzkEwcNfaNooxNUXG+ON6F5xFo0NIItpHqxcdAyls05VXpBnludGw==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "optional": true,
       "os": [
         "win32"
       ]
     },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
+    "node_modules/@tailwindcss/node": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.0.3.tgz",
+      "integrity": "sha512-QsVJokOl0pJ4AbJV33D2npvLcHGPWi5MOSZtrtE0GT3tSx+3D0JE2lokLA8yHS1x3oCY/3IyRyy7XX6tmzid7A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
+        "enhanced-resolve": "^5.18.0",
+        "jiti": "^2.4.2",
+        "tailwindcss": "4.0.3"
       }
     },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
-      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
+    "node_modules/@tailwindcss/node/node_modules/tailwindcss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.3.tgz",
+      "integrity": "sha512-ImmZF0Lon5RrQpsEAKGxRvHwCvMgSC4XVlFRqmbzTEDb/3wvin9zfEZrMwgsa3yqBbPqahYcVI6lulM2S7IZAA==",
+      "license": "MIT"
     },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
+    "node_modules/@tailwindcss/oxide": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.0.3.tgz",
+      "integrity": "sha512-FFcp3VNvRjjmFA39ORM27g2mbflMQljhvM7gxBAujHxUy4LXlKa6yMF9wbHdTbPqTONiCyyOYxccvJyVyI/XBg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      },
+      "optionalDependencies": {
+        "@tailwindcss/oxide-android-arm64": "4.0.3",
+        "@tailwindcss/oxide-darwin-arm64": "4.0.3",
+        "@tailwindcss/oxide-darwin-x64": "4.0.3",
+        "@tailwindcss/oxide-freebsd-x64": "4.0.3",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.0.3",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.0.3",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.0.3",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.0.3",
+        "@tailwindcss/oxide-linux-x64-musl": "4.0.3",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.0.3",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.0.3"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-android-arm64": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.0.3.tgz",
+      "integrity": "sha512-S8XOTQuMnpijZRlPm5HBzPJjZ28quB+40LSRHjRnQF6rRYKsvpr1qkY7dfwsetNdd+kMLOMDsvmuT8WnqqETvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
-      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.20.7"
+    "node_modules/@tailwindcss/oxide-darwin-arm64": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.0.3.tgz",
+      "integrity": "sha512-smrY2DpzhXvgDhZtQlYAl8+vxJ04lv2/64C1eiRxvsRT2nkw/q+zA1/eAYKvUHat6cIuwqDku3QucmrUT6pCeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+    "node_modules/@tailwindcss/oxide-darwin-x64": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.0.3.tgz",
+      "integrity": "sha512-NTz8x/LcGUjpZAWUxz0ZuzHao90Wj9spoQgomwB+/hgceh5gcJDfvaBYqxLFpKzVglpnbDSq1Fg0p0zI4oa5Pg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
     },
-    "node_modules/@types/node": {
-      "version": "20.12.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
-      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
-      "dev": true,
-      "dependencies": {
+    "node_modules/@tailwindcss/oxide-freebsd-x64": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.0.3.tgz",
+      "integrity": "sha512-yQc9Q0JCOp3kkAV8gKgDctXO60IkQhHpqGB+KgOccDtD5UmN6Q5+gd+lcsDyQ7N8dRuK1fAud51xQpZJgKfm7g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.0.3.tgz",
+      "integrity": "sha512-e1ivVMLSnxTOU1O3npnxN16FEyWM/g3SuH2pP6udxXwa0/SnSAijRwcAYRpqIlhVKujr158S8UeHxQjC4fGl4w==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.0.3.tgz",
+      "integrity": "sha512-PLrToqQqX6sdJ9DmMi8IxZWWrfjc9pdi9AEEPTrtMts3Jm9HBi1WqEeF1VwZZ2aW9TXloE5OwA35zuuq1Bhb/Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.0.3.tgz",
+      "integrity": "sha512-YlzRxx7N1ampfgSKzEDw0iwDkJXUInR4cgNEqmR4TzHkU2Vhg59CGPJrTI7dxOBofD8+O35R13Nk9Ytyv0JUFg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.0.3.tgz",
+      "integrity": "sha512-Xfc3z/li6XkuD7Hs+Uk6pjyCXnfnd9zuQTKOyDTZJ544xc2yoMKUkuDw6Et9wb31MzU2/c0CIUpTDa71lL9KHw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-linux-x64-musl": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.0.3.tgz",
+      "integrity": "sha512-ugKVqKzwa/cjmqSQG17aS9DYrEcQ/a5NITcgmOr3JLW4Iz64C37eoDlkC8tIepD3S/Td/ywKAolTQ8fKbjEL4g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.0.3.tgz",
+      "integrity": "sha512-qHPDMl+UUwsk1RMJMgAXvhraWqUUT+LR/tkXix5RA39UGxtTrHwsLIN1AhNxI5i2RFXAXfmFXDqZCdyQ4dWmAQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.0.3.tgz",
+      "integrity": "sha512-+ujwN4phBGyOsPyLgGgeCyUm4Mul+gqWVCIGuSXWgrx9xVUnf6LVXrw0BDBc9Aq1S2qMyOTX4OkCGbZeoIo8Qw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tailwindcss/postcss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.0.3.tgz",
+      "integrity": "sha512-qUyxuhuI2eTgRJ+qfCQRAr69Cw7BdSz+PoNFUNoRuhPjikNC8+sxK+Mi/chaXAXewjv/zbf6if6z6ItVLh+e9Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@alloc/quick-lru": "^5.2.0",
+        "@tailwindcss/node": "^4.0.3",
+        "@tailwindcss/oxide": "^4.0.3",
+        "lightningcss": "^1.29.1",
+        "postcss": "^8.4.41",
+        "tailwindcss": "4.0.3"
+      }
+    },
+    "node_modules/@tailwindcss/postcss/node_modules/tailwindcss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.3.tgz",
+      "integrity": "sha512-ImmZF0Lon5RrQpsEAKGxRvHwCvMgSC4XVlFRqmbzTEDb/3wvin9zfEZrMwgsa3yqBbPqahYcVI6lulM2S7IZAA==",
+      "license": "MIT"
+    },
+    "node_modules/@tailwindcss/vite": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.0.3.tgz",
+      "integrity": "sha512-Qj6rSO+EvXnNDymloKZ11D54JJTnDrkRWJBzNHENDxjt0HtrCZJbSLIrcJ/WdaoU4othrel/oFqHpO/doxIS/Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@tailwindcss/node": "^4.0.3",
+        "@tailwindcss/oxide": "^4.0.3",
+        "lightningcss": "^1.29.1",
+        "tailwindcss": "4.0.3"
+      },
+      "peerDependencies": {
+        "vite": "^5.2.0 || ^6"
+      }
+    },
+    "node_modules/@tailwindcss/vite/node_modules/tailwindcss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.3.tgz",
+      "integrity": "sha512-ImmZF0Lon5RrQpsEAKGxRvHwCvMgSC4XVlFRqmbzTEDb/3wvin9zfEZrMwgsa3yqBbPqahYcVI6lulM2S7IZAA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
+    },
+    "node_modules/@types/node": {
+      "version": "20.12.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz",
+      "integrity": "sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==",
+      "devOptional": true,
+      "dependencies": {
         "undici-types": "~5.26.4"
       }
     },
@@ -3998,86 +4207,73 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/semver": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
-      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz",
-      "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.22.0.tgz",
+      "integrity": "sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/type-utils": "7.7.1",
-        "@typescript-eslint/utils": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.1",
-        "debug": "^4.3.4",
+        "@typescript-eslint/scope-manager": "8.22.0",
+        "@typescript-eslint/type-utils": "8.22.0",
+        "@typescript-eslint/utils": "8.22.0",
+        "@typescript-eslint/visitor-keys": "8.22.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz",
-      "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.22.0.tgz",
+      "integrity": "sha512-MqtmbdNEdoNxTPzpWiWnqNac54h8JDAmkWtJExBVVnSrSmi9z+sZUt0LfKqk9rjqmKOIeRhO4fHHJ1nQIjduIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.1",
+        "@typescript-eslint/scope-manager": "8.22.0",
+        "@typescript-eslint/types": "8.22.0",
+        "@typescript-eslint/typescript-estree": "8.22.0",
+        "@typescript-eslint/visitor-keys": "8.22.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz",
-      "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz",
+      "integrity": "sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.1"
+        "@typescript-eslint/types": "8.22.0",
+        "@typescript-eslint/visitor-keys": "8.22.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4085,39 +4281,37 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz",
-      "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.22.0.tgz",
+      "integrity": "sha512-NzE3aB62fDEaGjaAYZE4LH7I1MUwHooQ98Byq0G0y3kkibPJQIXVUspzlFOmOfHhiDLwKzMlWxaNv+/qcZurJA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.7.1",
-        "@typescript-eslint/utils": "7.7.1",
+        "@typescript-eslint/typescript-estree": "8.22.0",
+        "@typescript-eslint/utils": "8.22.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz",
-      "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.22.0.tgz",
+      "integrity": "sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4125,75 +4319,87 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz",
-      "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz",
+      "integrity": "sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/visitor-keys": "7.7.1",
+        "@typescript-eslint/types": "8.22.0",
+        "@typescript-eslint/visitor-keys": "8.22.0",
         "debug": "^4.3.4",
-        "globby": "^11.1.0",
+        "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz",
-      "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.22.0.tgz",
+      "integrity": "sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.15",
-        "@types/semver": "^7.5.8",
-        "@typescript-eslint/scope-manager": "7.7.1",
-        "@typescript-eslint/types": "7.7.1",
-        "@typescript-eslint/typescript-estree": "7.7.1",
-        "semver": "^7.6.0"
+        "@typescript-eslint/scope-manager": "8.22.0",
+        "@typescript-eslint/types": "8.22.0",
+        "@typescript-eslint/typescript-estree": "8.22.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <5.8.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz",
-      "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==",
+      "version": "8.22.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz",
+      "integrity": "sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.7.1",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.22.0",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
@@ -4201,22 +4407,22 @@
       "dev": true
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
-      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.4.tgz",
+      "integrity": "sha512-SCCPBJtYLdE8PX/7ZQAs1QAZ8Jqwih+0VBLum1EGqmCCQal+MIUqLCzj3ZUy8ufbC0cAM4LRlSTm7IQJwWT4ug==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.23.5",
-        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
-        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
+        "@babel/core": "^7.26.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+        "@babel/plugin-transform-react-jsx-source": "^7.25.9",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.14.0"
+        "react-refresh": "^0.14.2"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
       }
     },
     "node_modules/acorn": {
@@ -4265,26 +4471,28 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "license": "MIT"
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4296,7 +4504,8 @@
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
@@ -4315,15 +4524,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/autoprefixer": {
       "version": "10.4.19",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
@@ -4370,6 +4570,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -4381,25 +4582,27 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
       "funding": [
         {
@@ -4416,10 +4619,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -4441,14 +4644,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001612",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz",
-      "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==",
+      "version": "1.0.30001696",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
+      "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
       "dev": true,
       "funding": [
         {
@@ -4465,24 +4669,11 @@
         }
       ]
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -4506,6 +4697,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -4541,24 +4733,28 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -4576,9 +4772,10 @@
       "dev": true
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -4592,6 +4789,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -4637,6 +4835,18 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
@@ -4645,24 +4855,14 @@
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+      "license": "Apache-2.0"
     },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "license": "MIT"
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
@@ -4679,75 +4879,82 @@
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.749",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.749.tgz",
-      "integrity": "sha512-LRMMrM9ITOvue0PoBrvNIraVmuDbJV5QC9ierz/z5VilMdPOVMjOtpICNld3PuXuTZ3CHH/UPxX9gHhAPwi+0Q==",
+      "version": "1.5.90",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
+      "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==",
       "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+      "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
     },
     "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
-      "dev": true,
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz",
+      "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
       "hasInstallScript": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "@esbuild/aix-ppc64": "0.24.2",
+        "@esbuild/android-arm": "0.24.2",
+        "@esbuild/android-arm64": "0.24.2",
+        "@esbuild/android-x64": "0.24.2",
+        "@esbuild/darwin-arm64": "0.24.2",
+        "@esbuild/darwin-x64": "0.24.2",
+        "@esbuild/freebsd-arm64": "0.24.2",
+        "@esbuild/freebsd-x64": "0.24.2",
+        "@esbuild/linux-arm": "0.24.2",
+        "@esbuild/linux-arm64": "0.24.2",
+        "@esbuild/linux-ia32": "0.24.2",
+        "@esbuild/linux-loong64": "0.24.2",
+        "@esbuild/linux-mips64el": "0.24.2",
+        "@esbuild/linux-ppc64": "0.24.2",
+        "@esbuild/linux-riscv64": "0.24.2",
+        "@esbuild/linux-s390x": "0.24.2",
+        "@esbuild/linux-x64": "0.24.2",
+        "@esbuild/netbsd-arm64": "0.24.2",
+        "@esbuild/netbsd-x64": "0.24.2",
+        "@esbuild/openbsd-arm64": "0.24.2",
+        "@esbuild/openbsd-x64": "0.24.2",
+        "@esbuild/sunos-x64": "0.24.2",
+        "@esbuild/win32-arm64": "0.24.2",
+        "@esbuild/win32-ia32": "0.24.2",
+        "@esbuild/win32-x64": "0.24.2"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/eslint": {
       "version": "8.57.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
@@ -4893,24 +5100,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -5037,15 +5226,16 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -5055,6 +5245,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5095,9 +5286,10 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -5142,9 +5334,10 @@
       "dev": true
     },
     "node_modules/foreground-child": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -5192,6 +5385,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5275,25 +5469,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
@@ -5301,19 +5481,11 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -5383,6 +5555,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -5391,11 +5564,15 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -5413,6 +5590,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5432,6 +5610,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -5451,15 +5630,13 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
-      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=14"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -5468,11 +5645,12 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
-      "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.4.2.tgz",
+      "integrity": "sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==",
+      "license": "MIT",
       "bin": {
-        "jiti": "bin/jiti.js"
+        "jiti": "lib/jiti-cli.mjs"
       }
     },
     "node_modules/js-sha3": {
@@ -5497,82 +5675,315 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lightningcss": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
+      "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
+      "license": "MPL-2.0",
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-darwin-arm64": "1.29.1",
+        "lightningcss-darwin-x64": "1.29.1",
+        "lightningcss-freebsd-x64": "1.29.1",
+        "lightningcss-linux-arm-gnueabihf": "1.29.1",
+        "lightningcss-linux-arm64-gnu": "1.29.1",
+        "lightningcss-linux-arm64-musl": "1.29.1",
+        "lightningcss-linux-x64-gnu": "1.29.1",
+        "lightningcss-linux-x64-musl": "1.29.1",
+        "lightningcss-win32-arm64-msvc": "1.29.1",
+        "lightningcss-win32-x64-msvc": "1.29.1"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.1.tgz",
+      "integrity": "sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.1.tgz",
+      "integrity": "sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.1.tgz",
+      "integrity": "sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.1.tgz",
+      "integrity": "sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.1.tgz",
+      "integrity": "sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=4"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.1.tgz",
+      "integrity": "sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
+      "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=6"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.1.tgz",
+      "integrity": "sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.1.tgz",
+      "integrity": "sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.1.tgz",
+      "integrity": "sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
@@ -5627,16 +6038,18 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -5644,9 +6057,10 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -5658,9 +6072,10 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -5675,6 +6090,7 @@
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -5682,9 +6098,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -5705,15 +6121,16 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
       "dev": true
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5731,6 +6148,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5739,6 +6157,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -5799,6 +6218,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -5840,49 +6265,41 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
-      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
         "lru-cache": "^10.2.0",
         "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.1.tgz",
-      "integrity": "sha512-tS24spDe/zXhWbNPErCHs/AGOzbKGHT+ybSBqmdLm8WZ1xXLWvH8Qn71QPAlqVhd0qUTWjy+Kl9JmISgDdEjsA==",
-      "engines": {
-        "node": "14 || >=16.14"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -5894,6 +6311,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5902,14 +6320,15 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
+      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -5925,9 +6344,9 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.2.0"
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -5937,6 +6356,7 @@
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -5953,6 +6373,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
       "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -5981,6 +6402,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "lilconfig": "^3.0.0",
         "yaml": "^2.3.4"
@@ -6001,39 +6423,36 @@
         }
       }
     },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz",
-      "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
-      }
-    },
     "node_modules/postcss-nested": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz",
-      "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.11"
+        "postcss-selector-parser": "^6.1.1"
       },
       "engines": {
         "node": ">=12.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.2.14"
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.16",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
-      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -6123,9 +6542,9 @@
       }
     },
     "node_modules/react-refresh": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.1.tgz",
-      "integrity": "sha512-iZiRCtNGY3QYP3pYOSSBOvQmBpQTcJccr/VcK2blpJrpPTUDjeN51mxm5nsrkCzBwsbGUj+TN9q2oPz5E13FLg==",
+      "version": "0.14.2",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
+      "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -6232,6 +6651,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -6240,6 +6660,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -6253,17 +6674,21 @@
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -6302,12 +6727,11 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.4.tgz",
-      "integrity": "sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==",
-      "dev": true,
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.0.tgz",
+      "integrity": "sha512-+4C/cgJ9w6sudisA0nZz0+O7lTP9a3CzNLsoDwaRumM8QHwghUsu6tqHXiTmNUp/rqNiM14++7dkzHDyCRs0Jg==",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -6317,22 +6741,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.16.4",
-        "@rollup/rollup-android-arm64": "4.16.4",
-        "@rollup/rollup-darwin-arm64": "4.16.4",
-        "@rollup/rollup-darwin-x64": "4.16.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.16.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.16.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.16.4",
-        "@rollup/rollup-linux-arm64-musl": "4.16.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.16.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.16.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.16.4",
-        "@rollup/rollup-linux-x64-gnu": "4.16.4",
-        "@rollup/rollup-linux-x64-musl": "4.16.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.16.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.16.4",
-        "@rollup/rollup-win32-x64-msvc": "4.16.4",
+        "@rollup/rollup-android-arm-eabi": "4.34.0",
+        "@rollup/rollup-android-arm64": "4.34.0",
+        "@rollup/rollup-darwin-arm64": "4.34.0",
+        "@rollup/rollup-darwin-x64": "4.34.0",
+        "@rollup/rollup-freebsd-arm64": "4.34.0",
+        "@rollup/rollup-freebsd-x64": "4.34.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.34.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.34.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.34.0",
+        "@rollup/rollup-linux-arm64-musl": "4.34.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.34.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.34.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.34.0",
+        "@rollup/rollup-linux-x64-gnu": "4.34.0",
+        "@rollup/rollup-linux-x64-musl": "4.34.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.34.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.34.0",
+        "@rollup/rollup-win32-x64-msvc": "4.34.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -6367,13 +6794,11 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+      "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -6381,24 +6806,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/semver/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -6422,6 +6829,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
       "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "license": "ISC",
       "engines": {
         "node": ">=14"
       },
@@ -6429,19 +6837,10 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6450,6 +6849,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
       "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "license": "MIT",
       "dependencies": {
         "eastasianwidth": "^0.2.0",
         "emoji-regex": "^9.2.2",
@@ -6467,6 +6867,7 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -6479,12 +6880,14 @@
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6496,6 +6899,7 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -6522,6 +6926,7 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -6545,6 +6950,7 @@
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
       "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
@@ -6563,42 +6969,30 @@
       }
     },
     "node_modules/sucrase/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
-        "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -6619,32 +7013,33 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-      "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
+      "version": "3.4.17",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
+      "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
-        "chokidar": "^3.5.3",
+        "chokidar": "^3.6.0",
         "didyoumean": "^1.2.2",
         "dlv": "^1.1.3",
-        "fast-glob": "^3.3.0",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.2",
         "is-glob": "^4.0.3",
-        "jiti": "^1.21.0",
-        "lilconfig": "^2.1.0",
-        "micromatch": "^4.0.5",
+        "jiti": "^1.21.6",
+        "lilconfig": "^3.1.3",
+        "micromatch": "^4.0.8",
         "normalize-path": "^3.0.0",
         "object-hash": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.23",
+        "picocolors": "^1.1.1",
+        "postcss": "^8.4.47",
         "postcss-import": "^15.1.0",
         "postcss-js": "^4.0.1",
-        "postcss-load-config": "^4.0.1",
-        "postcss-nested": "^6.0.1",
-        "postcss-selector-parser": "^6.0.11",
-        "resolve": "^1.22.2",
-        "sucrase": "^3.32.0"
+        "postcss-load-config": "^4.0.2",
+        "postcss-nested": "^6.2.0",
+        "postcss-selector-parser": "^6.1.2",
+        "resolve": "^1.22.8",
+        "sucrase": "^3.35.0"
       },
       "bin": {
         "tailwind": "lib/cli.js",
@@ -6662,6 +7057,24 @@
         "tailwindcss": ">=3.0.0 || insiders"
       }
     },
+    "node_modules/tailwindcss/node_modules/jiti": {
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "license": "MIT",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -6672,6 +7085,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -6680,6 +7094,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "license": "MIT",
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -6687,19 +7102,11 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -6708,21 +7115,23 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "license": "Apache-2.0"
     },
     "node_modules/tslib": {
       "version": "2.8.0",
@@ -6770,12 +7179,12 @@
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
       "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
+      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
       "dev": true,
       "funding": [
         {
@@ -6792,8 +7201,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -6855,23 +7264,23 @@
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.2.10",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.10.tgz",
-      "integrity": "sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==",
-      "dev": true,
+      "version": "6.0.11",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
+      "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
       "dependencies": {
-        "esbuild": "^0.20.1",
-        "postcss": "^8.4.38",
-        "rollup": "^4.13.0"
+        "esbuild": "^0.24.2",
+        "postcss": "^8.4.49",
+        "rollup": "^4.23.0"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -6880,18 +7289,25 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
-        "terser": "^5.4.0"
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "jiti": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -6901,6 +7317,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -6909,6 +7328,12 @@
         },
         "terser": {
           "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
@@ -6930,6 +7355,7 @@
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
       "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^6.1.0",
         "string-width": "^5.0.1",
@@ -6947,6 +7373,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -6963,6 +7390,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6973,31 +7401,17 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
     },
     "node_modules/wrap-ansi-cjs/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -7008,9 +7422,10 @@
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -7018,21 +7433,11 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/wrap-ansi/node_modules/strip-ansi": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
       "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
       },
@@ -7056,9 +7461,9 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz",
-      "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==",
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
+      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
       "bin": {
         "yaml": "bin.mjs"
       },
diff --git a/panel/package.json b/panel/package.json
index 47e33e15..eb5bd6eb 100644
--- a/panel/package.json
+++ b/panel/package.json
@@ -38,9 +38,9 @@
     "@types/node": "^20.12.7",
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@typescript-eslint/eslint-plugin": "^8.22.0",
+    "@typescript-eslint/parser": "^8.22.0",
+    "@vitejs/plugin-react": "^4.3.4",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.0",
@@ -48,6 +48,6 @@
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.2.2",
-    "vite": "^5.2.0"
+    "vite": "^6.0.11"
   }
 }

From 2e6dceb348622b7d489c2e22b4f370faabf9b3f2 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 01:26:18 +0100
Subject: [PATCH 30/58] added error messages

---
 .../templateParser/TemplateInterpreter.java   | 35 ++++++++-----------
 .../templateParser/TemplateParserTest.java    |  2 --
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/system/templateParser/TemplateInterpreter.java
index 29d1e296..d01ccc05 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/system/templateParser/TemplateInterpreter.java
@@ -86,7 +86,6 @@ public static Object castToValidInput(Object input) {
         }
     }
 
-    //TODO this should probably be tested more
     /**
      * Tries to resolve and get the Value at the given field access expression from the environment map.
      *
@@ -102,8 +101,7 @@ public static Object castToValidInput(Object input) {
     public static Object getNestedReplacement(VarStatement varExpr, Map<String, Object> environment) throws InterpretationException  {
         String[] variableNames = varExpr.accessExpr().split("\\.");
         if (variableNames.length == 0) {
-            //TODO kinda a panic, we should never be here
-            throw new InterpretationException("");
+            throw new InterpretationException("PANIC: Field Access Expression is empty!");
         }
         if (!environment.containsKey(variableNames[0])) {
             throw new FieldDoesNotExistException(variableNames[0], environment.keySet());
@@ -113,29 +111,24 @@ public static Object getNestedReplacement(VarStatement varExpr, Map<String, Obje
             if (variable == null) {
                 throw new VariableValueNullException(variableNames[i - 1]);
             }
+            Class<?> variableClass = variable.getClass();
             try {
-                //TODO check if variable name is null
-                Field declaredField = variable.getClass().getDeclaredField(variableNames[i]);
+                Field declaredField = variableClass.getDeclaredField(variableNames[i]);
                 declaredField.setAccessible(true);
                 variable = declaredField.get(variable);
             } catch (NoSuchFieldException _) {
-                throw new FieldDoesNotExistException(variableNames[i], variable.getClass());
+                throw new FieldDoesNotExistException(variableNames[i], variableClass);
             } catch (IllegalAccessException | InaccessibleObjectException | SecurityException e) {
-                throw new FieldNotAccessibleException(variableNames[i], variable.getClass(), e);
-            }
-            catch (IllegalArgumentException _) {
-                //TODO kinda panic, because we should never be here, this means we have mixed up the underlying type of
-                // declaredField, because of type erasure in getDeclaredField(...)
-                throw new InterpretationException("");
-            }
-            catch (ExceptionInInitializerError e) {
-                //TODO kinda panic, because this indicates something very weird that should not happen.
-                // not sure what this is, but sounds above my pay grade
-                throw new InterpretationException("", e);
-            }
-            catch (NullPointerException _) {
-                //TODO kinda panic, the name should never be null, not allowed by parsing
-                throw new InterpretationException("");
+                throw new FieldNotAccessibleException(variableNames[i], variableClass, e);
+            } catch (IllegalArgumentException _) {
+                // caused by declaredField.get(...)
+                throw new InterpretationException("PANIC: tried to get value from Field via Reflection on an instance from another class!");
+            } catch (ExceptionInInitializerError e) {
+                // I don't think that should really be thrown ever, because the class initializer should have run wen the object instance we got was created
+                throw new InterpretationException("PANIC: static initializer on class " + variableClass.getCanonicalName() + " through exception!", e);
+            } catch (NullPointerException e) {
+                // we should not encounter this, because we null checked all inputs to the functions that throw a NullPointerException
+                throw new InterpretationException("PANIC: NullPointerException thrown despite null checks", e);
             }
         }
         return variable;
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 572353de..8e137c8f 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -148,6 +148,4 @@ void unnecessary_tokens_to_text() throws ParsingException {
     }
 
     //TODO add end-to-end tests, input string and environment, test result string
-
-    //TODO probably not this file, but test loop directive
 }
\ No newline at end of file

From 391eab2303a116a43bd2aad6655d2889eb3b23d5 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 01:47:24 +0100
Subject: [PATCH 31/58] remove dead code

---
 .../inputs/TipeeeStream/DonationEvent.java    |  8 ----
 .../inputs/TipeeeStream/DonationRepo.java     | 16 --------
 .../inputs/shared/oauth/OauthAccountRepo.java |  4 --
 bot/main/talium/system/TimingSequence.java    | 41 -------------------
 bot/main/talium/system/Timings.java           | 23 -----------
 .../system/inputSystem/HealthManager.java     | 18 --------
 .../security/UserAuthenticationToken.java     |  7 ----
 .../system/stringTemplates/TemplateDTO.java   |  8 +---
 .../stringTemplates/TemplateService.java      | 13 ------
 .../templateParser/CharakterStream.java       | 29 ++++---------
 .../system/templateParser/TemplateParser.java | 30 --------------
 .../exeptions/InterpretationException.java    | 11 -----
 .../exeptions/ParsingException.java           |  8 ----
 .../templateParser/statements/Statement.java  |  1 -
 .../persistence/MessagePattern.java           | 20 ---------
 .../persistence/MessagePatternRepo.java       |  4 --
 .../persistence/MessagePatternService.java    | 18 --------
 .../persistence/TriggerRepo.java              |  2 -
 .../triggerEngine/TriggerEngine.java          |  1 +
 .../triggerEngine/TriggerProvider.java        | 20 ---------
 20 files changed, 9 insertions(+), 273 deletions(-)
 delete mode 100644 bot/main/talium/inputs/TipeeeStream/DonationRepo.java
 delete mode 100644 bot/main/talium/system/TimingSequence.java
 delete mode 100644 bot/main/talium/system/Timings.java
 delete mode 100644 bot/main/talium/system/twitchCommands/persistence/MessagePatternService.java

diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java b/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
index 2dae27ac..f0cc0f65 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
+++ b/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
@@ -36,14 +36,6 @@ public DonationEvent(long id, Currency currency, double amount, String message,
         this.donated_at = donated_at;
     }
 
-    @Autowired
-    public void setDonationRepo(DonationRepo donationRepo) {
-        repo = donationRepo;
-    }
-    public static DonationRepo repo;
-
-
-
     @Override
     public String toString() {
         StringBuilder str = new StringBuilder();
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationRepo.java b/bot/main/talium/inputs/TipeeeStream/DonationRepo.java
deleted file mode 100644
index 17e52c18..00000000
--- a/bot/main/talium/inputs/TipeeeStream/DonationRepo.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package talium.inputs.TipeeeStream;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface DonationRepo extends CrudRepository<DonationEvent, Long> {
-    //TODO this is a nativ Query, the Table Name musst be changed Manually, if it changed!
-    @Query(value = "SELECT * FROM donations WHERE donated_at = " +
-            "(SELECT max(donated_at) FROM donations)", nativeQuery = true)
-//    @Query(value = "SELECT d FROM Donations d WHERE d.donated_at = (SELECT MAX(d.donated_at) FROM Donations d)") Does not work
-    //^^Does not work
-    DonationEvent getMostRecent();
-
-}
diff --git a/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java b/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java
index 75ac7fb7..4ea6557e 100644
--- a/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java
+++ b/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java
@@ -12,9 +12,5 @@ public interface OauthAccountRepo extends CrudRepository<OauthAccount, String> {
 
     @NotNull ArrayList<OauthAccount> findAll();
 
-    boolean existsByAccName(String name);
-
     Optional<OauthAccount> getByAccNameAndService(String name, String service);
-
-    void deleteByAccName(String name);
 }
diff --git a/bot/main/talium/system/TimingSequence.java b/bot/main/talium/system/TimingSequence.java
deleted file mode 100644
index bd16c4af..00000000
--- a/bot/main/talium/system/TimingSequence.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package talium.system;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringJoiner;
-
-public class TimingSequence {
-    record TimingStep(String name, long stamp) {
-    }
-
-    private boolean open = true;
-    private final long startTime;
-    private final List<TimingStep> steps;
-
-    public TimingSequence() {
-        startTime = System.nanoTime();
-        steps = new ArrayList<>();
-    }
-
-    public void step(String name) {
-        if (!open) {
-            return;
-        }
-        steps.add(new TimingStep(name, System.nanoTime()));
-    }
-
-    public void print() {
-        long endTime = System.nanoTime();
-        open = false;
-        var s = new StringJoiner(System.lineSeparator());
-        s.add("----------------");
-        s.add("Timings Report: ");
-        long lastTimeStamp = startTime;
-        for (TimingStep step : steps) {
-            s.add(step.name + ": " + (step.stamp - lastTimeStamp) / 1000000f + "ms");
-            lastTimeStamp = step.stamp;
-        }
-        s.add("Total: " + (endTime - startTime) / 1000000f + "ms");
-        System.out.println(s);
-    }
-}
diff --git a/bot/main/talium/system/Timings.java b/bot/main/talium/system/Timings.java
deleted file mode 100644
index 9fd5fb16..00000000
--- a/bot/main/talium/system/Timings.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package talium.system;
-
-import java.time.Duration;
-
-public class Timings {
-    private final long startTime;
-    private long endTime;
-
-    public Timings() {
-        startTime = System.nanoTime();
-    }
-
-    public void stop() {
-        endTime = System.nanoTime();
-    }
-
-    public Duration eval() {
-        if (endTime == 0) {
-            stop();
-        }
-        return Duration.ofNanos(endTime - startTime);
-    }
-}
diff --git a/bot/main/talium/system/inputSystem/HealthManager.java b/bot/main/talium/system/inputSystem/HealthManager.java
index 8fe510e5..95c195c2 100644
--- a/bot/main/talium/system/inputSystem/HealthManager.java
+++ b/bot/main/talium/system/inputSystem/HealthManager.java
@@ -33,23 +33,6 @@ public record Customization(
     private static final ArrayList<StatusDescription> STATUS_DESCRIPTIONS = new ArrayList<>();
     private static final HashMap<String, Customization> reporterCustomisation = new HashMap<>();
     private static volatile InputStatus inputStatus = InputStatus.STOPPED;
-    private static volatile Consumer<InputStatus> callback;
-    private static volatile InputStatus filter;
-
-    public static void subscribeNextChange(Consumer<InputStatus> callback, InputStatus filterBy) {
-        HealthManager.callback = callback;
-        filter = filterBy;
-    }
-
-    private static void checkCallback() {
-        if (filter != inputStatus) {
-            return;
-        }
-        if (callback != null) {
-            callback.accept(inputStatus);
-        }
-        callback = null;
-    }
 
     public static void reportStatus(Class<?> self, InputStatus status) {
         reportStatus(self.getCanonicalName(), status);
@@ -67,7 +50,6 @@ public static void reportStatus(String self, InputStatus status) {
             statusOptional.get().status = status;
         }
         checkOverallStatusChange();
-        checkCallback();
     }
 
     public static void addCustomization(String self, String title, String description) {
diff --git a/bot/main/talium/system/security/UserAuthenticationToken.java b/bot/main/talium/system/security/UserAuthenticationToken.java
index e934ce7f..9e7a7324 100644
--- a/bot/main/talium/system/security/UserAuthenticationToken.java
+++ b/bot/main/talium/system/security/UserAuthenticationToken.java
@@ -13,13 +13,6 @@ public class UserAuthenticationToken implements Authentication {
     Optional<PanelUser> botUser;
     List<SimpleGrantedAuthority> grantedAuthorities;
 
-    public UserAuthenticationToken(String accessToken, boolean isAuthenticated, PanelUser panelUser, SimpleGrantedAuthority ...authority) {
-        this.accessToken = accessToken;
-        this.isAuthenticated = isAuthenticated;
-        this.botUser = Optional.ofNullable(panelUser);
-        this.grantedAuthorities = Arrays.stream(authority).toList();
-    }
-
     public UserAuthenticationToken(String accessToken, boolean isAuthenticated) {
         this.accessToken = accessToken;
         this.isAuthenticated = isAuthenticated;
diff --git a/bot/main/talium/system/stringTemplates/TemplateDTO.java b/bot/main/talium/system/stringTemplates/TemplateDTO.java
index ca7e0fe2..fe6b52e7 100644
--- a/bot/main/talium/system/stringTemplates/TemplateDTO.java
+++ b/bot/main/talium/system/stringTemplates/TemplateDTO.java
@@ -10,12 +10,6 @@ public record TemplateDTO(
         String messageColor,
         String varJsonSchema
 ) {
-    public TemplateDTO(String id, String template, String messageColor, String varJsonSchema) {
-        this.id = id;
-        this.template = template;
-        this.messageColor = messageColor;
-        this.varJsonSchema = varJsonSchema;
-    }
 
     public TemplateDTO(Template template) {
         this(template.id, template.template, template.messageColor, "");
@@ -32,7 +26,7 @@ private static String buildJsonSchema(HashMap<String, Class<?>> vars) {
         return varJsonSchema.toString();
     }
 
-    private static String generateSchema(Class clazz) {
+    private static String generateSchema(Class<?> clazz) {
         if (clazz.isPrimitive()
                 || clazz == String.class
                 || clazz == Character.class
diff --git a/bot/main/talium/system/stringTemplates/TemplateService.java b/bot/main/talium/system/stringTemplates/TemplateService.java
index 786b8e8d..6cc58855 100644
--- a/bot/main/talium/system/stringTemplates/TemplateService.java
+++ b/bot/main/talium/system/stringTemplates/TemplateService.java
@@ -2,9 +2,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import talium.system.twitchCommands.persistence.TriggerEntity;
 import talium.system.twitchCommands.persistence.TriggerRepo;
-import talium.system.twitchCommands.persistence.TriggerService;
 
 import java.util.List;
 import java.util.Optional;
@@ -29,17 +27,6 @@ public void delete(String id) {
         repo.deleteById(id);
     }
 
-    public void updateTemplateStringById(String id, String template) {
-        var t = repo.findById(id);
-        if (t.isPresent()) {
-            t.get().template = template;
-            repo.save(t.get());
-        } else {
-            // TODO make error nicer, new type or smt
-            throw new RuntimeException("templates does not exist");
-        }
-    }
-
     public Optional<Template> getTemplateById(String id) {
         return repo.findById(id);
     }
diff --git a/bot/main/talium/system/templateParser/CharakterStream.java b/bot/main/talium/system/templateParser/CharakterStream.java
index 17312d5c..62f78797 100644
--- a/bot/main/talium/system/templateParser/CharakterStream.java
+++ b/bot/main/talium/system/templateParser/CharakterStream.java
@@ -4,7 +4,7 @@
 import talium.system.templateParser.exeptions.UnexpectedTokenException;
 
 /**
- * A indexed Stream of characters for parsing.
+ * An indexed Stream of characters for parsing.
  */
 public class CharakterStream {
     String src;
@@ -55,7 +55,7 @@ public boolean isEOF() {
      */
     public String readUntil(char c) throws UnexpectedEndOfInputException {
         skipWhitespace();
-        String buffer = "";
+        StringBuilder buffer = new StringBuilder();
         boolean escapeNext = false;
         while (!isEOF() && peek() != c || escapeNext) {
             if (peek() == '\\') { //TODO this impossible, we need to save separately if the last char was a -> \ (or check in the buffer) (also, if \ is the target char, we should exit)
@@ -64,24 +64,9 @@ public String readUntil(char c) throws UnexpectedEndOfInputException {
             if (escapeNext) {
                 escapeNext = false;
             }
-            buffer += next();
+            buffer.append(next());
         }
-        return buffer;
-    }
-
-    /**
-     * consume all characters up to and excluding the first character that is not a digit
-     *
-     * @return return all consumed characters up to the non digit char
-     * @see Character#isDigit(char)
-     */
-    public String readTillNotDigit() throws UnexpectedEndOfInputException {
-        skipWhitespace();
-        String buffer = "";
-        while (!Character.isDigit(peek())) {
-            buffer += next();
-        }
-        return buffer;
+        return buffer.toString();
     }
 
     /**
@@ -92,11 +77,11 @@ public String readTillNotDigit() throws UnexpectedEndOfInputException {
      */
     public String readTillWhitespace() throws UnexpectedEndOfInputException {
         skipWhitespace();
-        String buffer = "";
+        StringBuilder buffer = new StringBuilder();
         while (!isEOF() && !Character.isWhitespace(peek())) {
-            buffer += next();
+            buffer.append(next());
         }
-        return buffer;
+        return buffer.toString();
     }
 
     /**
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index 79e0aa19..d4fb2c02 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -7,7 +7,6 @@
 import talium.system.templateParser.tokens.Comparison;
 import talium.system.templateParser.tokens.TemplateTokenKind;
 import talium.system.templateParser.tokens.TemplateToken;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -92,33 +91,4 @@ public Statement parseToken() throws ParsingException {
             return new TextStatement(current.value());
         }
     }
-
-    /**
-     * Prints the list and content of statements to the screen
-     * @param statements statements to print out
-     * @param depth indentation depth for content of statement (may be recursively applied)
-     */
-    public static void debugPrint(List<Statement> statements, int depth) {
-        String indent = " ".repeat(depth);
-        for (var statement : statements) {
-            if (statement instanceof TextStatement textStatement) {
-                System.out.println(STR."\{indent}Text(\{textStatement.text()}),");
-            }
-            if (statement instanceof VarStatement varStatement) {
-                System.out.println(STR."\{indent}Var(\{varStatement.accessExpr()}),");
-            }
-            if (statement instanceof IfStatement ifStatement) {
-                System.out.println(STR."\{indent}IF: \{ifStatement.comparison()}");
-                debugPrint(ifStatement.then(), depth + 1);
-                System.out.println(STR."\{indent}} else {");
-                debugPrint(ifStatement.other(), depth + 1);
-                System.out.println(STR."\{indent}},");
-            }
-            if (statement instanceof LoopStatement forStatement) {
-                System.out.println(STR."\{indent}FOR: \{forStatement.varName()} in \{forStatement.var()} {");
-                debugPrint(forStatement.body(), depth + 1);
-                System.out.println(STR."\{indent}},");
-            }
-        }
-    }
 }
diff --git a/bot/main/talium/system/templateParser/exeptions/InterpretationException.java b/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
index e3a743b3..4c8b09c9 100644
--- a/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
+++ b/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
@@ -9,15 +9,4 @@ public InterpretationException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public InterpretationException(Throwable cause) {
-        super(cause);
-    }
-
-    public InterpretationException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
-    public InterpretationException() {
-    }
-
 }
diff --git a/bot/main/talium/system/templateParser/exeptions/ParsingException.java b/bot/main/talium/system/templateParser/exeptions/ParsingException.java
index 6b99b78d..48e71148 100644
--- a/bot/main/talium/system/templateParser/exeptions/ParsingException.java
+++ b/bot/main/talium/system/templateParser/exeptions/ParsingException.java
@@ -9,14 +9,6 @@ public ParsingException(String message, Throwable cause) {
         super(message, cause);
     }
 
-    public ParsingException(Throwable cause) {
-        super(cause);
-    }
-
-    public ParsingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-
     public ParsingException() {
     }
 
diff --git a/bot/main/talium/system/templateParser/statements/Statement.java b/bot/main/talium/system/templateParser/statements/Statement.java
index 59bbb5b4..ba5ab730 100644
--- a/bot/main/talium/system/templateParser/statements/Statement.java
+++ b/bot/main/talium/system/templateParser/statements/Statement.java
@@ -1,5 +1,4 @@
 package talium.system.templateParser.statements;
-import java.util.List;
 
 public interface Statement {}
 
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java b/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java
index 3e77cbfa..d334f698 100644
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java
+++ b/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java
@@ -20,26 +20,6 @@ public class MessagePattern {
     public boolean isVisible;
     public boolean isEnabled;
 
-    /**
-     * @param pattern   the String pattern, can either be a ! command at the start of the message, or a complex regex pattern
-     * @param isRegex   true if the pattern is regex rather than a literal ! command
-     * @param isVisible true if the pattern should be listed in die public command list
-     * @param isEnabled true if the pattern should be enabled or disabled
-     */
-    public MessagePattern(
-            TriggerEntity parentTrigger,
-            String pattern,
-            boolean isRegex,
-            boolean isVisible,
-            boolean isEnabled
-    ) {
-        this.parentTrigger = parentTrigger;
-        this.pattern = pattern;
-        this.isRegex = isRegex;
-        this.isVisible = isVisible;
-        this.isEnabled = isEnabled;
-    }
-
     public MessagePattern(String pattern, boolean isRegex, boolean isVisible, boolean isEnabled) {
         this.parentTrigger = null;
         this.pattern = pattern;
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java b/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java
index e656160c..95d94c0a 100644
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java
+++ b/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java
@@ -4,13 +4,9 @@
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Repository
 public interface MessagePatternRepo extends CrudRepository<MessagePattern, MessagePatternId> {
 
-    List<MessagePattern> getAllByParentTrigger(TriggerEntity parentTrigger);
-
     @Transactional
     void deleteAllByParentTrigger(TriggerEntity parentTrigger);
 
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePatternService.java b/bot/main/talium/system/twitchCommands/persistence/MessagePatternService.java
deleted file mode 100644
index 8ef78361..00000000
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePatternService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package talium.system.twitchCommands.persistence;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class MessagePatternService {
-    private final MessagePatternRepo repo;
-
-    @Autowired
-    public MessagePatternService(MessagePatternRepo repo) {
-        this.repo = repo;
-    }
-
-    void save(MessagePattern pattern) {
-        repo.save(pattern);
-    }
-}
diff --git a/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java b/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java
index 84471a37..9019edb7 100644
--- a/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java
+++ b/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java
@@ -9,8 +9,6 @@ public interface TriggerRepo extends ListCrudRepository<TriggerEntity, String> {
 
     List<TriggerEntity> getAllByisAutoGenerated(boolean isUserTrigger);
 
-    List<TriggerEntity> getAllById(String triggerId);
-
     @Query(value = "SELECT t.id from TriggerEntity t " +
             "LEFT JOIN Template e ON t.id = e.id " +
             "LEFT JOIN MessagePattern p ON t.id = p.parentTrigger.id " +
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
index c7ae1ac0..d26b710a 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
@@ -85,6 +85,7 @@ public static void executeTextCommand(String commandId, ChatMessage message) {
             logger.error("Could not find template id for command id {}", commandId);
             return;
         }
+        //TODO add message and other things to context, but currently we can't handle records
         Out.Twitch.sendRawTemplate(template.get().template, null);
     }
 
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
index f354a7cb..57abfffa 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
@@ -4,11 +4,7 @@
 import org.springframework.stereotype.Service;
 import talium.system.twitchCommands.persistence.MessagePattern;
 import talium.system.twitchCommands.persistence.TriggerEntity;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
 import talium.system.twitchCommands.persistence.TriggerService;
-import talium.inputs.Twitch4J.ChatMessage;
-import talium.system.twitchCommands.cooldown.CooldownType;
-import talium.inputs.Twitch4J.TwitchUserPermission;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -78,22 +74,6 @@ public static List<RuntimeTrigger> buildTrigger() {
         return resultMap.values().stream().toList();
     }
 
-    /**
-     * Replaces a trigger with the same triggerId of the new trigger, with the new trigger instance.
-     * Used for updates to triggers to edits in the ui
-     * @param newTrigger replacement trigger
-     * @param callback replacement callback
-     */
-    public static void updateTrigger(TriggerEntity newTrigger, TriggerCallback callback) {
-        for (RuntimeTrigger trigger : triggers) {
-            if (trigger.id().equals(newTrigger.id)) {
-                triggers.remove(trigger);
-                triggers.add(transformTrigger(newTrigger, callback));
-                return;
-            }
-        }
-    }
-
     /**
      * Transforms a Chattrigger into a runtime Trigger for internal use of the triggerEngine.
      *

From 9ff8cd587d50209a7f9839a24e474e403acca495 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 01:56:23 +0100
Subject: [PATCH 32/58] change getName of java Class

---
 bot/main/talium/TwitchBot.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 49f1a664..a312b2a7 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -67,7 +67,7 @@ private static BotInput startInput(BotInput input) {
         try {
             input.run();
         } catch (RuntimeException e) {
-            logger.error("Exception starting Input: {} because: {}", input.getClass().getSimpleName(), e.getMessage());
+            logger.error("Exception starting Input: {} because: {}", input.getClass().getCanonicalName(), e.getMessage());
             HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
         }
         return input;
@@ -78,7 +78,7 @@ private static void stopInput(BotInput input) {
             try {
                 input.shutdown();
             } catch (Exception e) {
-                logger.error("Exception stopping Input: {} because: {}", input.getClass().getSimpleName(), e.getMessage());
+                logger.error("Exception stopping Input: {} because: {}", input.getClass().getCanonicalName(), e.getMessage());
                 HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
             }
         }

From cbf9e84424fa0a22347c7a18cdec2a0413c04060 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:04:41 +0100
Subject: [PATCH 33/58] fix bug of incorrect UnexpectedEndOfInput when if/for
 statement was not followed by another character

---
 .../templateParser/CharakterStream.java       | 19 +++++---
 .../system/templateParser/TemplateLexer.java  | 29 ++----------
 .../system/templateParser/TemplateParser.java | 26 ++++++-----
 .../templateParser/TemplateParserTest.java    | 46 +++++++++++++------
 4 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/bot/main/talium/system/templateParser/CharakterStream.java b/bot/main/talium/system/templateParser/CharakterStream.java
index 62f78797..8682ac33 100644
--- a/bot/main/talium/system/templateParser/CharakterStream.java
+++ b/bot/main/talium/system/templateParser/CharakterStream.java
@@ -84,6 +84,18 @@ public String readTillWhitespace() throws UnexpectedEndOfInputException {
         return buffer.toString();
     }
 
+    public String readTillWhitespaceOr(char c) throws UnexpectedEndOfInputException {
+        skipWhitespace();
+        StringBuilder buffer = new StringBuilder();
+        while (!isEOF() && !Character.isWhitespace(peek())) {
+            if (peek() == c) {
+                break;
+            }
+            buffer.append(next());
+        }
+        return buffer.toString();
+    }
+
     /**
      * consumes all characters until a non whitespace character is encountered
      */
@@ -93,11 +105,4 @@ public void skipWhitespace() throws UnexpectedEndOfInputException {
         }
     }
 
-    public String src() {
-        return src;
-    }
-
-    public int pos() {
-        return pos;
-    }
 }
\ No newline at end of file
diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index 6f043dd1..c64d06c0 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -4,7 +4,6 @@
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 import talium.system.templateParser.exeptions.UnexpectedTokenException;
 import talium.system.templateParser.exeptions.UnsupportedDirective;
-import talium.system.templateParser.tokens.TemplateTokenKind;
 import talium.system.templateParser.tokens.TemplateToken;
 
 import java.util.ArrayList;
@@ -37,13 +36,6 @@ public List<TemplateToken> parse() throws UnexpectedTokenException, UnsupportedD
         return list;
     }
 
-    public TemplateToken peek() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        if (pos >= tokens.size()) {
-            tokens.add(parseToken());
-        }
-        return tokens.get(pos);
-    }
-
     @NonNull
     public TemplateToken next() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         if (pos >= tokens.size()) {
@@ -54,22 +46,6 @@ public TemplateToken next() throws UnexpectedTokenException, UnsupportedDirectiv
         return t;
     }
 
-    /**
-     * Consumes the next token if it is the expected token.
-     * If a different token is encountered, a syntax exception is thrown.
-     *
-     * @param token the next expected token
-     */
-    public void consume(TemplateTokenKind token) throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        if (isEOF()) {
-            throw new UnexpectedTokenException(token.name(), "END-OF-INPUT", src.pos() - 1, src.src());
-        }
-        TemplateToken next = next();
-        if (next.kind() != token) {
-            throw new UnexpectedTokenException(token.name(), next.kind().name(), src.pos() - 1, src.src());
-        }
-    }
-
     /**
      * consume a singe major token from the character stream
      *
@@ -83,7 +59,9 @@ private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEn
         if (src.peek() == '$') {
             src.consume('$');
             src.consume('{');
+            src.skipWhitespace();
             String varName = src.readUntil('}');
+            src.skipWhitespace();
             src.consume('}');
             return TemplateToken.var(varName);
 
@@ -91,7 +69,8 @@ private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEn
             // Get type of directive if or for
             src.consume('%');
             src.consume('{');
-            String directive = src.readTillWhitespace();
+            src.skipWhitespace();
+            String directive = src.readTillWhitespaceOr('}');
             src.skipWhitespace();
 
             if (directive.equals("if")) {
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index d4fb2c02..5dfa11c5 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -29,7 +29,7 @@ public TemplateParser(String src) {
     public List<Statement> parse() throws ParsingException {
         List<Statement> statements = new ArrayList<>();
         while (!src.isEOF()) {
-            statements.add(parseToken());
+            statements.add(parseToken(src.next()));
         }
         return statements;
     }
@@ -38,8 +38,7 @@ public List<Statement> parse() throws ParsingException {
      * Parses the next statement out of the stream of tokens
      */
     @NonNull
-    public Statement parseToken() throws ParsingException {
-        TemplateToken current = src.next();
+    public Statement parseToken(TemplateToken current) throws ParsingException {
         if (current.kind() == TemplateTokenKind.TEXT) {
             return new TextStatement(current.value());
         } else if (current.kind() == TemplateTokenKind.VAR) {
@@ -50,20 +49,22 @@ public Statement parseToken() throws ParsingException {
             List<Statement> other = new ArrayList<>();
             boolean isElse = false;
             while (!src.isEOF()) { // mostly equivalent to while(true), but with a overrun check
-                var curr = src.peek();
+                // we need to check the next token, instead of the next statement, because we only want to parse
+                // the next statement if we have reached the end of the for statement.
+                // But when we get the next token to check, we have already consumed that token, so we need to give it to
+                // parseToken(...) if we need to parse it, because it wasn't the end
+                var curr = src.next();
                 if (curr.kind() == TemplateTokenKind.IF_ELSE) {
                     isElse = true;
-                    src.consume(TemplateTokenKind.IF_ELSE);
                     continue;
                 }
                 if (curr.kind() == TemplateTokenKind.IF_END) {
-                    src.consume(TemplateTokenKind.IF_END);
                     break;
                 }
                 if (!isElse) {
-                    then.add(parseToken());
+                    then.add(parseToken(curr));
                 } else {
-                    other.add(parseToken());
+                    other.add(parseToken(curr));
                 }
             }
             return new IfStatement(comparison, then, other);
@@ -74,12 +75,15 @@ public Statement parseToken() throws ParsingException {
             }
             List<Statement> body = new ArrayList<>();
             while (!src.isEOF()) { // mostly equivalent to while(true), but with a overrun check
-                var curr = src.peek();
+                // we need to check the next token, instead of the next statement, because we only want to parse
+                // the next statement if we have reached the end of the for statement.
+                // But when we get the next token to check, we have already consumed that token, so we need to give it to
+                // parseToken(...) if we need to parse it, because it wasn't the end
+                var curr = src.next();
                 if (curr.kind() == TemplateTokenKind.FOR_END) {
-                    src.consume(TemplateTokenKind.FOR_END);
                     break;
                 }
-                body.add(parseToken());
+                body.add(parseToken(curr));
             }
             VarStatement listVar = VarStatement.create(head[1].trim());
             return new LoopStatement(head[0].trim(), listVar, body);
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 8e137c8f..dcec75ce 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -6,13 +6,12 @@
 import talium.system.templateParser.exeptions.*;
 import talium.system.templateParser.statements.TextStatement;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TemplateParserTest {
     private static final List<String> tokensStrings = new ArrayList<>();
@@ -76,8 +75,25 @@ public class TemplateParserTest {
     }
 
     @Test
-    public void fuzzing1M() {
-        randomFuzzing(1000000, 200);
+    void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
+        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
+    }
+
+    @Test
+    void unnecessary_tokens_to_text() throws ParsingException {
+        assert new TemplateParser("t%{ endif }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endif }")));
+        assert new TemplateParser("t%{ endfor }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")));
+        assert new TemplateParser("t%{ else }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ else }")));
+    }
+
+    @Test
+    void for_at_end_of_input() throws ParsingException {
+        new TemplateParser("%{ for i in b.list }%{endfor}").parse();
+    }
+
+    @Test
+    void if_at_end_of_input() throws ParsingException {
+        new TemplateParser("%{ if a == b }%{endif}").parse();
     }
 
     @Test
@@ -100,6 +116,16 @@ public void tokenFuzzing10K() {
         tokenFuzzing(10000, 20);
     }
 
+    @Test
+    public void fuzzing1M() {
+        randomFuzzing(1000000, 200);
+    }
+
+    @Test
+    public void tokenFuzzing1M() {
+        tokenFuzzing(1000000, 20);
+    }
+
     @Test
     public void tokenFuzzing10KLong() {
         tokenFuzzing(10000, 200);
@@ -135,17 +161,7 @@ private void test(String src, int iteration) {
         }
     }
 
-    @Test
-    void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
-    }
-
-    @Test
-    void unnecessary_tokens_to_text() throws ParsingException {
-        assert new TemplateParser("t%{ endif }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endif }")));
-        assert new TemplateParser("t%{ endfor }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")));
-        assert new TemplateParser("t%{ else }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ else }")));
-    }
+    // TODO check for colliding assignment, when for variable assigns value, but a var was already there
 
     //TODO add end-to-end tests, input string and environment, test result string
 }
\ No newline at end of file

From 3789227f1a747647d98316f6d319aa28ba9f5d94 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:07:04 +0100
Subject: [PATCH 34/58] add end-to-end compile and interpret tests

---
 .../templateParser/TemplateParserTest.java    | 45 ++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index dcec75ce..b2254645 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -96,6 +96,46 @@ void if_at_end_of_input() throws ParsingException {
         new TemplateParser("%{ if a == b }%{endif}").parse();
     }
 
+    @Test
+    void working() throws StringTemplateException {
+        class TestClassA {
+            private final String testString;
+            final int testInteger;
+
+            public TestClassA(String testString, int testInteger) {
+                this.testString = testString;
+                this.testInteger = testInteger;
+            }
+
+            public TestClassA() {
+                this.testString = "testString";
+                this.testInteger = 8457;
+            }
+        }
+        class TestClassB {
+            final boolean testBoolean = true;
+            List<TestClassA> listB = new ArrayList<>();
+            final Object testObject = null;
+
+            public TestClassB() {
+                listB.add(new TestClassA());
+                listB.add(new TestClassA("one", 1));
+                listB.add(new TestClassA("two", 2));
+                listB.add(new TestClassA("third", 3));
+                listB.add(new TestClassA("fourth", 4));
+            }
+        }
+
+        var env = new HashMap<String, Object>();
+        env.put("test", "testTEXTtest");
+        env.put("a", new TestClassA());
+        env.put("b", new TestClassB());
+        assertEquals("looooping: iteration: one, iteration: two, iteration: third, iteration: fourth, ", TemplateInterpreter.populate(new TemplateParser("looooping: %{ for i in b.listB }iteration: ${i.testString}, %{endfor}").parse(), env));
+        assertEquals("CommandResponse: testTEXTtest", TemplateInterpreter.populate(new TemplateParser("CommandResponse: ${test}").parse(), env));
+        assertEquals("CommandResponse: yes!", TemplateInterpreter.populate(new TemplateParser("CommandResponse: %{ if a.testInteger == 8457 }yes%{else}false%{endif}!").parse(), env));
+    }
+
+
     @Test
     public void fuzzing10K() {
         randomFuzzing(10000, 200);
@@ -106,11 +146,6 @@ public void fuzzing10KLong() {
         randomFuzzing(10000, 2000);
     }
 
-    @Test
-    public void tokenFuzzing1M() {
-        tokenFuzzing(1000000, 20);
-    }
-
     @Test
     public void tokenFuzzing10K() {
         tokenFuzzing(10000, 20);

From cd23c35ae7ed067ef04f3263b01a7fb6eba87067 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:08:31 +0100
Subject: [PATCH 35/58] remove next because it is now redundant since peak was
 removed

---
 .../system/templateParser/TemplateLexer.java   | 18 ++----------------
 .../system/templateParser/TemplateParser.java  |  6 +++---
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index c64d06c0..33f23806 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -14,12 +14,9 @@
  */
 public class TemplateLexer {
     CharakterStream src;
-    List<TemplateToken> tokens;
-    int pos;
 
     public TemplateLexer(String src) {
         this.src = new CharakterStream(src);
-        this.tokens = new ArrayList<>();
     }
 
     /**
@@ -30,29 +27,18 @@ public TemplateLexer(String src) {
     public List<TemplateToken> parse() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         List<TemplateToken> list = new ArrayList<>();
         while (!src.isEOF()) {
-            TemplateToken next = next();
-            list.add(next);
+            list.add(parseToken());
         }
         return list;
     }
 
-    @NonNull
-    public TemplateToken next() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        if (pos >= tokens.size()) {
-            tokens.add(parseToken());
-        }
-        TemplateToken t = tokens.get(pos);
-        pos += 1;
-        return t;
-    }
-
     /**
      * consume a singe major token from the character stream
      *
      * @return the next token
      */
     @NonNull
-    private TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEndOfInputException, UnsupportedDirective {
+    public TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEndOfInputException, UnsupportedDirective {
         if (src.isEOF()) {
             throw new UnexpectedEndOfInputException();
         }
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index 5dfa11c5..e92e7fa9 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -29,7 +29,7 @@ public TemplateParser(String src) {
     public List<Statement> parse() throws ParsingException {
         List<Statement> statements = new ArrayList<>();
         while (!src.isEOF()) {
-            statements.add(parseToken(src.next()));
+            statements.add(parseToken(src.parseToken()));
         }
         return statements;
     }
@@ -53,7 +53,7 @@ public Statement parseToken(TemplateToken current) throws ParsingException {
                 // the next statement if we have reached the end of the for statement.
                 // But when we get the next token to check, we have already consumed that token, so we need to give it to
                 // parseToken(...) if we need to parse it, because it wasn't the end
-                var curr = src.next();
+                var curr = src.parseToken();
                 if (curr.kind() == TemplateTokenKind.IF_ELSE) {
                     isElse = true;
                     continue;
@@ -79,7 +79,7 @@ public Statement parseToken(TemplateToken current) throws ParsingException {
                 // the next statement if we have reached the end of the for statement.
                 // But when we get the next token to check, we have already consumed that token, so we need to give it to
                 // parseToken(...) if we need to parse it, because it wasn't the end
-                var curr = src.next();
+                var curr = src.parseToken();
                 if (curr.kind() == TemplateTokenKind.FOR_END) {
                     break;
                 }

From 34f6383e194bc7d2ab18a6d000e66240a8438b5e Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:10:40 +0100
Subject: [PATCH 36/58] rename to parseStatement to make more consistent and
 reduce ambiguity with TemplateLexer

---
 .../system/templateParser/TemplateParser.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/system/templateParser/TemplateParser.java
index e92e7fa9..c5910f65 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/system/templateParser/TemplateParser.java
@@ -29,7 +29,7 @@ public TemplateParser(String src) {
     public List<Statement> parse() throws ParsingException {
         List<Statement> statements = new ArrayList<>();
         while (!src.isEOF()) {
-            statements.add(parseToken(src.parseToken()));
+            statements.add(parseStatement(src.parseToken()));
         }
         return statements;
     }
@@ -38,7 +38,7 @@ public List<Statement> parse() throws ParsingException {
      * Parses the next statement out of the stream of tokens
      */
     @NonNull
-    public Statement parseToken(TemplateToken current) throws ParsingException {
+    public Statement parseStatement(TemplateToken current) throws ParsingException {
         if (current.kind() == TemplateTokenKind.TEXT) {
             return new TextStatement(current.value());
         } else if (current.kind() == TemplateTokenKind.VAR) {
@@ -52,7 +52,7 @@ public Statement parseToken(TemplateToken current) throws ParsingException {
                 // we need to check the next token, instead of the next statement, because we only want to parse
                 // the next statement if we have reached the end of the for statement.
                 // But when we get the next token to check, we have already consumed that token, so we need to give it to
-                // parseToken(...) if we need to parse it, because it wasn't the end
+                // parseStatement(...) if we need to parse it, because it wasn't the end
                 var curr = src.parseToken();
                 if (curr.kind() == TemplateTokenKind.IF_ELSE) {
                     isElse = true;
@@ -62,9 +62,9 @@ public Statement parseToken(TemplateToken current) throws ParsingException {
                     break;
                 }
                 if (!isElse) {
-                    then.add(parseToken(curr));
+                    then.add(parseStatement(curr));
                 } else {
-                    other.add(parseToken(curr));
+                    other.add(parseStatement(curr));
                 }
             }
             return new IfStatement(comparison, then, other);
@@ -78,12 +78,12 @@ public Statement parseToken(TemplateToken current) throws ParsingException {
                 // we need to check the next token, instead of the next statement, because we only want to parse
                 // the next statement if we have reached the end of the for statement.
                 // But when we get the next token to check, we have already consumed that token, so we need to give it to
-                // parseToken(...) if we need to parse it, because it wasn't the end
+                // parseStatement(...) if we need to parse it, because it wasn't the end
                 var curr = src.parseToken();
                 if (curr.kind() == TemplateTokenKind.FOR_END) {
                     break;
                 }
-                body.add(parseToken(curr));
+                body.add(parseStatement(curr));
             }
             VarStatement listVar = VarStatement.create(head[1].trim());
             return new LoopStatement(head[0].trim(), listVar, body);

From 36146d8bdf22ab22af1171a9e0a07e9ad368afe3 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:13:03 +0100
Subject: [PATCH 37/58] fixed test assert

---
 bot/test/talium/system/templateParser/TemplateParserTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index b2254645..8c2dc419 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -130,7 +130,7 @@ public TestClassB() {
         env.put("test", "testTEXTtest");
         env.put("a", new TestClassA());
         env.put("b", new TestClassB());
-        assertEquals("looooping: iteration: one, iteration: two, iteration: third, iteration: fourth, ", TemplateInterpreter.populate(new TemplateParser("looooping: %{ for i in b.listB }iteration: ${i.testString}, %{endfor}").parse(), env));
+        assertEquals("looooping: iteration: testString, iteration: one, iteration: two, iteration: third, iteration: fourth, ", TemplateInterpreter.populate(new TemplateParser("looooping: %{ for i in b.listB }iteration: ${i.testString}, %{endfor}").parse(), env));
         assertEquals("CommandResponse: testTEXTtest", TemplateInterpreter.populate(new TemplateParser("CommandResponse: ${test}").parse(), env));
         assertEquals("CommandResponse: yes!", TemplateInterpreter.populate(new TemplateParser("CommandResponse: %{ if a.testInteger == 8457 }yes%{else}false%{endif}!").parse(), env));
     }

From a7710526fb059b5e08ad7210956d91ec85b44162 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Mon, 3 Feb 2025 19:36:40 +0100
Subject: [PATCH 38/58] replace assert with jupiter asserts

---
 .../templateParser/CharacterStreamTest.java   |  30 ++--
 .../TemplateInterpreterTest.java              |  22 +--
 .../templateParser/TemplateLexerTest.java     |  32 ++--
 .../templateParser/TemplateParserTest.java    |   8 +-
 .../ifParser/IfInterpreterTest.java           | 164 +++++++++---------
 .../templateParser/ifParser/IfParserTest.java |  21 +--
 6 files changed, 140 insertions(+), 137 deletions(-)

diff --git a/bot/test/talium/system/templateParser/CharacterStreamTest.java b/bot/test/talium/system/templateParser/CharacterStreamTest.java
index 51f0ef9d..f7a50083 100644
--- a/bot/test/talium/system/templateParser/CharacterStreamTest.java
+++ b/bot/test/talium/system/templateParser/CharacterStreamTest.java
@@ -3,26 +3,28 @@
 import org.junit.jupiter.api.Test;
 import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 class CharacterStreamTest {
 
     @Test
     void peek_shows_next_character() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
-        assert stream.peek() == 'T';
-        assert stream.peek() == 'T';
-        assert stream.peek() == 'T';
-        assert stream.peek() == 'T';
+        assertEquals('T', stream.peek());
+        assertEquals('T', stream.peek());
+        assertEquals('T', stream.peek());
+        assertEquals('T', stream.peek());
     }
 
     @Test
     void next_advances_to_next_character() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
-        assert stream.next() == 'T';
-        assert stream.next() == 'E';
-        assert stream.next() == 'S';
-        assert stream.next() == 'T';
-        assert stream.peek() == ' ';
-        assert stream.peek() == ' ';
+        assertEquals('T', stream.next());
+        assertEquals('E', stream.next());
+        assertEquals('S', stream.next());
+        assertEquals('T', stream.next());
+        assertEquals(' ', stream.peek());
+        assertEquals(' ', stream.peek());
     }
 
     @Test
@@ -32,16 +34,16 @@ void eof_true_at_end() throws UnexpectedEndOfInputException {
         for (int i = 0; i < testStream.length() ; i++) {
             stream.next();
         }
-        assert stream.isEOF();
+        assertTrue(stream.isEOF());
     }
 
     @Test
     void eof_false_at_not_end() throws UnexpectedEndOfInputException {
         var stream = new CharakterStream("TEST STREAM");
-        assert !stream.isEOF();
+        assertFalse(stream.isEOF());
         stream.next();
-        assert !stream.isEOF();
+        assertFalse(stream.isEOF());
         stream.next();
-        assert !stream.isEOF();
+        assertFalse(stream.isEOF());
     }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
index 419c6c04..b1f8bb0f 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
@@ -8,9 +8,9 @@
 
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.*;
 import static talium.system.templateParser.TemplateInterpreter.getNestedReplacement;
 import static talium.system.templateParser.TemplateInterpreter.populate;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class TemplateInterpreterTest {
     static List<Statement> TEMPLATE_VAR;
@@ -72,14 +72,14 @@ void iterate_non_iterable() throws InterpretationException {
         void var() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("name", "dummy name");
-            assert populate(TEMPLATE_VAR, map).equals("Hello, dummy name!");
+            assertEquals("Hello, dummy name!", populate(TEMPLATE_VAR, map));
         }
 
         @Test
         void iterate_empty_list() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("loopVar", new ArrayList<>());
-            assert populate(TEMPLATE_LOOP, map).equals("Hello,!");
+            assertEquals("Hello,!", populate(TEMPLATE_LOOP, map));
         }
 
         @Test
@@ -89,14 +89,14 @@ void nestedLoop() throws InterpretationException  {
             list.add(List.of("t-1.1", "t-1.2"));
             list.add(List.of("t-2.1", "t-2.2"));
             map.put("loopVar", list);
-            assert populate(NESTED_LOOP, map).equals("Hello, t-1.1 t-1.2 | t-2.1 t-2.2 |!");
+            assertEquals("Hello, t-1.1 t-1.2 | t-2.1 t-2.2 |!", populate(NESTED_LOOP, map));
         }
 
         @Test
         void if_() throws InterpretationException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("compLeft", "testString");
-            assert populate(TEMPLATE_IF, map).equals("Hello, testString!");
+            assertEquals("Hello, testString!", populate(TEMPLATE_IF, map));
         }
 
         @Test
@@ -120,7 +120,7 @@ void string() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("test", "testing String");
             map.put("dummyVar", 23899);
-            assert getNestedReplacement(VarStatement.create("test"), map).equals("testing String");
+            assertEquals("testing String", getNestedReplacement(VarStatement.create("test"), map));
         }
 
         @Test
@@ -128,7 +128,7 @@ void integer() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("integerValue", 23899);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement(VarStatement.create("integerValue"), map).equals(23899);
+            assertEquals(23899, getNestedReplacement(VarStatement.create("integerValue"), map));
         }
 
         @Test
@@ -137,7 +137,7 @@ void object_path() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement(VarStatement.create("testObject.testInteger"), map).equals(23899);
+            assertEquals(23899, getNestedReplacement(VarStatement.create("testObject.testInteger"), map));
         }
 
         @Test
@@ -148,7 +148,7 @@ void list() throws InterpretationException, TemplateSyntaxException {
             list.add("dummyString");
             map.put("listVar", list);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement(VarStatement.create("listVar"), map).equals(list);
+            assertEquals(list, getNestedReplacement(VarStatement.create("listVar"), map));
         }
 
         @Test
@@ -169,7 +169,7 @@ void end_value_null() throws InterpretationException, TemplateSyntaxException {
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement(VarStatement.create("testObject.testString"), map) == null;
+            assertNull(getNestedReplacement(VarStatement.create("testObject.testString"), map));
         }
 
         @Test
@@ -187,7 +187,7 @@ public PrivateClass(String testString, int testInteger) {
             HashMap<String, Object> map = new HashMap<>();
             map.put("testObject", testClass);
             map.put("dummyVar", "testing String");
-            assert getNestedReplacement(VarStatement.create("testObject.testString"), map).equals("testString");
+            assertEquals("testString", getNestedReplacement(VarStatement.create("testObject.testString"), map));
         }
 
         @Test
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index 74e2ec67..224b8c39 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -9,7 +9,7 @@
 
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 // the correct behaviour is not entirely specified, thats why this test is disabled by default.
 // more or less: if a token is started it has to be finished, otherwise it is a syntax error
@@ -27,9 +27,9 @@ void missing_closing_bracket() throws UnsupportedDirective, UnexpectedEndOfInput
     @Test
     void missing_dollar() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         var tokens = new TemplateLexer("Hello, {var.name}!").parse();
-        assert tokens.size() == 1;
-        assert tokens.getFirst().kind() == TemplateTokenKind.TEXT;
-        assert tokens.getFirst().value().equals("Hello, {var.name}!");
+        assertEquals(1, tokens.size());
+        assertEquals(TemplateTokenKind.TEXT, tokens.getFirst().kind());
+        assertEquals("Hello, {var.name}!", tokens.getFirst().value());
     }
 
     @Test
@@ -44,14 +44,14 @@ void missing_closing_bracket_directive() throws UnsupportedDirective, Unexpected
     @Test
     void missing_percent() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
         var tokens = new TemplateLexer("Hello, %{ if var.name != \"\" }${var.name}%{ else }unnamed{ endif }").parse();
-        assert tokens.size() == 5;
-        assert tokens.get(0).kind() == TemplateTokenKind.TEXT;
-        assert tokens.get(0).value().equals("Hello, ");
-        assert tokens.get(1).kind() == TemplateTokenKind.IF_HEAD;
-        assert tokens.get(2).kind() == TemplateTokenKind.VAR;
-        assert tokens.get(3).kind() == TemplateTokenKind.IF_ELSE;
-        assert tokens.get(4).kind() == TemplateTokenKind.TEXT;
-        assert tokens.get(4).value().equals("unnamed{ endif }");
+        assertEquals(5, tokens.size());
+        assertEquals(TemplateTokenKind.TEXT, tokens.get(0).kind());
+        assertEquals("Hello, ", tokens.get(0).value());
+        assertEquals(TemplateTokenKind.IF_HEAD, tokens.get(1).kind());
+        assertEquals(TemplateTokenKind.VAR, tokens.get(2).kind());
+        assertEquals(TemplateTokenKind.IF_ELSE, tokens.get(3).kind());
+        assertEquals(TemplateTokenKind.TEXT, tokens.get(4).kind());
+        assertEquals("unnamed{ endif }", tokens.get(4).value());
     }
 
     @Test
@@ -89,13 +89,13 @@ void variable_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputE
 
     @Test
     void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
+        assertFalse(new TemplateLexer("t%{   endif }").parse().contains(null));
     }
 
     @Test
     void unnecessary_tokens_to_text() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        assert new TemplateLexer("t%{ endif }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.endif()));
-        assert new TemplateLexer("t%{ endfor }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.for_end()));
-        assert new TemplateLexer("t%{ else }").parse().equals(List.of(TemplateToken.text("t"), TemplateToken.if_else()));
+        assertEquals(List.of(TemplateToken.text("t"), TemplateToken.endif() ), new TemplateLexer("t%{ endif }").parse());
+        assertEquals(List.of(TemplateToken.text("t"), TemplateToken.for_end()), new TemplateLexer("t%{ endfor }").parse());
+        assertEquals(List.of(TemplateToken.text("t"), TemplateToken.if_else()), new TemplateLexer("t%{ else }").parse());
     }
 }
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 8c2dc419..34d48b0b 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -76,14 +76,14 @@ public class TemplateParserTest {
 
     @Test
     void returnNonNull() throws UnexpectedTokenException, UnsupportedDirective, UnexpectedEndOfInputException {
-        assert !new TemplateLexer("t%{   endif }").parse().contains(null);
+        assertFalse(new TemplateLexer("t%{   endif }").parse().contains(null));
     }
 
     @Test
     void unnecessary_tokens_to_text() throws ParsingException {
-        assert new TemplateParser("t%{ endif }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endif }")));
-        assert new TemplateParser("t%{ endfor }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")));
-        assert new TemplateParser("t%{ else }").parse().equals(List.of(new TextStatement("t"), new TextStatement("%{ else }")));
+        assertEquals(List.of(new TextStatement("t"), new TextStatement("%{ endif }")), new TemplateParser("t%{ endif }").parse());
+        assertEquals(List.of(new TextStatement("t"), new TextStatement("%{ endfor }")), new TemplateParser("t%{ endfor }").parse());
+        assertEquals(List.of(new TextStatement("t"), new TextStatement("%{ else }")), new TemplateParser("t%{ else }").parse());
     }
 
     @Test
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
index e5ea73eb..64846be6 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
@@ -8,7 +8,7 @@
 
 import java.util.ArrayList;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class IfInterpreterTest {
 
@@ -16,70 +16,70 @@ public class IfInterpreterTest {
     class OperatorTests {
         @Test
         void ints() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 348));
-            assert !IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 34993497));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 348)));
+            assertFalse(IfInterpreter.compare(new Comparison(34993497, Equals.NOT_EQUALS, 34993497)));
 
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.EQUALS, 34993497));
-            assert !IfInterpreter.compare(new Comparison(34993497, Equals.EQUALS, 348));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.EQUALS, 34993497)));
+            assertFalse(IfInterpreter.compare(new Comparison(34993497, Equals.EQUALS, 348)));
 
-            assert IfInterpreter.compare(new Comparison(348, Equals.LESS_THAN, 34993497));
-            assert !IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN, 34993497));
+            assertTrue(IfInterpreter.compare(new Comparison(348, Equals.LESS_THAN, 34993497)));
+            assertFalse(IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN, 34993497)));
 
-            assert IfInterpreter.compare(new Comparison(348, Equals.LESS_THAN_OR_EQUALS, 34993497));
-            assert !IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN_OR_EQUALS, 348));
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN_OR_EQUALS, 34993497));
+            assertTrue(IfInterpreter.compare(new Comparison(348, Equals.LESS_THAN_OR_EQUALS, 34993497)));
+            assertFalse(IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN_OR_EQUALS, 348)));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.LESS_THAN_OR_EQUALS, 34993497)));
 
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN, 348));
-            assert !IfInterpreter.compare(new Comparison(348, Equals.GREATER_THAN, 34993497));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN, 348)));
+            assertFalse(IfInterpreter.compare(new Comparison(348, Equals.GREATER_THAN, 34993497)));
 
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN_OR_EQUALS, 348));
-            assert !IfInterpreter.compare(new Comparison(348, Equals.GREATER_THAN_OR_EQUALS, 34993497));
-            assert IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN_OR_EQUALS, 34993497));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN_OR_EQUALS, 348)));
+            assertFalse(IfInterpreter.compare(new Comparison(348, Equals.GREATER_THAN_OR_EQUALS, 34993497)));
+            assertTrue(IfInterpreter.compare(new Comparison(34993497, Equals.GREATER_THAN_OR_EQUALS, 34993497)));
         }
 
         @Test
         void longs() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 19282L));
-            assert !IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 6323833349178L));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 19282L)));
+            assertFalse(IfInterpreter.compare(new Comparison(6323833349178L, Equals.NOT_EQUALS, 6323833349178L)));
 
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.EQUALS, 6323833349178L));
-            assert !IfInterpreter.compare(new Comparison(6323833349178L, Equals.EQUALS, 19282L));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.EQUALS, 6323833349178L)));
+            assertFalse(IfInterpreter.compare(new Comparison(6323833349178L, Equals.EQUALS, 19282L)));
 
-            assert IfInterpreter.compare(new Comparison(19282L, Equals.LESS_THAN, 6323833349178L));
-            assert !IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN, 6323833349178L));
+            assertTrue(IfInterpreter.compare(new Comparison(19282L, Equals.LESS_THAN, 6323833349178L)));
+            assertFalse(IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN, 6323833349178L)));
 
-            assert IfInterpreter.compare(new Comparison(19282L, Equals.LESS_THAN_OR_EQUALS, 6323833349178L));
-            assert !IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN_OR_EQUALS, 19282L));
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN_OR_EQUALS, 6323833349178L));
+            assertTrue(IfInterpreter.compare(new Comparison(19282L, Equals.LESS_THAN_OR_EQUALS, 6323833349178L)));
+            assertFalse(IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN_OR_EQUALS, 19282L)));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.LESS_THAN_OR_EQUALS, 6323833349178L)));
 
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN, 19282L));
-            assert !IfInterpreter.compare(new Comparison(19282L, Equals.GREATER_THAN, 6323833349178L));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN, 19282L)));
+            assertFalse(IfInterpreter.compare(new Comparison(19282L, Equals.GREATER_THAN, 6323833349178L)));
 
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN_OR_EQUALS, 19282L));
-            assert !IfInterpreter.compare(new Comparison(19282L, Equals.GREATER_THAN_OR_EQUALS, 6323833349178L));
-            assert IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN_OR_EQUALS, 6323833349178L));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN_OR_EQUALS, 19282L)));
+            assertFalse(IfInterpreter.compare(new Comparison(19282L, Equals.GREATER_THAN_OR_EQUALS, 6323833349178L)));
+            assertTrue(IfInterpreter.compare(new Comparison(6323833349178L, Equals.GREATER_THAN_OR_EQUALS, 6323833349178L)));
         }
         @Test
         void floats() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 12.28434F));
-            assert !IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 687.000033339284F));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 12.28434F)));
+            assertFalse(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.NOT_EQUALS, 687.000033339284F)));
 
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.EQUALS, 687.000033339284F));
-            assert !IfInterpreter.compare(new Comparison(687.000033339284F, Equals.EQUALS, 12.28434F));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.EQUALS, 687.000033339284F)));
+            assertFalse(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.EQUALS, 12.28434F)));
 
-            assert IfInterpreter.compare(new Comparison(12.28434F, Equals.LESS_THAN, 687.000033339284F));
-            assert !IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN, 687.000033339284F));
+            assertTrue(IfInterpreter.compare(new Comparison(12.28434F, Equals.LESS_THAN, 687.000033339284F)));
+            assertFalse(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN, 687.000033339284F)));
 
-            assert IfInterpreter.compare(new Comparison(12.28434F, Equals.LESS_THAN_OR_EQUALS, 687.000033339284F));
-            assert !IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN_OR_EQUALS, 12.28434F));
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN_OR_EQUALS, 687.000033339284F));
+            assertTrue(IfInterpreter.compare(new Comparison(12.28434F, Equals.LESS_THAN_OR_EQUALS, 687.000033339284F)));
+            assertFalse(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN_OR_EQUALS, 12.28434F)));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.LESS_THAN_OR_EQUALS, 687.000033339284F)));
 
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN, 12.28434F));
-            assert !IfInterpreter.compare(new Comparison(12.28434F, Equals.GREATER_THAN, 687.000033339284F));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN, 12.28434F)));
+            assertFalse(IfInterpreter.compare(new Comparison(12.28434F, Equals.GREATER_THAN, 687.000033339284F)));
 
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN_OR_EQUALS, 12.28434F));
-            assert !IfInterpreter.compare(new Comparison(12.28434F, Equals.GREATER_THAN_OR_EQUALS, 687.000033339284F));
-            assert IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN_OR_EQUALS, 687.000033339284F));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN_OR_EQUALS, 12.28434F)));
+            assertFalse(IfInterpreter.compare(new Comparison(12.28434F, Equals.GREATER_THAN_OR_EQUALS, 687.000033339284F)));
+            assertTrue(IfInterpreter.compare(new Comparison(687.000033339284F, Equals.GREATER_THAN_OR_EQUALS, 687.000033339284F)));
         }
     }
 
@@ -87,65 +87,65 @@ void floats() throws ImpossibleComparisonException {
     class TypeTests {
         @Test
         void boolean_boolean() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, false));
-            assert IfInterpreter.compare(new Comparison(false, Equals.EQUALS, false));
-            assert !IfInterpreter.compare(new Comparison(false, Equals.EQUALS, true));
+            assertTrue(IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, false)));
+            assertTrue(IfInterpreter.compare(new Comparison(false, Equals.EQUALS, false)));
+            assertFalse(IfInterpreter.compare(new Comparison(false, Equals.EQUALS, true)));
         }
 
         @Test
         void string_string() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison("test", Equals.NOT_EQUALS, "wort"));
-            assert IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "test"));
-            assert !IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "wort"));
+            assertTrue(IfInterpreter.compare(new Comparison("test", Equals.NOT_EQUALS, "wort")));
+            assertTrue(IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "test")));
+            assertFalse(IfInterpreter.compare(new Comparison("test", Equals.EQUALS, "wort")));
         }
 
         @Test
         void int_int() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11));
-            assert IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10));
-            assert !IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11));
+            assertTrue(IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11)));
+            assertTrue(IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10)));
+            assertFalse(IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11)));
         }
 
         @Test
         void long_long() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10L, Equals.NOT_EQUALS, 11L));
-            assert IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 10L));
-            assert !IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 11L));
+            assertTrue(IfInterpreter.compare(new Comparison(10L, Equals.NOT_EQUALS, 11L)));
+            assertTrue(IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 10L)));
+            assertFalse(IfInterpreter.compare(new Comparison(10L, Equals.EQUALS, 11L)));
         }
 
         @Test
         void float_float() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323F));
-            assert IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F));
-            assert !IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323F));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323F)));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F)));
+            assertFalse(IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323F)));
         }
 
         @Test
         void double_double() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10.32323D, Equals.NOT_EQUALS, 10.52323D));
-            assert IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.32323D));
-            assert !IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.52323D));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323D, Equals.NOT_EQUALS, 10.52323D)));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.32323D)));
+            assertFalse(IfInterpreter.compare(new Comparison(10.32323D, Equals.EQUALS, 10.52323D)));
         }
 
         @Test
         void char_char() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison('t', Equals.NOT_EQUALS, 'w'));
-            assert IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 't'));
-            assert !IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 'w'));
+            assertTrue(IfInterpreter.compare(new Comparison('t', Equals.NOT_EQUALS, 'w')));
+            assertTrue(IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 't')));
+            assertFalse(IfInterpreter.compare(new Comparison('t', Equals.EQUALS, 'w')));
         }
 
         @Test
         void int_long() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11L));
-            assert IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10));
-            assert !IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11L));
+            assertTrue(IfInterpreter.compare(new Comparison(10, Equals.NOT_EQUALS, 11L)));
+            assertTrue(IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 10)));
+            assertFalse(IfInterpreter.compare(new Comparison(10, Equals.EQUALS, 11L)));
         }
 
         @Test
         void float_double() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323D));
-            assert IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F));
-            assert !IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323D));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323F, Equals.NOT_EQUALS, 10.52323D)));
+            assertTrue(IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.32323F)));
+            assertFalse(IfInterpreter.compare(new Comparison(10.32323F, Equals.EQUALS, 10.52323D)));
         }
 
         @Test
@@ -209,33 +209,33 @@ void object_boolean() {
     class Nulls {
         @Test
         void null_null() throws ImpossibleComparisonException {
-            assert IfInterpreter.compare(new Comparison(null, Equals.EQUALS, null));
-            assert !IfInterpreter.compare(new Comparison(null, Equals.NOT_EQUALS, null));
+            assertTrue(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, null)));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.NOT_EQUALS, null)));
         }
         @Test
         void null_int() throws ImpossibleComparisonException {
-            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021));
-            assert IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021)));
+            assertTrue(IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null)));
         }
         @Test
         void null_double() throws ImpossibleComparisonException {
-            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 29.12939349232));
-            assert IfInterpreter.compare(new Comparison(9289498293.39323, Equals.NOT_EQUALS, null));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 29.12939349232)));
+            assertTrue(IfInterpreter.compare(new Comparison(9289498293.39323, Equals.NOT_EQUALS, null)));
         }
         @Test
         void null_string() throws ImpossibleComparisonException {
-            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021));
-            assert IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, 102021)));
+            assertTrue(IfInterpreter.compare(new Comparison(9349834, Equals.NOT_EQUALS, null)));
         }
         @Test
         void null_boolean() throws ImpossibleComparisonException {
-            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, false));
-            assert IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, null));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, false)));
+            assertTrue(IfInterpreter.compare(new Comparison(true, Equals.NOT_EQUALS, null)));
         }
         @Test
         void null_Object() throws ImpossibleComparisonException {
-            assert !IfInterpreter.compare(new Comparison(null, Equals.EQUALS, new Object()));
-            assert IfInterpreter.compare(new Comparison(new ArrayList<Exception>(), Equals.NOT_EQUALS, null));
+            assertFalse(IfInterpreter.compare(new Comparison(null, Equals.EQUALS, new Object())));
+            assertTrue(IfInterpreter.compare(new Comparison(new ArrayList<Exception>(), Equals.NOT_EQUALS, null)));
         }
     }
 }
diff --git a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
index 350b1da8..7e32f506 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
+++ b/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
@@ -8,6 +8,7 @@
 import talium.system.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static talium.system.templateParser.ifParser.IfParser.parse;
 
@@ -16,7 +17,7 @@ public class IfParserTest {
     @Test
     void test_success() throws UnsupportedComparisonOperator, TemplateSyntaxException, UnexpectedEndOfInputException {
         var comp = new Comparison(VarStatement.create("var.name"), Equals.NOT_EQUALS, "test");
-        assert parse("var.name != \"test\"").equals(comp);
+        assertEquals(comp, parse("var.name != \"test\""));
     }
 
     @Test
@@ -36,31 +37,31 @@ void invalid_operator() throws UnsupportedComparisonOperator, TemplateSyntaxExce
     @Test
     void test_types() throws UnsupportedComparisonOperator, TemplateSyntaxException, UnexpectedEndOfInputException {
         var bool = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, false);
-        assert parse("var.name == false").equals(bool);
+        assertEquals(bool, parse("var.name == false"));
 
         var string = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, "test");
-        assert parse("var.name == \"test\"").equals(string);
+        assertEquals(string, parse("var.name == \"test\""));
 
         var character = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, "a");
-        assert parse("var.name == \"a\"").equals(character);
+        assertEquals(character, parse("var.name == \"a\""));
 
         var byte_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 159);
-        assert parse("var.name == 159").equals(byte_);
+        assertEquals(byte_, parse("var.name == 159"));
 
         var short_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 16000);
-        assert parse("var.name == 16000").equals(short_);
+        assertEquals(short_, parse("var.name == 16000"));
 
         var int_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 273650);
-        assert parse("var.name == 273650").equals(int_);
+        assertEquals(int_, parse("var.name == 273650"));
 
         var long_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 1729010172331L);
-        assert parse("var.name == 1729010172331").equals(long_);
+        assertEquals(long_, parse("var.name == 1729010172331"));
 
         var float_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 69.4200);
-        assert parse("var.name == 69.4200").equals(float_);
+        assertEquals(float_, parse("var.name == 69.4200"));
 
         var double_ = new Comparison(VarStatement.create("var.name"), Equals.EQUALS, 3.1415d);
-        assert parse("var.name == 3.1415").equals(double_);
+        assertEquals(double_, parse("var.name == 3.1415"));
     }
 
     @Test

From 20d71aa0bbb253b24276fe848890221809ce39ac Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 4 Feb 2025 01:58:42 +0100
Subject: [PATCH 39/58] remove outdated todos

---
 .../templateParser/exeptions/UnexpectedEndOfInputException.java | 1 -
 bot/test/talium/system/templateParser/TemplateParserTest.java   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java b/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
index ef4d9bdb..24f7c708 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
+++ b/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
@@ -2,7 +2,6 @@
 
 
 public class UnexpectedEndOfInputException extends ParsingException {
-    //TODO maybe this should only be thrown be low level api's and higher level API's should about not getting an expected token
     public UnexpectedEndOfInputException() {
         super();
     }
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/system/templateParser/TemplateParserTest.java
index 34d48b0b..0cfc0430 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/system/templateParser/TemplateParserTest.java
@@ -197,6 +197,4 @@ private void test(String src, int iteration) {
     }
 
     // TODO check for colliding assignment, when for variable assigns value, but a var was already there
-
-    //TODO add end-to-end tests, input string and environment, test result string
 }
\ No newline at end of file

From ef36a69e73ce3ef359e979f3a7dfce82346cf2e2 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 4 Feb 2025 13:57:42 +0100
Subject: [PATCH 40/58] extract autowired values from TipeeeInput to make it
 more testable

---
 bot/main/talium/TwitchBot.java                |  5 +-
 .../inputs/TipeeeStream/TipeeeConfig.java     | 48 ++++++++++++++++
 .../inputs/TipeeeStream/TipeeeInput.java      | 57 +++++++------------
 3 files changed, 71 insertions(+), 39 deletions(-)
 create mode 100644 bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index a312b2a7..539105c3 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -2,6 +2,7 @@
 
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
+import talium.inputs.TipeeeStream.TipeeeConfig;
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.system.StopWatch;
@@ -33,14 +34,14 @@ public static void main(String[] args) {
 
     public static void startup() {
         StopWatch time = new StopWatch(StopWatch.TYPE.STARTUP);
-        SpringApplication.run(TwitchBot.class);
+        var ctx = SpringApplication.run(TwitchBot.class);
         System.out.println();
         System.out.println("DateFormat: DayNumber-Hour:Minute:Second:Millis");
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
 
         twitch = startInput(new Twitch4JInput());
-        tipeee = startInput(new TipeeeInput());
+        tipeee = startInput(new TipeeeInput(ctx.getBean(TipeeeConfig.class)));
 
         logger.info("Inputs started, initializing other system components...");
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java b/bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java
new file mode 100644
index 00000000..c90786da
--- /dev/null
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java
@@ -0,0 +1,48 @@
+package talium.inputs.TipeeeStream;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Optional;
+
+@Component
+public record TipeeeConfig(
+        // we can set this manually as a backup if the response of the tipeeeSocketInfoUrl isn't updated
+        Optional<String> socketUrl,
+        String apiKey,
+        String channelName,
+        String tipeeeSocketInfoUrl
+) {
+
+    @Autowired
+    public TipeeeConfig(@Value("${tipeeeSocketUrl:}") Optional<String> socketUrl,
+                        @Value("${tipeeeApikey}") String apiKey,
+                        @Value("${tipeeeChannel}") String channelName) {
+        this(socketUrl, apiKey, channelName, "https://api.tipeeestream.com/v2.0/site/socket");
+    }
+
+    public TipeeeConfig(TipeeeConfig defaults, String socketUrl) {
+        this(defaults.socketUrl, socketUrl, defaults.apiKey, defaults.channelName);
+    }
+
+    boolean hasSocketUrl() {
+        return socketUrl.isPresent() && !socketUrl.get().isEmpty();
+    }
+
+    boolean hasApiKey() {
+        return apiKey != null && !apiKey.isEmpty();
+    }
+
+    boolean hasChannelName() {
+        return channelName != null && !channelName.isEmpty();
+    }
+
+    boolean hasTipeeeSocketInfoUrl() {
+        return tipeeeSocketInfoUrl != null && !tipeeeSocketInfoUrl.isEmpty();
+    }
+
+    boolean isDisabled() {
+        return !hasApiKey() && !hasChannelName();
+    }
+}
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index 0f36d341..5fd5b606 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -4,7 +4,6 @@
 import io.socket.client.Socket;
 import io.socket.engineio.client.EngineIOException;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Component;
 import talium.Registrar;
 import talium.TwitchBot;
 import talium.system.inputSystem.BotInput;
@@ -14,7 +13,6 @@
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.net.URI;
@@ -25,35 +23,15 @@
 import java.time.Instant;
 import java.util.Arrays;
 
-@Component
 public class TipeeeInput implements BotInput {
-    private static final String tipeeeSocketInfoUrl = "https://api.tipeeestream.com/v2.0/site/socket";
-
-    // we can set this manually as a backup if the response of the tipeeeSocketInfoUrl isn't updated
-    @Value("${tipeeeSocketUrl}")
-    public static void setTipeeeSocketUrl(String tipeeeSocketUrl) {
-        TipeeeInput.tipeeeSocketUrl = tipeeeSocketUrl;
-    }
-
-    private static String tipeeeSocketUrl;
-
-    @Value("${tipeeeApikey}")
-    public void setApiKey(String apiKey) {
-        TipeeeInput.apiKey = apiKey;
-    }
-
-    private static String apiKey;
+    private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
+    private Socket socket;
+    private TipeeeConfig config;
 
-    @Value("${tipeeeChannel}")
-    public void setChannelName(String channelName) {
-        TipeeeInput.channelName = channelName;
+    public TipeeeInput(TipeeeConfig config) {
+        this.config = config;
     }
 
-    private static String channelName;
-
-    private Socket socket;
-    private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
-
     @Override
     public void shutdown() {
         if (socket != null) {
@@ -65,23 +43,27 @@ public void shutdown() {
 
     @Override
     public void run() {
+        //TODO split all run() content into other function, that function thorws instead of logging, catch all and just log in run()
+        // that way we can test the throwing behaviour of this class
+        //TODO correction, this function should be renamed to "start"/startup, it is allowed to throw, that is caught by
+        // TwitchBot.startInput and already handled well. But when creating a new thread in here,
+        // the inside of the thread should have it's own error boundary, and log all errors
         Registrar.registerHealthDescription(TipeeeInput.class, "TipeeeStreamInput", "");
-
-        if (apiKey == null || apiKey.isEmpty() && channelName == null || channelName.isEmpty()) {
+        if (config.isDisabled()) {
             LOGGER.warn("TipeeeStream Module is disabled");
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.STOPPED);
             return;
         }
         HealthManager.reportStatus(TipeeeInput.class, InputStatus.STARTING);
-        LOGGER.info("Stating TipeeeInput for Channel {}", channelName);
-        if (tipeeeSocketUrl == null || tipeeeSocketUrl.isEmpty()) {
+        LOGGER.info("Stating TipeeeInput for Channel {}", config.channelName());
+        if (!config.hasSocketUrl()) {
             LOGGER.info("Getting current Tipeee Socket.io url...");
-            tipeeeSocketUrl = STR."\{getSocketUrlFromUrl()}?access_token=";
+            config = new TipeeeConfig(config, STR."\{getSocketUrlFromUrl(config.tipeeeSocketInfoUrl())}?access_token=");
         }
 
         URI socketUrl;
         try {
-            socketUrl = new URI(tipeeeSocketUrl + apiKey);
+            socketUrl = new URI(config.socketUrl().get() + config.apiKey());
         } catch (URISyntaxException e) {
             LOGGER.error("tipeeeSocketUrl is not a valid url", e);
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
@@ -109,12 +91,13 @@ public void run() {
         });
 
         socket.on(Socket.EVENT_CONNECT, _ -> {
-            socket.emit("join-room", STR."{ room: '\{apiKey}', username: '\{channelName}'}");
+            socket.emit("join-room", STR."{ room: '\{config.apiKey()}', username: '\{config.channelName()}'}");
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.HEALTHY);
         });
 
         socket.on("new-event", data -> TipeeeEventHandler.handleDonationEvent(Arrays.toString(data)));
 
+        // creates a new thread that receives the events and triggers our listeners
         socket.connect();
         //Wait for the Socket to connect, because it will be opened in a new Thread and
         // so will otherwise not be done by the time we check if the starting has worked
@@ -124,10 +107,10 @@ public void run() {
         LOGGER.info("Tipeee socket connected");
     }
 
-    private String getSocketUrlFromUrl() {
+    private String getSocketUrlFromUrl(String socketInfoUrl) {
         try {
             var client = HttpClient.newBuilder().build();
-            var request = HttpRequest.newBuilder(URI.create(tipeeeSocketInfoUrl)).GET().build();
+            var request = HttpRequest.newBuilder(URI.create(socketInfoUrl)).GET().build();
             var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
             client.close();
             var d = new JSONObject(httpResponse.body()).getJSONObject("datas");
@@ -141,4 +124,4 @@ private String getSocketUrlFromUrl() {
         }
     }
 
-}
+}
\ No newline at end of file

From fce22fa9aaf107e4123ffcca007b32df275aabc9 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Tue, 4 Feb 2025 14:35:24 +0100
Subject: [PATCH 41/58] make tipeeeInput throw exceptions on startup

---
 bot/main/talium/TwitchBot.java                | 16 +++---
 .../inputs/TipeeeStream/TipeeeInput.java      | 50 ++++++++++++-------
 .../talium/inputs/Twitch4J/Twitch4JInput.java |  2 +-
 .../talium/system/inputSystem/BotInput.java   |  5 +-
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 539105c3..01613839 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -66,8 +66,8 @@ public static void shutdown() {
 
     private static BotInput startInput(BotInput input) {
         try {
-            input.run();
-        } catch (RuntimeException e) {
+            input.startup();
+        } catch (Exception e) {
             logger.error("Exception starting Input: {} because: {}", input.getClass().getCanonicalName(), e.getMessage());
             HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
         }
@@ -75,13 +75,11 @@ private static BotInput startInput(BotInput input) {
     }
 
     private static void stopInput(BotInput input) {
-        if (input != null) {
-            try {
-                input.shutdown();
-            } catch (Exception e) {
-                logger.error("Exception stopping Input: {} because: {}", input.getClass().getCanonicalName(), e.getMessage());
-                HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
-            }
+        try {
+            input.shutdown();
+        } catch (Exception e) {
+            logger.error("Exception stopping Input: {} because: {}", input.getClass().getCanonicalName(), e.getMessage());
+            HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
         }
     }
 }
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index 5fd5b606..b0267fa5 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -24,6 +24,23 @@
 import java.util.Arrays;
 
 public class TipeeeInput implements BotInput {
+
+    public static class TipeeeStreamException extends Exception {
+        public TipeeeStreamException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+    public static class NoValidSocketUrl extends TipeeeStreamException {
+        public NoValidSocketUrl(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+    public static class SocketInfoEndpointException extends TipeeeStreamException {
+        public SocketInfoEndpointException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
     private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
     private Socket socket;
     private TipeeeConfig config;
@@ -32,7 +49,6 @@ public TipeeeInput(TipeeeConfig config) {
         this.config = config;
     }
 
-    @Override
     public void shutdown() {
         if (socket != null) {
             socket.close();
@@ -42,12 +58,7 @@ public void shutdown() {
     }
 
     @Override
-    public void run() {
-        //TODO split all run() content into other function, that function thorws instead of logging, catch all and just log in run()
-        // that way we can test the throwing behaviour of this class
-        //TODO correction, this function should be renamed to "start"/startup, it is allowed to throw, that is caught by
-        // TwitchBot.startInput and already handled well. But when creating a new thread in here,
-        // the inside of the thread should have it's own error boundary, and log all errors
+    public void startup() throws TipeeeStreamException {
         Registrar.registerHealthDescription(TipeeeInput.class, "TipeeeStreamInput", "");
         if (config.isDisabled()) {
             LOGGER.warn("TipeeeStream Module is disabled");
@@ -58,36 +69,39 @@ public void run() {
         LOGGER.info("Stating TipeeeInput for Channel {}", config.channelName());
         if (!config.hasSocketUrl()) {
             LOGGER.info("Getting current Tipeee Socket.io url...");
-            config = new TipeeeConfig(config, STR."\{getSocketUrlFromUrl(config.tipeeeSocketInfoUrl())}?access_token=");
+            try {
+                String socketUrlFromUrl = getSocketUrlFromUrl(config.tipeeeSocketInfoUrl());
+                config = new TipeeeConfig(config, STR."\{socketUrlFromUrl}?access_token=");
+            } catch (SocketInfoEndpointException e) {
+                throw new NoValidSocketUrl("Could not get up-to-date socket url from url Info endpoint", e);
+            }
         }
 
         URI socketUrl;
         try {
             socketUrl = new URI(config.socketUrl().get() + config.apiKey());
         } catch (URISyntaxException e) {
-            LOGGER.error("tipeeeSocketUrl is not a valid url", e);
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
-            throw new RuntimeException(e);
+            throw new NoValidSocketUrl("Could not build valid socket Url: ", e);
         }
 
         LOGGER.info("using Socket.io url: {}", socketUrl);
         socket = IO.socket(socketUrl);
 
-
         socket.on(Socket.EVENT_CONNECT_ERROR, objects -> {
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
             if (objects.length == 1 && objects[0] instanceof EngineIOException && ((EngineIOException) objects[0]).getCause() instanceof IOException io) {
                 if (io.getMessage().equals("403")) {
                     LOGGER.error("TipeeeStream Authentication failed, likely because the Apikey is invalid");
-                    socket.disconnect();
                 } else if (StringUtils.isNumeric(io.getMessage())) {
                     LOGGER.error("TipeeeStream Socket connection failed with (what likely is) Http Status code: {}", io.getMessage());
                     ((EngineIOException) objects[0]).printStackTrace();
                 }
             } else {
-                LOGGER.error("Failed to connect to tipeeeStream Websocket: {}", Arrays.toString(objects));
-                throw new RuntimeException(Arrays.toString(objects));
+                LOGGER.error("Failed to connect to tipeeeStream Websocket for unknown reason: {}", Arrays.toString(objects));
             }
+            HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
+            socket.disconnect();
         });
 
         socket.on(Socket.EVENT_CONNECT, _ -> {
@@ -107,7 +121,7 @@ public void run() {
         LOGGER.info("Tipeee socket connected");
     }
 
-    private String getSocketUrlFromUrl(String socketInfoUrl) {
+    private String getSocketUrlFromUrl(String socketInfoUrl) throws SocketInfoEndpointException {
         try {
             var client = HttpClient.newBuilder().build();
             var request = HttpRequest.newBuilder(URI.create(socketInfoUrl)).GET().build();
@@ -116,11 +130,9 @@ private String getSocketUrlFromUrl(String socketInfoUrl) {
             var d = new JSONObject(httpResponse.body()).getJSONObject("datas");
             return STR."\{d.getString("host")}:\{d.getString("port")}";
         } catch (IOException | InterruptedException e) {
-            LOGGER.error("Error while requesting tipeeeStream socket url!", e);
-            throw new RuntimeException("Error while requesting tipeeeStream socket url!", e);
+            throw new SocketInfoEndpointException("Error while requesting tipeeeStream socket url!", e);
         } catch (JSONException e) {
-            LOGGER.error("TipeeeStream socket info Url responded with unknown format!", e);
-            throw new RuntimeException("TipeeeStream socket info Url responded with unknown format!", e);
+            throw new SocketInfoEndpointException("TipeeeStream socket info Url responded with unknown format!", e);
         }
     }
 
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 55099513..9bd61e5d 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -73,7 +73,7 @@ public void setApp_clientSecret(String app_clientSecret) {
     protected static String broadCasterChannelId;
 
     @Override
-    public void run() {
+    public void startup() {
         logger.debug("Starting... ");
         Registrar.registerHealthDescription(Twitch4JInput.class, "Twitch4JInput", "");
         HealthManager.reportStatus(Twitch4JInput.class, InputStatus.STARTING);
diff --git a/bot/main/talium/system/inputSystem/BotInput.java b/bot/main/talium/system/inputSystem/BotInput.java
index 0c12314d..55f17c98 100644
--- a/bot/main/talium/system/inputSystem/BotInput.java
+++ b/bot/main/talium/system/inputSystem/BotInput.java
@@ -1,8 +1,7 @@
 package talium.system.inputSystem;
 
-public interface BotInput extends Runnable {
-    @Override
-    void run();
+public interface BotInput {
+    void startup() throws Exception;
 
     void shutdown();
 }

From bc5ba71f652a78f10f083135fa06647866d397cc Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 5 Feb 2025 11:11:45 +0100
Subject: [PATCH 42/58] test tipeee info url parsing and info url format

---
 .../inputs/TipeeeStream/TipeeeInput.java      | 53 +++++++++++------
 .../inputs/TipeeeStream/TipeeeInputTest.java  | 58 +++++++++++++++++++
 2 files changed, 94 insertions(+), 17 deletions(-)
 create mode 100644 bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java

diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index b0267fa5..0b65f78e 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -4,6 +4,8 @@
 import io.socket.client.Socket;
 import io.socket.engineio.client.EngineIOException;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.web.util.UriComponentsBuilder;
 import talium.Registrar;
 import talium.TwitchBot;
 import talium.system.inputSystem.BotInput;
@@ -16,7 +18,6 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -26,6 +27,10 @@
 public class TipeeeInput implements BotInput {
 
     public static class TipeeeStreamException extends Exception {
+        public TipeeeStreamException(String message) {
+            super(message);
+        }
+
         public TipeeeStreamException(String message, Throwable cause) {
             super(message, cause);
         }
@@ -36,6 +41,10 @@ public NoValidSocketUrl(String message, Throwable cause) {
         }
     }
     public static class SocketInfoEndpointException extends TipeeeStreamException {
+        public SocketInfoEndpointException(String message) {
+            super(message);
+        }
+
         public SocketInfoEndpointException(String message, Throwable cause) {
             super(message, cause);
         }
@@ -43,7 +52,7 @@ public SocketInfoEndpointException(String message, Throwable cause) {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
     private Socket socket;
-    private TipeeeConfig config;
+    private final TipeeeConfig config;
 
     public TipeeeInput(TipeeeConfig config) {
         this.config = config;
@@ -67,20 +76,18 @@ public void startup() throws TipeeeStreamException {
         }
         HealthManager.reportStatus(TipeeeInput.class, InputStatus.STARTING);
         LOGGER.info("Stating TipeeeInput for Channel {}", config.channelName());
-        if (!config.hasSocketUrl()) {
-            LOGGER.info("Getting current Tipeee Socket.io url...");
-            try {
-                String socketUrlFromUrl = getSocketUrlFromUrl(config.tipeeeSocketInfoUrl());
-                config = new TipeeeConfig(config, STR."\{socketUrlFromUrl}?access_token=");
-            } catch (SocketInfoEndpointException e) {
-                throw new NoValidSocketUrl("Could not get up-to-date socket url from url Info endpoint", e);
-            }
-        }
 
         URI socketUrl;
         try {
-            socketUrl = new URI(config.socketUrl().get() + config.apiKey());
-        } catch (URISyntaxException e) {
+        if (config.hasSocketUrl()) {
+            socketUrl = URI.create(config.socketUrl().get());
+        } else {
+            LOGGER.info("Getting current Tipeee Socket.io url...");
+
+            var info_response = getSocketUrlFromUrl(config.tipeeeSocketInfoUrl());
+            socketUrl = parseSocketInfoUrlResponse(info_response, config.apiKey());
+        }
+        } catch (SocketInfoEndpointException | IllegalArgumentException e) {
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.DEAD);
             throw new NoValidSocketUrl("Could not build valid socket Url: ", e);
         }
@@ -121,19 +128,31 @@ public void startup() throws TipeeeStreamException {
         LOGGER.info("Tipeee socket connected");
     }
 
-    private String getSocketUrlFromUrl(String socketInfoUrl) throws SocketInfoEndpointException {
+    static String getSocketUrlFromUrl(String socketInfoUrl) throws SocketInfoEndpointException {
         try {
             var client = HttpClient.newBuilder().build();
             var request = HttpRequest.newBuilder(URI.create(socketInfoUrl)).GET().build();
             var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
+            if (httpResponse.statusCode() != 200) {
+                throw new SocketInfoEndpointException("Info endpoint responded with response code: " + httpResponse.statusCode());
+            }
             client.close();
-            var d = new JSONObject(httpResponse.body()).getJSONObject("datas");
-            return STR."\{d.getString("host")}:\{d.getString("port")}";
+            return httpResponse.body();
         } catch (IOException | InterruptedException e) {
             throw new SocketInfoEndpointException("Error while requesting tipeeeStream socket url!", e);
+        }
+    }
+
+    static @NotNull URI parseSocketInfoUrlResponse(String body, String apiKey) throws SocketInfoEndpointException {
+        try {
+            var datas = new JSONObject(body).getJSONObject("datas");
+            return UriComponentsBuilder.fromHttpUrl(datas.getString("host"))
+                    .queryParam("access_token", apiKey)
+                    .build().toUri();
         } catch (JSONException e) {
             throw new SocketInfoEndpointException("TipeeeStream socket info Url responded with unknown format!", e);
+        } catch (IllegalArgumentException e) {
+            throw new SocketInfoEndpointException("Returned Host ist not a valid URL!", e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java b/bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java
new file mode 100644
index 00000000..f4491331
--- /dev/null
+++ b/bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java
@@ -0,0 +1,58 @@
+package talium.inputs.TipeeeStream;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TipeeeInputTest {
+    private static final String reponse = """
+                {
+                    "code": 200,
+                    "message": "success",
+                    "datas": {
+                        "port": "443",
+                        "host": "https://sso-cf.tipeeestream.com"
+                    }
+                }""";
+
+    @Test
+    void parseUrl() throws TipeeeInput.SocketInfoEndpointException {
+        String actual = TipeeeInput.parseSocketInfoUrlResponse(reponse, "TESTKEY").toString();
+        assertEquals("https://sso-cf.tipeeestream.com?access_token=TESTKEY", actual);
+    }
+
+    @Test
+    void parseUrl_garbage() {
+        try {
+            TipeeeInput.parseSocketInfoUrlResponse("8904ehfizgheodie398rtiwkef903fj9opcsajf", "TESTKEY");
+            fail("Should have thrown SocketInfoEndpointException");
+        } catch (TipeeeInput.SocketInfoEndpointException _) { }
+    }
+    @Test
+    void parseUrl_invalid_url() {
+        final String reponse = """
+                {
+                    "code": 200,
+                    "message": "success",
+                    "datas": {
+                        "port": "443",
+                        "host": "hts://sso-cf.tipeeestream.com"
+                    }
+                }""";
+        try {
+            TipeeeInput.parseSocketInfoUrlResponse(reponse, "TESTKEY");
+            fail("Should have thrown SocketInfoEndpointException");
+        } catch (TipeeeInput.SocketInfoEndpointException _) { }
+    }
+
+    /// test if the response format (and info url) is still the same as we expect. If this fails, tipeee has made a change
+    /// we should then investigate (response, docs, posts) what changes they have made, and if they are breaking
+    @Test
+    void info_url_format_as_expected() throws TipeeeInput.SocketInfoEndpointException, JSONException {
+        var body = TipeeeInput.getSocketUrlFromUrl(new TipeeeConfig(Optional.empty(), "", "").tipeeeSocketInfoUrl());
+        assertEquals(new JSONObject(reponse).toString(), new JSONObject(body).toString(), "TipeeeStream socket Info Endpoint has changed response format!");
+    }
+}
\ No newline at end of file

From d80305abd82f901fe4c6c440e764cd6851b8512a Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Wed, 5 Feb 2025 15:38:15 +0100
Subject: [PATCH 43/58] make TipeeeEventHandler testable, add Donations table

---
 bot/main/talium/TwitchBot.java                |  3 +-
 .../inputs/TipeeeStream/DonationEntity.java   | 36 +++++++++++
 .../inputs/TipeeeStream/DonationEvent.java    | 61 +++++--------------
 .../inputs/TipeeeStream/DonationRepo.java     |  6 ++
 .../TipeeeStream/TipeeeEventHandler.java      | 43 +++++++------
 .../inputs/TipeeeStream/TipeeeInput.java      |  6 +-
 .../talium/system/GlobalExceptionHandler.java |  1 +
 7 files changed, 88 insertions(+), 68 deletions(-)
 create mode 100644 bot/main/talium/inputs/TipeeeStream/DonationEntity.java
 create mode 100644 bot/main/talium/inputs/TipeeeStream/DonationRepo.java

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 01613839..6dae383e 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -2,6 +2,7 @@
 
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
+import talium.inputs.TipeeeStream.DonationRepo;
 import talium.inputs.TipeeeStream.TipeeeConfig;
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
@@ -41,7 +42,7 @@ public static void startup() {
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
 
         twitch = startInput(new Twitch4JInput());
-        tipeee = startInput(new TipeeeInput(ctx.getBean(TipeeeConfig.class)));
+        tipeee = startInput(new TipeeeInput(ctx.getBean(TipeeeConfig.class), ctx.getBean(DonationRepo.class)));
 
         logger.info("Inputs started, initializing other system components...");
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEntity.java b/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
new file mode 100644
index 00000000..1e1d17c1
--- /dev/null
+++ b/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
@@ -0,0 +1,36 @@
+package talium.inputs.TipeeeStream;
+
+import jakarta.persistence.*;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+
+import java.time.ZonedDateTime;
+import java.util.Currency;
+
+@Entity
+@Table(name = "donation_history")
+@Component
+public class DonationEntity {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public long donationId;
+    public String donationService;
+    public String serviceDonationId;
+    public String currency_code;
+    public long amount_cents;
+    public @Nullable String message;
+    public String userName;
+    public ZonedDateTime donated_at;
+
+    public DonationEntity() {}
+
+    public DonationEntity(String donationService, String serviceDonationId, Currency currency, long amount_cents, @Nullable String message, String userName, ZonedDateTime donated_at) {
+        this.donationService = donationService;
+        this.serviceDonationId = serviceDonationId;
+        this.currency_code = currency.getCurrencyCode();
+        this.amount_cents = amount_cents;
+        this.message = message;
+        this.userName = userName;
+        this.donated_at = donated_at;
+    }
+}
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java b/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
index f0cc0f65..c6992666 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
+++ b/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
@@ -1,53 +1,20 @@
 package talium.inputs.TipeeeStream;
 
-import jakarta.persistence.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import java.time.ZonedDateTime;
 import java.util.Currency;
+import java.util.Optional;
 
-@Entity
-//Repo for this Class has nativ Queries, the Table Name musst be changed Manually!
-@Table(name = "goals-donation_log")
-@Component
-public class DonationEvent {
-    @Id
-    long id;
-    //The symbol (and label) could be enough, if it works, but i don't think it will. The Code would enable conversions
-    //the symbol and label give options
-    public Currency currency;
-    public double amount;
-    public String message;
-    public boolean hasMessage;
-    public String tipeee_username;
-    public ZonedDateTime donated_at;
-
-    public DonationEvent() {
-    }
-
-    public DonationEvent(long id, Currency currency, double amount, String message, boolean hasMessage, String tipeee_username, ZonedDateTime donated_at) {
-        this.id = id;
-        this.currency = currency;
-        this.amount = amount;
-        this.message = message;
-        this.hasMessage = hasMessage;
-        this.tipeee_username = tipeee_username;
-        this.donated_at = donated_at;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder str = new StringBuilder();
-        String banner = "===================-DONATION " + id + "-===================";
-        str.append(banner).append("\n")
-                .append("created_at = ").append(donated_at).append("\n")
-                .append("from = ").append(tipeee_username).append("\n")
-                .append("donation = ").append(amount).append(currency.getSymbol()).append("\n");
-        if (hasMessage)
-            str.append("message = ").append(message).append("\n");
-        str.append("=".repeat(banner.length()));
-
-        return str.toString();
+public record DonationEvent(
+        long donationId,
+        String donationService,
+        String serviceDonationId,
+        Currency currency,
+        long amount_cents,
+        Optional<String> message,
+        String userName,
+        ZonedDateTime donated_at
+) {
+    public DonationEvent(DonationEntity entity) {
+        this(entity.donationId, entity.donationService, entity.serviceDonationId, Currency.getInstance(entity.currency_code), entity.amount_cents, Optional.ofNullable(entity.message), entity.userName, entity.donated_at);
     }
-}
+}
\ No newline at end of file
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationRepo.java b/bot/main/talium/inputs/TipeeeStream/DonationRepo.java
new file mode 100644
index 00000000..df8818a4
--- /dev/null
+++ b/bot/main/talium/inputs/TipeeeStream/DonationRepo.java
@@ -0,0 +1,6 @@
+package talium.inputs.TipeeeStream;
+
+import org.springframework.data.repository.ListCrudRepository;
+
+public interface DonationRepo extends ListCrudRepository<DonationEntity, Long> {
+}
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java b/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java
index d76a8915..6a336fcd 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java
@@ -14,49 +14,56 @@ public class TipeeeEventHandler {
 
     static Logger LOGGER = LoggerFactory.getLogger(TipeeeEventHandler.class);
 
-    public static void handleDonationEvent(String eventString) {
+    public static void handleDonationEvent(String eventString, DonationRepo repo) {
+        DonationEntity donationEntity;
         try {
             JSONObject event = new JSONArray(eventString)
                     .getJSONObject(0)
                     .getJSONObject("event");
 
-            if (!event.getString("type").equals("donation")) {
+            String eventType = event.getString("type");
+            if (!eventType.equals("donation")) {
                 LOGGER.debug("Event ignored, not a DonationEvent");
                 return;
             }
 
-            DonationEvent donationEvent = parseToInstance(event);
-            LOGGER.debug("Collected + Parsed DonationEvent: \n{}", donationEvent);
-            EventDispatcher.dispatch(donationEvent);
+            LOGGER.debug("Collected DonationEvent: {}", eventString);
+            donationEntity = parseToInstance(event);
+            LOGGER.debug("Parsed DonationEntity: {}-{}", donationEntity.donationService, donationEntity.serviceDonationId);
+        } catch (JSONException e) {
+            LOGGER.error("Error parsing tipeee event: \n" + eventString, e);
+            return;
+        }
+
+        try {
+            donationEntity = repo.save(donationEntity);
         } catch (Exception e) {
-            LOGGER.error("Parsing of Event Failed! Original: {}", eventString);
-            e.printStackTrace();
+            LOGGER.error("Could not save DonationEntity" , e);
+            return;
         }
+        LOGGER.debug("Saved DonationEvent: {}-{}", donationEntity.donationService, donationEntity.serviceDonationId);
+
+        EventDispatcher.dispatch(new DonationEvent(donationEntity));
     }
 
-    private static DonationEvent parseToInstance(JSONObject json) throws JSONException {
+    private static DonationEntity parseToInstance(JSONObject json) throws JSONException {
         JSONObject para = json.getJSONObject("parameters");
 
-        String message;
-        boolean hasMessage;
-        try {
+        String message = null;
+        if (para.has("message")) {
             message = para.getString("message");
-            hasMessage = true;
-        } catch (Exception ignored) {
-            message = "";
-            hasMessage = false;
         }
 
         String createdAt = json.getString("created_at");
         ZonedDateTime donated_at = ZonedDateTime.parse(createdAt.substring(0, createdAt.length() - 2));
 
-        long id = json.getLong("id");
-        double amount = para.getDouble("amount");
+        String donationId = json.getString("id");
+        long amount_cents = (long) (para.getDouble("amount") * 100);
         String currency_code = json.getJSONObject("user").getJSONObject("currency").getString("code");
         Currency currency = Currency.getInstance(currency_code);
 
         String username = para.getString("username");
-        return new DonationEvent(id, currency, amount, message, hasMessage, username, donated_at);
+        return new DonationEntity("twitch", donationId, currency, amount_cents, message, username, donated_at);
     }
 
 }
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
index 0b65f78e..2720d1da 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
@@ -53,9 +53,11 @@ public SocketInfoEndpointException(String message, Throwable cause) {
     private static final Logger LOGGER = LoggerFactory.getLogger(TipeeeInput.class);
     private Socket socket;
     private final TipeeeConfig config;
+    private final DonationRepo donationRepo;
 
-    public TipeeeInput(TipeeeConfig config) {
+    public TipeeeInput(TipeeeConfig config, DonationRepo donationRepo) {
         this.config = config;
+        this.donationRepo = donationRepo;
     }
 
     public void shutdown() {
@@ -116,7 +118,7 @@ public void startup() throws TipeeeStreamException {
             HealthManager.reportStatus(TipeeeInput.class, InputStatus.HEALTHY);
         });
 
-        socket.on("new-event", data -> TipeeeEventHandler.handleDonationEvent(Arrays.toString(data)));
+        socket.on("new-event", data -> TipeeeEventHandler.handleDonationEvent(Arrays.toString(data), donationRepo));
 
         // creates a new thread that receives the events and triggers our listeners
         socket.connect();
diff --git a/bot/main/talium/system/GlobalExceptionHandler.java b/bot/main/talium/system/GlobalExceptionHandler.java
index f6a072a1..620370b5 100644
--- a/bot/main/talium/system/GlobalExceptionHandler.java
+++ b/bot/main/talium/system/GlobalExceptionHandler.java
@@ -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!";
     }
 }

From c6ed2f3be98a524a71e0e42ddb28eb1543852e58 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 6 Feb 2025 15:56:39 +0100
Subject: [PATCH 44/58] introduce twitch api interface, and noop api impl

---
 bot/main/talium/TwitchBot.java                |  7 +-
 .../talium/inputs/Twitch4J/Twitch4JInput.java |  2 +
 .../talium/inputs/Twitch4J/TwitchAPINoop.java | 59 ++++++++++++
 .../talium/inputs/Twitch4J/TwitchApi.java     | 68 ++------------
 .../talium/inputs/Twitch4J/TwitchApiImpl.java | 90 +++++++++++++++++++
 bot/main/talium/system/Out.java               |  9 +-
 .../WIPWatchtimeCommandServer.java            | 21 +----
 .../coinsWatchtime/WatchtimeController.java   |  6 +-
 .../WatchtimeUpdateService.java               | 11 ++-
 .../system/security/auth/AuthController.java  |  6 +-
 10 files changed, 187 insertions(+), 92 deletions(-)
 create mode 100644 bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java
 create mode 100644 bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 6dae383e..38c5d6d7 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -40,9 +40,14 @@ public static void startup() {
         System.out.println("DateFormat: DayNumber-Hour:Minute:Second:Millis");
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
         System.out.println("-----------------|-----|-[-------------]---------------------------------------------------------------------------------------------------------------------------------------------");
+        var serverPort = ctx.getEnvironment().getProperty("server.port");
+        logger.info("Server started on Port: {}", serverPort);
 
         twitch = startInput(new Twitch4JInput());
-        tipeee = startInput(new TipeeeInput(ctx.getBean(TipeeeConfig.class), ctx.getBean(DonationRepo.class)));
+        tipeee = startInput(new TipeeeInput(
+                ctx.getBean(TipeeeConfig.class),
+                ctx.getBean(DonationRepo.class))
+        );
 
         logger.info("Inputs started, initializing other system components...");
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 9bd61e5d..77474472 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -14,6 +14,7 @@
 import talium.Registrar;
 import talium.inputs.shared.oauth.OAuthEndpoint;
 import talium.inputs.shared.oauth.OauthAccount;
+import talium.system.Out;
 import talium.system.eventSystem.EventDispatcher;
 import talium.system.eventSystem.Subscriber;
 import talium.system.inputSystem.BotInput;
@@ -130,6 +131,7 @@ public void startup() {
                 .getId();
         logger.debug("Start successful!");
         HealthManager.reportStatus(Twitch4JInput.class, InputStatus.HEALTHY);
+        Out.Twitch.api = new TwitchApiImpl(helix, chat);
     }
 
     @Override
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java b/bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java
new file mode 100644
index 00000000..2cb4cc11
--- /dev/null
+++ b/bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java
@@ -0,0 +1,59 @@
+package talium.inputs.Twitch4J;
+
+import com.github.twitch4j.helix.domain.Chatter;
+import com.github.twitch4j.helix.domain.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+public class TwitchAPINoop implements TwitchApi {
+
+    Logger logger = LoggerFactory.getLogger(TwitchApiImpl.class);
+
+    private void logNoOp() {
+        logger.warn("Tried to make a api call the twitch API. bevor the api was initialized:", new Exception("Call to no-op twitch api"));
+    }
+
+    @Override
+    public boolean isPlaceHolder() {
+        return true;
+    }
+
+    @Override
+    public void sendMessage(String message) {
+        logNoOp();
+    }
+
+    @Override
+    public Optional<User> getUserById(String userId) {
+        logNoOp();
+        return Optional.empty();
+    }
+
+    @Override
+    public List<User> getUserById(List<String> userId) {
+        logNoOp();
+        return List.of();
+    }
+
+    @Override
+    public Optional<User> getUserByName(String username) {
+        logNoOp();
+        return Optional.empty();
+    }
+
+    @Override
+    public List<Chatter> getUserList() {
+        logNoOp();
+        return List.of();
+    }
+
+    @Override
+    public boolean isOnline() {
+        logNoOp();
+        return false;
+    }
+}
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApi.java b/bot/main/talium/inputs/Twitch4J/TwitchApi.java
index b5e339ce..40404070 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApi.java
+++ b/bot/main/talium/inputs/Twitch4J/TwitchApi.java
@@ -1,77 +1,25 @@
 package talium.inputs.Twitch4J;
 
-import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
-import com.github.twitch4j.common.exception.UnauthorizedException;
-import com.github.twitch4j.helix.TwitchHelix;
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-// maybe add no-op version of helix api and just switch them when they are assigned, that way we should be able to remove all these null checking methods
-public class TwitchApi {
+public interface TwitchApi {
 
-    // wip: use higher-order-function to reduce boilerplate
-    private interface Call<T> {
-        T call(TwitchHelix helix);
-    }
+    boolean isPlaceHolder();
 
-    private static<T> T doHelixCall(Call<T> call) {
-        try {
-            return call.call(Twitch4JInput.helix);
-        }  catch (UnauthorizedException e) {
-            //fix handle missing auth
-            return call.call(Twitch4JInput.helix);
-        } catch (Exception e) {
-            // ehh, log and throw i guess
-            throw new RuntimeException(e);
-        }
-    }
+    void sendMessage(String message);
 
-    /**
-     * Sends a message in the chat specified by the twitchOutputToChannel Env with the bot account specified by the twitchBotAccountName env
-     *
-     * @param message the message text to send
-     */
-    public static void sendMessage(String message) {
-        while (Twitch4JInput.chat == null) Thread.onSpinWait();
-        Twitch4JInput.chat.sendMessage(Twitch4JInput.sendTo, message);
-    }
+    Optional<User> getUserById(String userId);
 
-    public static Optional<User> getUserById(String userId) {
-        if (Twitch4JInput.helix == null) return Optional.empty();
-        var user = Twitch4JInput.helix.getUsers(null, List.of(userId), null).execute().getUsers();
-        if (user.isEmpty()) return Optional.empty();
-        return Optional.ofNullable(user.getFirst());
-    }
+    List<User> getUserById(List<String> userId);
 
-    public static List<User> getUserById(List<String> userId) {
-        if (Twitch4JInput.helix == null) return new ArrayList<>();
-        return Twitch4JInput.helix.getUsers(null, userId, null).execute().getUsers();
-    }
+    Optional<User> getUserByName(String username);
 
-    public static Optional<User> getUserByName(String username) {
-        if (Twitch4JInput.helix == null) return Optional.empty();
-        var user = Twitch4JInput.helix.getUsers(null, null, List.of(username)).execute().getUsers();
-        if (user.isEmpty()) return Optional.empty();
-        return Optional.ofNullable(user.getFirst());
-    }
+    List<Chatter> getUserList();
 
-    public static List<Chatter> getUserList() {
-        if (Twitch4JInput.helix == null) return new ArrayList<>();
-        OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
-        return Twitch4JInput.helix
-                .getChatters(cred.getAccessToken(), cred.getUserId(), cred.getUserId(), 1000, null)
-                .execute()
-                .getChatters();
-    }
-
-    public static boolean isOnline() {
-        if (Twitch4JInput.helix == null) return false;
-        OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
-        return Twitch4JInput.helix.getStreams(cred.getAccessToken(), null, null, null, null, null, null, null).execute().getStreams().size() == 1;
-    }
+    boolean isOnline();
 
 }
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
new file mode 100644
index 00000000..9a04dfbe
--- /dev/null
+++ b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
@@ -0,0 +1,90 @@
+package talium.inputs.Twitch4J;
+
+import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
+import com.github.twitch4j.chat.TwitchChat;
+import com.github.twitch4j.common.exception.UnauthorizedException;
+import com.github.twitch4j.helix.TwitchHelix;
+import com.github.twitch4j.helix.domain.Chatter;
+import com.github.twitch4j.helix.domain.User;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+// maybe add no-op version of helix api and just switch them when they are assigned, that way we should be able to remove all these null checking methods
+public class TwitchApiImpl implements TwitchApi {
+    TwitchHelix helix;
+    TwitchChat chat;
+
+    public TwitchApiImpl(TwitchHelix helix, TwitchChat chat) {
+        this.helix = helix;
+        this.chat = chat;
+    }
+
+    // wip: use higher-order-function to reduce boilerplate
+    private interface Call<T> {
+        T call(TwitchHelix helix);
+    }
+
+    private static<T> T doHelixCall(Call<T> call) {
+        try {
+            return call.call(Twitch4JInput.helix);
+        }  catch (UnauthorizedException e) {
+            //fix handle missing auth
+            return call.call(Twitch4JInput.helix);
+        } catch (Exception e) {
+            // ehh, log and throw i guess
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean isPlaceHolder() {
+        return false;
+    }
+
+    /**
+     * Sends a message in the chat specified by the twitchOutputToChannel Env with the bot account specified by the twitchBotAccountName env
+     *
+     * @param message the message text to send
+     */
+    @Override
+    public void sendMessage(String message) {
+        Twitch4JInput.chat.sendMessage(Twitch4JInput.sendTo, message);
+    }
+
+    @Override
+    public Optional<User> getUserById(String userId) {
+        var user =Twitch4JInput.helix.getUsers(null, List.of(userId), null).execute().getUsers();
+        if (user.isEmpty()) return Optional.empty();
+        return Optional.ofNullable(user.getFirst());
+    }
+
+    @Override
+    public List<User> getUserById(List<String> userId) {
+        return Twitch4JInput.helix.getUsers(null, userId, null).execute().getUsers();
+    }
+
+    @Override
+    public Optional<User> getUserByName(String username) {
+        var user = Twitch4JInput.helix.getUsers(null, null, List.of(username)).execute().getUsers();
+        if (user.isEmpty()) return Optional.empty();
+        return Optional.ofNullable(user.getFirst());
+    }
+
+    @Override
+    public List<Chatter> getUserList() {
+        OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
+        return Twitch4JInput.helix
+                .getChatters(cred.getAccessToken(), cred.getUserId(), cred.getUserId(), 1000, null)
+                .execute()
+                .getChatters();
+    }
+
+    @Override
+    public boolean isOnline() {
+        OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
+        return Twitch4JInput.helix.getStreams(cred.getAccessToken(), null, null, null, null, null, null, null).execute().getStreams().size() == 1;
+    }
+
+}
diff --git a/bot/main/talium/system/Out.java b/bot/main/talium/system/Out.java
index a5c09277..aa2e8263 100644
--- a/bot/main/talium/system/Out.java
+++ b/bot/main/talium/system/Out.java
@@ -1,7 +1,9 @@
 package talium.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
+import talium.inputs.Twitch4J.TwitchAPINoop;
 import talium.inputs.Twitch4J.TwitchApi;
 import talium.system.stringTemplates.Template;
 import talium.system.stringTemplates.TemplateService;
@@ -28,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 {
@@ -59,7 +64,7 @@ public static String sendRawTemplate(String template, HashMap<String, Object> va
                 // 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;
         }
     }
diff --git a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
index 04447a8a..ba61c44a 100644
--- a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -6,7 +6,6 @@
 import org.springframework.stereotype.Component;
 import talium.Registrar;
 import talium.inputs.Twitch4J.ChatMessage;
-import talium.inputs.Twitch4J.TwitchApi;
 import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.Chatter;
 import talium.system.coinsWatchtime.chatter.ChatterService;
@@ -55,27 +54,15 @@ public WatchtimeContext(Chatter chatter, String username) {
 
     public static void triggerGetWatchtime(String triggerId, ChatMessage message) {
         var values = new HashMap<String, Object>();
-        var userId = message.user().id();
-        var twitchUser = TwitchApi.getUserById(userId);
-        if (twitchUser.isEmpty()) {
-            logger.warn("Could not get watchtime, no twitch user found for Id: {}", userId);
-            return;
-        }
-        var wt = chatterService.getDataForChatter(userId);
-        values.put("wt", new WatchtimeContext(wt, twitchUser.get().getDisplayName()));
+        var wt = chatterService.getDataForChatter(message.user().id());
+        values.put("wt", new WatchtimeContext(wt, message.user().name()));
         Out.Twitch.sendNamedTemplate("coins.watchtime", values);
     }
 
     public static void triggerGetCoins(String triggerId, ChatMessage message) {
         var values = new HashMap<String, Object>();
-        var userId = message.user().id();
-        var twitchUser = TwitchApi.getUserById(userId);
-        if (twitchUser.isEmpty()) {
-            logger.warn("Could not get watchtime, no twitch user found for Id: {}", userId);
-            return;
-        }
-        var wt = chatterService.getDataForChatter(userId);
-        values.put("wt", new WatchtimeContext(wt, twitchUser.get().getDisplayName()));
+        var wt = chatterService.getDataForChatter(message.user().id());
+        values.put("wt", new WatchtimeContext(wt, message.user().name()));
         Out.Twitch.sendNamedTemplate("coins.coins", values);
     }
 }
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeController.java b/bot/main/talium/system/coinsWatchtime/WatchtimeController.java
index b28369aa..654589ed 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeController.java
+++ b/bot/main/talium/system/coinsWatchtime/WatchtimeController.java
@@ -8,7 +8,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import talium.inputs.Twitch4J.TwitchApi;
+import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.Chatter;
 import talium.system.coinsWatchtime.chatter.ChatterDTO;
 import talium.system.coinsWatchtime.chatter.ChatterService;
@@ -38,7 +38,7 @@ String getTop() {
         var dto = new ArrayList<LeaderboardDTO>();
         var userIdList = chatters.stream().map(chatter -> chatter.twitchUserId).toList();
 //        t.step("TRANSFORM LIST");
-        var twitchUserList = TwitchApi.getUserById(userIdList);
+        var twitchUserList = Out.Twitch.api.getUserById(userIdList);
 //        t.step("TWITCH API");
 
         Map<String, String> usernameMap = new TreeMap<>();
@@ -64,7 +64,7 @@ String getTop() {
 
     @GetMapping("/username/{username}")
     ResponseEntity<String> getForUsername(@PathVariable String username) {
-        var twitchUser = TwitchApi.getUserByName(username);
+        var twitchUser = Out.Twitch.api.getUserByName(username);
         if (twitchUser.isEmpty()) {
             return ResponseEntity.notFound().build();
         }
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
index d86edce4..e1bc8a0d 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
+++ b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
@@ -6,7 +6,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import talium.inputs.Twitch4J.TwitchApi;
+import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.ChatterService;
 
 import java.util.List;
@@ -37,16 +37,15 @@ public void setChatterService(ChatterService chatterService) {
     static {
         ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("CHATTER_UPDATE_EXECUTOR").build();
         CHATTER_UPDATE_SERVICE = Executors.newSingleThreadScheduledExecutor(namedThreadFactory);
-        CHATTER_UPDATE_SERVICE.scheduleAtFixedRate(WatchtimeUpdateService::update, 1, POLLING_INTERVAL_SECONDS, TimeUnit.SECONDS);
+
     }
 
     public static void init() {
-        //noop to load class
-        //initialization is done via static initialization because we don't need anything from the outside environment, and then we can assume that they are always there
+        CHATTER_UPDATE_SERVICE.scheduleAtFixedRate(WatchtimeUpdateService::update, 1, POLLING_INTERVAL_SECONDS, TimeUnit.SECONDS);
     }
 
     private static List<String> getUserList() {
-        return TwitchApi.getUserList().stream().map(Chatter::getUserId).toList();
+        return Out.Twitch.api.getUserList().stream().map(Chatter::getUserId).toList();
     }
 
     /**
@@ -64,7 +63,7 @@ private static void update() {
         // catch because otherwise the scheduler would end on any runtime error
         try {
             logger.info("Refreshing user list");
-            if (!TwitchApi.isOnline()) {
+            if (!Out.Twitch.api.isOnline()) {
                 logger.debug("Channel online: false");
                 return;
             }
diff --git a/bot/main/talium/system/security/auth/AuthController.java b/bot/main/talium/system/security/auth/AuthController.java
index ef838ce2..a028f7fd 100644
--- a/bot/main/talium/system/security/auth/AuthController.java
+++ b/bot/main/talium/system/security/auth/AuthController.java
@@ -2,7 +2,7 @@
 
 import com.google.gson.Gson;
 import org.springframework.http.ResponseEntity;
-import talium.inputs.Twitch4J.TwitchApi;
+import talium.system.Out;
 import talium.system.security.auth.persistence.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -27,7 +27,7 @@ public AuthController(PanelUserRepo panelUserRepo) {
     String getAllPanelAccounts() {
         List<PanelUserDTO> list = new ArrayList<>();
         for (PanelUser p : panelUserRepo.findAll()) {
-            var user = TwitchApi.getUserById(p.twitchUserId);
+            var user = Out.Twitch.api.getUserById(p.twitchUserId);
             String userName = null;
             if (user.isPresent()) {
                 userName = user.get().getDisplayName();
@@ -39,7 +39,7 @@ String getAllPanelAccounts() {
 
     @PostMapping("/panelAccounts")
     HttpStatus addNewPanelAccount(@RequestBody String userName) {
-        var userId = TwitchApi.getUserByName(userName);
+        var userId = Out.Twitch.api.getUserByName(userName);
         if (userId.isEmpty()) return HttpStatus.NOT_FOUND;
         panelUserRepo.save(new PanelUser(userId.get().getId()));
         return HttpStatus.CREATED;

From 21475c231472a8a7333b349a143a512f4663ebfb Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 6 Feb 2025 16:17:20 +0100
Subject: [PATCH 45/58] try automatic reconnect on twitch api failure

---
 bot/main/talium/TwitchBot.java                | 13 +++++++++
 .../talium/inputs/Twitch4J/TwitchApiImpl.java | 27 +++++++++++++------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 38c5d6d7..f3c88472 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -88,4 +88,17 @@ private static void stopInput(BotInput input) {
             HealthManager.reportStatus(input.getClass(), InputStatus.DEAD);
         }
     }
+
+    public static boolean reconnectTwitch() {
+        twitch.shutdown();
+        var twitch = new Twitch4JInput();
+        try {
+            twitch.startup();
+            TwitchBot.twitch = twitch;
+            return true;
+        } catch (Exception e) {
+            TwitchBot.twitch = twitch;
+            return false;
+        }
+    }
 }
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
index 9a04dfbe..61884992 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
+++ b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
@@ -6,13 +6,18 @@
 import com.github.twitch4j.helix.TwitchHelix;
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import talium.TwitchBot;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 // maybe add no-op version of helix api and just switch them when they are assigned, that way we should be able to remove all these null checking methods
 public class TwitchApiImpl implements TwitchApi {
+
+    private static final Logger logger = LoggerFactory.getLogger(TwitchApiImpl.class);
+
     TwitchHelix helix;
     TwitchChat chat;
 
@@ -30,7 +35,13 @@ private static<T> T doHelixCall(Call<T> call) {
         try {
             return call.call(Twitch4JInput.helix);
         }  catch (UnauthorizedException e) {
-            //fix handle missing auth
+            logger.warn("Twitch Credentials invalid, trying to reconnect to twitch!");
+            var success = TwitchBot.reconnectTwitch();
+            if (!success) {
+                logger.error("Failed to reconnect twitch!");
+                //TODO make this checked exception, with cause from reconnectTwitch() from TwitchInput.startup()
+                throw new RuntimeException("Failed to reconnect to twitch!");
+            }
             return call.call(Twitch4JInput.helix);
         } catch (Exception e) {
             // ehh, log and throw i guess
@@ -55,19 +66,19 @@ public void sendMessage(String message) {
 
     @Override
     public Optional<User> getUserById(String userId) {
-        var user =Twitch4JInput.helix.getUsers(null, List.of(userId), null).execute().getUsers();
+        var user = doHelixCall(h -> h.getUsers(null, List.of(userId), null).execute().getUsers());
         if (user.isEmpty()) return Optional.empty();
         return Optional.ofNullable(user.getFirst());
     }
 
     @Override
     public List<User> getUserById(List<String> userId) {
-        return Twitch4JInput.helix.getUsers(null, userId, null).execute().getUsers();
+        return doHelixCall(h -> h.getUsers(null, userId, null).execute().getUsers());
     }
 
     @Override
     public Optional<User> getUserByName(String username) {
-        var user = Twitch4JInput.helix.getUsers(null, null, List.of(username)).execute().getUsers();
+        var user = doHelixCall(h -> h.getUsers(null, null, List.of(username)).execute().getUsers());
         if (user.isEmpty()) return Optional.empty();
         return Optional.ofNullable(user.getFirst());
     }
@@ -75,16 +86,16 @@ public Optional<User> getUserByName(String username) {
     @Override
     public List<Chatter> getUserList() {
         OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
-        return Twitch4JInput.helix
+        return doHelixCall(h -> h
                 .getChatters(cred.getAccessToken(), cred.getUserId(), cred.getUserId(), 1000, null)
                 .execute()
-                .getChatters();
+                .getChatters());
     }
 
     @Override
     public boolean isOnline() {
         OAuth2Credential cred = Twitch4JInput.oAuth2Credential;
-        return Twitch4JInput.helix.getStreams(cred.getAccessToken(), null, null, null, null, null, null, null).execute().getStreams().size() == 1;
+        return doHelixCall(h -> h.getStreams(cred.getAccessToken(), null, null, null, null, null, null, null).execute().getStreams()).size() == 1;
     }
 
 }

From b5d8274bc67c19c389c0721214aac3e7fc7011a4 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 6 Feb 2025 16:35:47 +0100
Subject: [PATCH 46/58] extract config from Twitch4JInput

---
 bot/main/talium/TwitchBot.java                | 13 +++-
 .../talium/inputs/Twitch4J/Twitch4JInput.java | 70 ++++++-------------
 .../talium/inputs/Twitch4J/TwitchApiImpl.java |  6 +-
 .../talium/inputs/Twitch4J/TwitchConfig.java  | 57 +++++++++++++++
 4 files changed, 93 insertions(+), 53 deletions(-)
 create mode 100644 bot/main/talium/inputs/Twitch4J/TwitchConfig.java

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index f3c88472..207ad6ca 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -2,10 +2,12 @@
 
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
+import org.springframework.context.ConfigurableApplicationContext;
 import talium.inputs.TipeeeStream.DonationRepo;
 import talium.inputs.TipeeeStream.TipeeeConfig;
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
+import talium.inputs.Twitch4J.TwitchConfig;
 import talium.system.StopWatch;
 import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
 import talium.system.coinsWatchtime.WatchtimeUpdateService;
@@ -30,12 +32,13 @@ public static void main(String[] args) {
         startup();
     }
 
+    private static ConfigurableApplicationContext ctx;
     private static BotInput twitch;
     private static BotInput tipeee;
 
     public static void startup() {
         StopWatch time = new StopWatch(StopWatch.TYPE.STARTUP);
-        var ctx = SpringApplication.run(TwitchBot.class);
+        ctx = SpringApplication.run(TwitchBot.class);
         System.out.println();
         System.out.println("DateFormat: DayNumber-Hour:Minute:Second:Millis");
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
@@ -43,7 +46,9 @@ public static void startup() {
         var serverPort = ctx.getEnvironment().getProperty("server.port");
         logger.info("Server started on Port: {}", serverPort);
 
-        twitch = startInput(new Twitch4JInput());
+        twitch = startInput(new Twitch4JInput(
+                ctx.getBean(TwitchConfig.class)
+        ));
         tipeee = startInput(new TipeeeInput(
                 ctx.getBean(TipeeeConfig.class),
                 ctx.getBean(DonationRepo.class))
@@ -91,7 +96,9 @@ private static void stopInput(BotInput input) {
 
     public static boolean reconnectTwitch() {
         twitch.shutdown();
-        var twitch = new Twitch4JInput();
+        var twitch = new Twitch4JInput(
+                ctx.getBean(TwitchConfig.class)
+        );
         try {
             twitch.startup();
             TwitchBot.twitch = twitch;
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 77474472..808d9979 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -10,7 +10,6 @@
 import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.helix.TwitchHelix;
 import org.apache.commons.lang.RandomStringUtils;
-import org.springframework.stereotype.Component;
 import talium.Registrar;
 import talium.inputs.shared.oauth.OAuthEndpoint;
 import talium.inputs.shared.oauth.OauthAccount;
@@ -22,7 +21,6 @@
 import talium.system.inputSystem.InputStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -30,41 +28,12 @@
 import java.util.List;
 import java.util.Optional;
 
-@Component
 public class Twitch4JInput implements BotInput {
-    protected static String channelName;
-    protected static String chatAccountName;
-    protected static String sendTo;
-    private static String app_clientID;
-    private static String app_clientSecret;
-
-    @Value("${twitchChannelName}")
-    public void setChannelName(String channelName) {
-        Twitch4JInput.channelName = channelName;
-    }
-
-    @Value("${twitchBotAccountName:}")
-    public void setChatAccountName(String chatAccountName) {
-        Twitch4JInput.chatAccountName = chatAccountName;
-    }
-
-    @Value("${twitchOutputToChannel:}")
-    public void setSendTo(String sendTo) {
-        Twitch4JInput.sendTo = sendTo;
-    }
-
-    @Value("${twitchAppId}")
-    public void setApp_clientID(String app_clientID) {
-        Twitch4JInput.app_clientID = app_clientID;
-    }
-
-    @Value("${twitchAppSecret}")
-    public void setApp_clientSecret(String app_clientSecret) {
-        Twitch4JInput.app_clientSecret = app_clientSecret;
-    }
 
     private static final Logger logger = LoggerFactory.getLogger(Twitch4JInput.class);
 
+    private TwitchConfig config;
+
     protected static volatile TwitchChat chat;
     protected static volatile TwitchHelix helix;
     protected static OAuth2Credential oAuth2Credential;
@@ -73,23 +42,28 @@ public void setApp_clientSecret(String app_clientSecret) {
 
     protected static String broadCasterChannelId;
 
+    public Twitch4JInput(TwitchConfig config) {
+        this.config = config;
+    }
+
+
     @Override
     public void startup() {
         logger.debug("Starting... ");
         Registrar.registerHealthDescription(Twitch4JInput.class, "Twitch4JInput", "");
         HealthManager.reportStatus(Twitch4JInput.class, InputStatus.STARTING);
-        if (chatAccountName == null || chatAccountName.isEmpty()) {
-            logger.warn("Using twitchChannelName as botAccountName: {}", channelName);
+        if (!config.hasChannelName()) {
+            logger.warn("Using twitchChannelName as botAccountName: {}", config.channelName());
             logger.warn("Consider setting the botAccountName explicitly to avoid accidental misconfiguration.");
-            chatAccountName = channelName;
+            config = config.setAccountName(config.channelName());
         }
-        if (sendTo == null || sendTo.isEmpty()) {
-            logger.warn("Using twitchChannelName as twitchOutputToChannel: {}", channelName);
+        if (!config.hasSendTo()) {
+            logger.warn("Using twitchChannelName as twitchOutputToChannel: {}", config.channelName());
             logger.warn("Consider setting the twitchOutputToChannel explicitly to avoid accidental misconfiguration.");
-            sendTo = channelName;
+            config = config.setSendTo(config.channelName());
         }
 
-        iProvider = new TwitchIdentityProvider(app_clientID, app_clientSecret, OAuthEndpoint.getRedirectUrl("twitch"));
+        iProvider = new TwitchIdentityProvider(config.app_clientID(), config.app_clientSecret(), OAuthEndpoint.getRedirectUrl("twitch"));
 
         var creds = getRefreshedOauthFromDB(iProvider);
         if (creds.isEmpty()) {
@@ -116,28 +90,28 @@ public void startup() {
                 .withChatAccount(oAuth2Credential)
                 .withDefaultEventHandler(SimpleEventHandler.class)
                 .build();
-        twitchClient.getClientHelper().enableStreamEventListener(channelName);
-        twitchClient.getChat().joinChannel(channelName);
+        twitchClient.getClientHelper().enableStreamEventListener(config.channelName());
+        twitchClient.getChat().joinChannel(config.channelName());
         twitchClient.getEventManager().onEvent(TwitchEvent.class, EventDispatcher::dispatch);
 
         this.twitchClient = twitchClient;
         chat = twitchClient.getChat();
         helix = twitchClient.getHelix();
         broadCasterChannelId = helix
-                .getUsers(null, null, List.of(channelName))
+                .getUsers(null, null, List.of(config.channelName()))
                 .execute()
                 .getUsers()
                 .getFirst()
                 .getId();
         logger.debug("Start successful!");
         HealthManager.reportStatus(Twitch4JInput.class, InputStatus.HEALTHY);
-        Out.Twitch.api = new TwitchApiImpl(helix, chat);
+        Out.Twitch.api = new TwitchApiImpl(helix, chat, config.sendTo());
     }
 
     @Override
     public void shutdown() {
         if (oAuth2Credential != null) {
-            OauthAccount account = new OauthAccount(chatAccountName, "twitch", oAuth2Credential.getRefreshToken());
+            OauthAccount account = new OauthAccount(config.chatAccountName(), "twitch", oAuth2Credential.getRefreshToken());
             OauthAccount.repo.save(account);
         }
         if (twitchClient != null) {
@@ -147,7 +121,7 @@ public void shutdown() {
     }
 
     private Optional<OAuth2Credential> getRefreshedOauthFromDB(TwitchIdentityProvider iProvider) {
-        Optional<OauthAccount> dbCreds = OauthAccount.repo.getByAccNameAndService(chatAccountName, "twitch");
+        Optional<OauthAccount> dbCreds = OauthAccount.repo.getByAccNameAndService(config.chatAccountName(), "twitch");
         if (dbCreds.isEmpty()) {
             return Optional.empty();
         }
@@ -177,12 +151,12 @@ private Optional<OAuth2Credential> createNewOauth() {
         String auth_url = String.format("%s?response_type=%s&client_id=%s&redirect_uri=%s&scope=%s&state=%s",
                 authorizationServer,
                 "code",
-                app_clientID,
+                config.app_clientID(),
                 OAuthEndpoint.getRedirectUrl("twitch"),
                 String.join(" ", scopes),
                 state
         );
-        Optional<String> code = OAuthEndpoint.newAuthRequest(chatAccountName, "twitch", auth_url, state);
+        Optional<String> code = OAuthEndpoint.newAuthRequest(config.chatAccountName(), "twitch", auth_url, state);
         return code.map(s -> iProvider.getCredentialByCode(s));
     }
 
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
index 61884992..91b5e8be 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
+++ b/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
@@ -20,10 +20,12 @@ public class TwitchApiImpl implements TwitchApi {
 
     TwitchHelix helix;
     TwitchChat chat;
+    String sendToChannel;
 
-    public TwitchApiImpl(TwitchHelix helix, TwitchChat chat) {
+    public TwitchApiImpl(TwitchHelix helix, TwitchChat chat, String sendToChannel) {
         this.helix = helix;
         this.chat = chat;
+        this.sendToChannel = sendToChannel;
     }
 
     // wip: use higher-order-function to reduce boilerplate
@@ -61,7 +63,7 @@ public boolean isPlaceHolder() {
      */
     @Override
     public void sendMessage(String message) {
-        Twitch4JInput.chat.sendMessage(Twitch4JInput.sendTo, message);
+        chat.sendMessage(sendToChannel, message);
     }
 
     @Override
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchConfig.java b/bot/main/talium/inputs/Twitch4J/TwitchConfig.java
new file mode 100644
index 00000000..a63ab8b6
--- /dev/null
+++ b/bot/main/talium/inputs/Twitch4J/TwitchConfig.java
@@ -0,0 +1,57 @@
+package talium.inputs.Twitch4J;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public record TwitchConfig(
+        String channelName,
+        String chatAccountName,
+        String sendTo,
+        String app_clientID,
+        String app_clientSecret
+) {
+    @Autowired
+    public TwitchConfig(
+            @Value("${twitchChannelName}") String channelName,
+            @Value("${twitchBotAccountName:}") String chatAccountName,
+            @Value("${twitchOutputToChannel:}") String sendTo,
+            @Value("${twitchAppId}") String app_clientID,
+            @Value("${twitchAppSecret}") String app_clientSecret
+    ) {
+        this.channelName = channelName;
+        this.chatAccountName = chatAccountName;
+        this.sendTo = sendTo;
+        this.app_clientID = app_clientID;
+        this.app_clientSecret = app_clientSecret;
+    }
+
+    boolean hasChannelName() {
+        return channelName != null && !channelName.isEmpty();
+    }
+
+    boolean hasChatAccountName() {
+        return chatAccountName != null && !chatAccountName.isEmpty();
+    }
+
+    boolean hasSendTo() {
+        return sendTo != null && !sendTo.isEmpty();
+    }
+
+    boolean hasAppClientID() {
+        return app_clientID != null && !app_clientID.isEmpty();
+    }
+
+    boolean hasAppClientSecret() {
+        return app_clientSecret != null && !app_clientSecret.isEmpty();
+    }
+
+    TwitchConfig setAccountName(String chatAccountName) {
+        return new TwitchConfig(channelName, chatAccountName, sendTo, app_clientID, app_clientSecret);
+
+    }
+    TwitchConfig setSendTo(String sendTo) {
+        return new TwitchConfig(channelName, chatAccountName, sendTo, app_clientID, app_clientSecret);
+    }
+}

From e871516fc1159d49471bf3c3fff7058fabaf3ab9 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 6 Feb 2025 17:21:09 +0100
Subject: [PATCH 47/58] add TipeeeConnectionTest to test authentication
 procedure with live tipeee servers

---
 .../TipeeeStream/TipeeeConnectionTest.java    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java

diff --git a/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java b/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
new file mode 100644
index 00000000..b5952af6
--- /dev/null
+++ b/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
@@ -0,0 +1,38 @@
+package talium.inputs.TipeeeStream;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import talium.system.inputSystem.HealthManager;
+import talium.system.inputSystem.InputStatus;
+
+import java.time.Instant;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+@SpringBootTest
+@TestPropertySource("classpath:/application-test.properties")
+public class TipeeeConnectionTest {
+    @Autowired
+    TipeeeConfig config;
+
+    @Test
+    void connect() {
+        var donationRepo = Mockito.mock(DonationRepo.class);
+        try {
+            var tipeee = new TipeeeInput(config, donationRepo);
+            var shouldHaveFinishedBy = Instant.now().plusSeconds(10);
+            tipeee.startup();
+            while (HealthManager.get(TipeeeInput.class) == InputStatus.STARTING && shouldHaveFinishedBy.isAfter(Instant.now())) {
+                Thread.onSpinWait();
+            }
+            assertEquals(InputStatus.HEALTHY, HealthManager.get(TipeeeInput.class));
+            tipeee.shutdown();
+        } catch (TipeeeInput.TipeeeStreamException e) {
+            fail("Connection failed with: ", e);
+        }
+    }
+}

From 71862969ed78080afb7ebd118081c9349107d7d6 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Thu, 6 Feb 2025 17:53:31 +0100
Subject: [PATCH 48/58] remove some @Component annotations

---
 bot/main/talium/Registrar.java                    |  3 ---
 bot/main/talium/TwitchBot.java                    | 15 ++++++++++-----
 .../inputs/TipeeeStream/DonationEntity.java       |  2 --
 .../talium/inputs/Twitch4J/Twitch4JInput.java     |  9 ++++++---
 .../talium/inputs/shared/oauth/OauthAccount.java  | 11 -----------
 .../coinsWatchtime/WIPWatchtimeCommandServer.java | 12 +-----------
 .../coinsWatchtime/WatchtimeUpdateService.java    | 13 +++----------
 7 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 94bd862f..77c726b8 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -28,9 +28,6 @@ public Registrar(TemplateService templateService) {
         Registrar.templateService = templateService;
     }
 
-    public Registrar() {
-    }
-
     /// Register Custom HealthUI titel and description
     public static void registerHealthDescription(String self, String title, String description) {
         HealthManager.addCustomization(self, title, description);
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 207ad6ca..8630bd0f 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -8,9 +8,11 @@
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.inputs.Twitch4J.TwitchConfig;
+import talium.inputs.shared.oauth.OauthAccountRepo;
 import talium.system.StopWatch;
 import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
 import talium.system.coinsWatchtime.WatchtimeUpdateService;
+import talium.system.coinsWatchtime.chatter.ChatterService;
 import talium.system.inputSystem.BotInput;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.InputStatus;
@@ -39,6 +41,7 @@ public static void main(String[] args) {
     public static void startup() {
         StopWatch time = new StopWatch(StopWatch.TYPE.STARTUP);
         ctx = SpringApplication.run(TwitchBot.class);
+
         System.out.println();
         System.out.println("DateFormat: DayNumber-Hour:Minute:Second:Millis");
         System.out.println("DDD-HH:mm:ss.SSS |LEVEL| [THREAD]        LOGGER (Source Class)               - MSG");
@@ -46,18 +49,19 @@ public static void startup() {
         var serverPort = ctx.getEnvironment().getProperty("server.port");
         logger.info("Server started on Port: {}", serverPort);
 
+        // Start initializing system components, the order of operations is very important!
         twitch = startInput(new Twitch4JInput(
-                ctx.getBean(TwitchConfig.class)
+                ctx.getBean(TwitchConfig.class),
+                ctx.getBean(OauthAccountRepo.class)
         ));
         tipeee = startInput(new TipeeeInput(
                 ctx.getBean(TipeeeConfig.class),
                 ctx.getBean(DonationRepo.class))
         );
 
-        logger.info("Inputs started, initializing other system components...");
         // This section is used to pass the execution/control to different parts of the bot to do some initialisation
-        WatchtimeUpdateService.init();
-        WIPWatchtimeCommandServer.init();
+        WatchtimeUpdateService.init(ctx.getBean(ChatterService.class));
+        WIPWatchtimeCommandServer.init(ctx.getBean(ChatterService.class));
 
         TriggerProvider.rebuildTriggerCache();
         //TODO remove all templates that were once registered automatically, but are no longer
@@ -97,7 +101,8 @@ private static void stopInput(BotInput input) {
     public static boolean reconnectTwitch() {
         twitch.shutdown();
         var twitch = new Twitch4JInput(
-                ctx.getBean(TwitchConfig.class)
+                ctx.getBean(TwitchConfig.class),
+                ctx.getBean(OauthAccountRepo.class)
         );
         try {
             twitch.startup();
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEntity.java b/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
index 1e1d17c1..1a689f3e 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
+++ b/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
@@ -2,14 +2,12 @@
 
 import jakarta.persistence.*;
 import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Component;
 
 import java.time.ZonedDateTime;
 import java.util.Currency;
 
 @Entity
 @Table(name = "donation_history")
-@Component
 public class DonationEntity {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 808d9979..f340a6ff 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -13,6 +13,7 @@
 import talium.Registrar;
 import talium.inputs.shared.oauth.OAuthEndpoint;
 import talium.inputs.shared.oauth.OauthAccount;
+import talium.inputs.shared.oauth.OauthAccountRepo;
 import talium.system.Out;
 import talium.system.eventSystem.EventDispatcher;
 import talium.system.eventSystem.Subscriber;
@@ -33,6 +34,7 @@ public class Twitch4JInput implements BotInput {
     private static final Logger logger = LoggerFactory.getLogger(Twitch4JInput.class);
 
     private TwitchConfig config;
+    private OauthAccountRepo oauthRepo;
 
     protected static volatile TwitchChat chat;
     protected static volatile TwitchHelix helix;
@@ -42,8 +44,9 @@ public class Twitch4JInput implements BotInput {
 
     protected static String broadCasterChannelId;
 
-    public Twitch4JInput(TwitchConfig config) {
+    public Twitch4JInput(TwitchConfig config, OauthAccountRepo oauthRepo) {
         this.config = config;
+        this.oauthRepo = oauthRepo;
     }
 
 
@@ -112,7 +115,7 @@ public void startup() {
     public void shutdown() {
         if (oAuth2Credential != null) {
             OauthAccount account = new OauthAccount(config.chatAccountName(), "twitch", oAuth2Credential.getRefreshToken());
-            OauthAccount.repo.save(account);
+            oauthRepo.save(account);
         }
         if (twitchClient != null) {
             twitchClient.close();
@@ -121,7 +124,7 @@ public void shutdown() {
     }
 
     private Optional<OAuth2Credential> getRefreshedOauthFromDB(TwitchIdentityProvider iProvider) {
-        Optional<OauthAccount> dbCreds = OauthAccount.repo.getByAccNameAndService(config.chatAccountName(), "twitch");
+        Optional<OauthAccount> dbCreds = oauthRepo.getByAccNameAndService(config.chatAccountName(), "twitch");
         if (dbCreds.isEmpty()) {
             return Optional.empty();
         }
diff --git a/bot/main/talium/inputs/shared/oauth/OauthAccount.java b/bot/main/talium/inputs/shared/oauth/OauthAccount.java
index 63448138..93323f98 100644
--- a/bot/main/talium/inputs/shared/oauth/OauthAccount.java
+++ b/bot/main/talium/inputs/shared/oauth/OauthAccount.java
@@ -1,12 +1,9 @@
 package talium.inputs.shared.oauth;
 
 import jakarta.persistence.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 @Entity
 @Table(name = "sys-auth_accounts")
-@Component
 public class OauthAccount {
     @Id
     public String accName;
@@ -21,14 +18,6 @@ public OauthAccount(String accName, String service, String refreshToken) {
         this.service = service;
         this.refreshToken = refreshToken;
     }
-
-    public static OauthAccountRepo repo;
-
-    @Autowired
-    public void setOauthAccountRepo(OauthAccountRepo oauthAccountRepo) {
-        repo = oauthAccountRepo;
-    }
-
 }
 
 
diff --git a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
index ba61c44a..0bc4848c 100644
--- a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -1,9 +1,5 @@
 package talium.system.coinsWatchtime;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import talium.Registrar;
 import talium.inputs.Twitch4J.ChatMessage;
 import talium.system.Out;
@@ -15,17 +11,11 @@
 /**
  * Serves all commands related to watchtime and coins
  */
-@Component
 public class WIPWatchtimeCommandServer {
-    private static final Logger logger = LoggerFactory.getLogger(WIPWatchtimeCommandServer.class);
     private static ChatterService chatterService;
 
-    @Autowired
-    public void setChatterService(ChatterService chatterService) {
+    public static void init(ChatterService chatterService) {
         WIPWatchtimeCommandServer.chatterService = chatterService;
-    }
-
-    public static void init() {
         new Registrar.Command("watchtime.getwatchtime", "!watchtime").registerActionCommand(WIPWatchtimeCommandServer::triggerGetWatchtime);
         new Registrar.Command("watchtime.getCoins", "!coins").registerActionCommand(WIPWatchtimeCommandServer::triggerGetCoins);
         Registrar.registerTemplate("coins.coins", "${wt.username} has ${wt.coins} Coins!");
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
index e1bc8a0d..eed5b64b 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
+++ b/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
@@ -4,8 +4,6 @@
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.ChatterService;
 
@@ -18,7 +16,6 @@
 /**
  * Requests the twitch user list (list of active chatters) and adds the gained watchtime and coins for all users.
  */
-@Component
 public class WatchtimeUpdateService {
     private static final Logger logger = LoggerFactory.getLogger(WatchtimeUpdateService.class);
 
@@ -29,19 +26,15 @@ public class WatchtimeUpdateService {
     private static final int COIN_PAYOUT_INTERVAL_SECONDS = 600;
     private static final int COIN_PAYOUT_AMOUNT = 1;
 
-    @Autowired
-    public void setChatterService(ChatterService chatterService) {
-        WatchtimeUpdateService.chatterService = chatterService;
-    }
-
     static {
         ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("CHATTER_UPDATE_EXECUTOR").build();
         CHATTER_UPDATE_SERVICE = Executors.newSingleThreadScheduledExecutor(namedThreadFactory);
 
     }
 
-    public static void init() {
-        CHATTER_UPDATE_SERVICE.scheduleAtFixedRate(WatchtimeUpdateService::update, 1, POLLING_INTERVAL_SECONDS, TimeUnit.SECONDS);
+    public static void init(ChatterService chatterService) {
+        WatchtimeUpdateService.chatterService = chatterService;
+        CHATTER_UPDATE_SERVICE.scheduleAtFixedRate(WatchtimeUpdateService::update, 10, POLLING_INTERVAL_SECONDS, TimeUnit.SECONDS);
     }
 
     private static List<String> getUserList() {

From 88f9ae150c06522907facf0a0c8fac127620761e Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 00:41:59 +0100
Subject: [PATCH 49/58] fix brocken cooldowns

---
 .../talium/system/eventSystem/EventDispatcher.java     |  1 -
 .../twitchCommands/cooldown/CooldownService.java       |  8 ++++----
 .../twitchCommands/triggerEngine/TriggerEngine.java    | 10 +++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bot/main/talium/system/eventSystem/EventDispatcher.java b/bot/main/talium/system/eventSystem/EventDispatcher.java
index 86d1ec58..492273d4 100644
--- a/bot/main/talium/system/eventSystem/EventDispatcher.java
+++ b/bot/main/talium/system/eventSystem/EventDispatcher.java
@@ -9,7 +9,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.Arrays;
 import java.util.Set;
 import java.util.StringJoiner;
 
diff --git a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
index ef660772..33530702 100644
--- a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
+++ b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
@@ -130,8 +130,8 @@ public static boolean inUserCooldown(ChatMessage message, String triggerId, Chat
         if (lastUseInstant == null) {
             return false;
         }
-        var secondsBetween = ChronoUnit.SECONDS.between(message.sendAT(),lastUseInstant);
-        return secondsBetween <= userCooldown.amount;
+        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAT());
+        return secondsBetween < userCooldown.amount;
     }
 
     /**
@@ -156,8 +156,8 @@ public static boolean inGlobalCooldown(ChatMessage message, String triggerId, Ch
         if (lastUseInstant == null) {
             return false;
         }
-        var secondsBetween = ChronoUnit.SECONDS.between(message.sendAT(),lastUseInstant);
-        return secondsBetween <= globalCooldown.amount;
+        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAT());
+        return secondsBetween < globalCooldown.amount;
     }
 
     /**
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
index d26b710a..fc9987ae 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
@@ -65,9 +65,12 @@ private static void processTrigger(RuntimeTrigger trigger, ChatMessage message)
             return;
         }
 
-        var cooldown = inGlobalCooldown(message, trigger.id(), trigger.userCooldown()) || inUserCooldown(message, trigger.id(), trigger.userCooldown());
-        if (cooldown) {
-            logger.debug("Call to command {} from {} rejected because of cooldowns", trigger.id(), message.user().name());
+        if (inGlobalCooldown(message, trigger.id(), trigger.globalCooldown())) {
+            logger.debug("Call to command {} from {} rejected because of global cooldowns", trigger.id(), message.user().name());
+            return;
+        }
+        if (inUserCooldown(message, trigger.id(), trigger.userCooldown())) {
+            logger.debug("Call to command {} from {} rejected because of user cooldowns", trigger.id(), message.user().name());
             return;
         }
         updateCooldownState(message, trigger.id(), trigger.globalCooldown(), trigger.userCooldown());
@@ -80,6 +83,7 @@ private static void processTrigger(RuntimeTrigger trigger, ChatMessage message)
     }
 
     public static void executeTextCommand(String commandId, ChatMessage message) {
+        logger.debug("Executing text command {}", commandId);
         var template = templateService.getTemplateByCommandId(commandId);
         if (template.isEmpty()) {
             logger.error("Could not find template id for command id {}", commandId);

From bcfd94c57981948be7068aaa19d0a96a6abd10b6 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 01:01:53 +0100
Subject: [PATCH 50/58] ignore singular % or $ not followed by {

---
 .../system/templateParser/TemplateLexer.java   | 12 ++++++++----
 .../templateParser/TemplateLexerTest.java      | 18 +++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/system/templateParser/TemplateLexer.java
index 33f23806..b220767d 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/system/templateParser/TemplateLexer.java
@@ -42,8 +42,12 @@ public TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEnd
         if (src.isEOF()) {
             throw new UnexpectedEndOfInputException();
         }
-        if (src.peek() == '$') {
-            src.consume('$');
+        char ch = src.next();
+        if (Character.isWhitespace(ch)) {
+            return TemplateToken.text(String.valueOf(ch));
+        }
+
+        if (ch == '$' && src.peek() == '{') {
             src.consume('{');
             src.skipWhitespace();
             String varName = src.readUntil('}');
@@ -51,9 +55,8 @@ public TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEnd
             src.consume('}');
             return TemplateToken.var(varName);
 
-        } else if (src.peek() == '%') {
+        } else if (ch == '%' && src.peek() == '{') {
             // Get type of directive if or for
-            src.consume('%');
             src.consume('{');
             src.skipWhitespace();
             String directive = src.readTillWhitespaceOr('}');
@@ -86,6 +89,7 @@ public TemplateToken parseToken() throws UnexpectedTokenException, UnexpectedEnd
             }
         } else {
             StringBuilder buffer = new StringBuilder();
+            buffer.append(ch);
             // while no var or directive is encountered, all chars are consumed into a TEXT token
             while (!src.isEOF() && src.peek() != '$' && src.peek() != '%') {
                 buffer.append(src.next());
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/system/templateParser/TemplateLexerTest.java
index 224b8c39..827224f6 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/system/templateParser/TemplateLexerTest.java
@@ -64,25 +64,21 @@ void malformed_endIf() throws UnsupportedDirective, UnexpectedEndOfInputExceptio
     }
 
     @Test
-    void directive_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputException {
-        try {
-            new TemplateLexer("template text % mehr text").parse();
-            fail("Should have thrown an TemplateSyntaxException");
-        } catch (UnexpectedTokenException _) { }
-        try {
-            new TemplateLexer("template text %c mehr text").parse();
-            fail("Should have thrown an TemplateSyntaxException");
-        } catch (UnexpectedTokenException _) { }
+    void percent_dollar_in_template() throws UnsupportedDirective, UnexpectedEndOfInputException, UnexpectedTokenException {
+        new TemplateLexer("template text % mehr text").parse();
+        new TemplateLexer("template text %c mehr text").parse();
+        new TemplateLexer("template text $ mehr text").parse();
+        new TemplateLexer("template text $c mehr text").parse();
     }
 
     @Test
     void variable_start_in_text() throws UnsupportedDirective, UnexpectedEndOfInputException {
         try {
-            new TemplateLexer("template text $ mehr text").parse();
+            new TemplateLexer("template text ${ mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
         } catch (UnexpectedTokenException _) { }
         try {
-            new TemplateLexer("template text $c mehr text").parse();
+            new TemplateLexer("template text ${c mehr text").parse();
             fail("Should have thrown an TemplateSyntaxException");
         } catch (UnexpectedTokenException _) { }
     }

From 5f5bf24435bbd8c5c88551ff023753681f9010a2 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 01:12:32 +0100
Subject: [PATCH 51/58] fix pipeline

---
 .github/workflows/test.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 847126c3..aa144667 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -6,6 +6,17 @@ 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
@@ -24,3 +35,6 @@ jobs:
         working-directory: bot
         env:
           JAVA_TOOL_OPTIONS: --enable-preview
+          db_url: localhost:4770/talium
+          db_user: taliumBot
+          db_pass: password

From e2dc8310efe664da7a2fcc132391467a1687c169 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 01:20:00 +0100
Subject: [PATCH 52/58] fix pipeline

---
 .github/workflows/test.yml                    |  3 --
 bot/resources/application-test.properties     | 29 +++++++++++++++++++
 .../TipeeeStream/TipeeeConnectionTest.java    |  4 +--
 3 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 bot/resources/application-test.properties

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa144667..5bc4fc0c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,6 +35,3 @@ jobs:
         working-directory: bot
         env:
           JAVA_TOOL_OPTIONS: --enable-preview
-          db_url: localhost:4770/talium
-          db_user: taliumBot
-          db_pass: password
diff --git a/bot/resources/application-test.properties b/bot/resources/application-test.properties
new file mode 100644
index 00000000..6df0368b
--- /dev/null
+++ b/bot/resources/application-test.properties
@@ -0,0 +1,29 @@
+# Origin and URLs
+panelBaseUrl=http://localhost:5173
+serverBaseUrl=http://localhost:4771
+# Comma , separated list of allowed origins ("https://a1.com,https://a2.com")
+cors=*
+
+# Database
+db_url=localhost:4770/talium
+db_user=root
+db_pass=password
+
+# Authentication
+# Disable authentication for testing only!!! This will enable using something like postman or curl for testing without setting the token header. This will break the panel for the duration this overwrite is enabled.
+disableAllAuth=false
+allowedPanelUsers=
+overwritePanelUsers=false
+
+# Chat Twitch
+# https://dev.twitch.tv || "Creating a Twitch App" in the Wiki
+twitchAppId=
+twitchAppSecret=
+twitchBotAccountName=
+twitchChannelName=
+twitchOutputToChannel=
+
+# TipeeeStream
+# Leave both empty to disable tipeee
+tipeeeApikey=
+tipeeeChannel=
diff --git a/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java b/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
index b5952af6..c7b19711 100644
--- a/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
+++ b/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
@@ -4,7 +4,7 @@
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.ActiveProfiles;
 import talium.system.inputSystem.HealthManager;
 import talium.system.inputSystem.InputStatus;
 
@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 @SpringBootTest
-@TestPropertySource("classpath:/application-test.properties")
+@ActiveProfiles("test")
 public class TipeeeConnectionTest {
     @Autowired
     TipeeeConfig config;

From d05889832f94caa32755332872ce5ed38fa96650 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 01:25:07 +0100
Subject: [PATCH 53/58] fix pipeline

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5bc4fc0c..d3423815 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,3 +35,5 @@ jobs:
         working-directory: bot
         env:
           JAVA_TOOL_OPTIONS: --enable-preview
+          tipeeeApikey: ${{ secrets.tipeeeApikey }}
+          DOCKER_PASS: ${{ secrets.tipeeeChannel }}

From 90fa08332b0fa985e29660dd79ddf8fb5393f7d9 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 12:57:05 +0100
Subject: [PATCH 54/58] add logging and exceptions to twitch ChatMessage
 conversion

---
 .../talium/inputs/Twitch4J/ChatMessage.java   | 53 +++++++----
 .../talium/inputs/Twitch4J/Twitch4JInput.java |  6 +-
 .../talium/inputs/Twitch4J/TwitchUser.java    | 89 ++++++++++++++++---
 .../cooldown/CooldownService.java             |  4 +-
 4 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/bot/main/talium/inputs/Twitch4J/ChatMessage.java b/bot/main/talium/inputs/Twitch4J/ChatMessage.java
index 96008714..3692fbfb 100644
--- a/bot/main/talium/inputs/Twitch4J/ChatMessage.java
+++ b/bot/main/talium/inputs/Twitch4J/ChatMessage.java
@@ -3,11 +3,13 @@
 import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.common.enums.CommandPermission;
 import com.github.twitch4j.common.events.domain.EventUser;
-import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import talium.system.twitchCommands.cooldown.CooldownService;
 
 import java.time.Instant;
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 
 import static talium.inputs.Twitch4J.TwitchUserPermission.*;
@@ -23,32 +25,54 @@ public record ChatMessage(
         boolean isSkipSubsModeMessage,
         boolean isDesignatedFirstMessage,
         boolean isUserIntroduction,
-        @Nullable String getCustomRewardId,
-        @Nullable String replyToMessageID,
+        Optional<String> getCustomRewardId,
+        Optional<String> replyToMessageID,
         String channelID,
-        Instant sendAT
+        Instant sendAt
 ) {
+    private static final Logger log = LoggerFactory.getLogger(ChatMessage.class);
 
-    public static ChatMessage fromChannelMessageEvent(ChannelMessageEvent event) {
+    public static class ChatMessageMalformedExceptions extends Exception {
+        public ChatMessageMalformedExceptions(String message) {
+            super(message);
+        }
+    }
+
+    public static ChatMessage fromChannelMessageEvent(ChannelMessageEvent event) throws ChatMessageMalformedExceptions {
         //Convert ChatMessage
         EventUser eUser = event.getUser();
         TwitchUser user = new TwitchUser(eUser.getId(), eUser.getName(), convertUserPermissions(event.getPermissions()), event.getSubscriberMonths(), event.getSubscriptionTier());
-        String replyToID = null;
+
+        String messageId = event.getMessageEvent().getEventId();
+        String message = event.getMessage();
+        String channelId = event.getChannel().getId();
+        if (messageId == null || messageId.isEmpty()) {
+            throw new ChatMessageMalformedExceptions("MessageId is not allowed to be empty");
+        }
+        if (message == null || message.isEmpty()) {
+            throw new ChatMessageMalformedExceptions("Message is not allowed to be empty");
+        }
+        if (channelId == null || channelId.isEmpty()) {
+            throw new ChatMessageMalformedExceptions("channelId is not allowed to be empty");
+        }
+
+        Optional<String> replyToID = Optional.empty();
         if (event.getReplyInfo() != null)
-            replyToID = event.getReplyInfo().getMessageId();
+            replyToID = event.getReplyInfo().getMessageId().describeConstable();
+
         return new ChatMessage(
-                event.getMessageEvent().getEventId(),
+                messageId,
                 CooldownService.computeMessageUserIndex(user),
                 CooldownService.computeMessageGlobalIndex(),
-                event.getMessage(),
+                message,
                 user,
                 event.isHighlightedMessage(),
-                event.isHighlightedMessage(),
+                event.isSkipSubsModeMessage(),
                 event.isDesignatedFirstMessage(),
                 event.isUserIntroduction(),
-                event.getCustomRewardId().orElse(null),
+                event.getCustomRewardId(),
                 replyToID,
-                event.getChannel().getId(),
+                channelId,
                 event.getFiredAtInstant()
         );
     }
@@ -90,9 +114,8 @@ private static HashSet<TwitchUserPermission> translatePerms(Set<CommandPermissio
                 case MODERATOR -> newPerm.add(MODERATOR);
                 case BROADCASTER -> newPerm.add(BROADCASTER);
                 case OWNER -> newPerm.add(OWNER);
-                //PRIME_TURBO, NO_VIDEO, MOMENTS, NO_AUDIO, TWITCHSTAFF, SUBGIFTER, BITS_CHEERER, PARTNER, FORMER_HYPE_TRAIN_CONDUCTOR, CURRENT_HYPE_TRAIN_CONDUCTOR -> {}
-                default -> {
-                }
+                case PRIME_TURBO, NO_VIDEO, MOMENTS, NO_AUDIO, TWITCHSTAFF, SUBGIFTER, BITS_CHEERER, PARTNER, FORMER_HYPE_TRAIN_CONDUCTOR, CURRENT_HYPE_TRAIN_CONDUCTOR -> {}
+                default -> log.warn("Unknown user permission: {}", cp);
             }
         }
         return newPerm;
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index f340a6ff..18d5689b 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -170,6 +170,10 @@ public static void convertTwitchMessage(ChannelMessageEvent messageEvent) {
         if (messageEvent.getMessage().toCharArray()[0] == '!') {
             System.out.println(simpleDateFormat.format(new Date()) + " |CHAT | " + messageEvent.getUser().getName() + ": " + messageEvent.getMessage());
         }
-        EventDispatcher.dispatch(ChatMessage.fromChannelMessageEvent(messageEvent));
+        try {
+            EventDispatcher.dispatch(ChatMessage.fromChannelMessageEvent(messageEvent));
+        } catch (ChatMessage.ChatMessageMalformedExceptions e) {
+           logger.error("Error converting Twitch message", e);
+        }
     }
 }
\ No newline at end of file
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchUser.java b/bot/main/talium/inputs/Twitch4J/TwitchUser.java
index a6320be9..519d659f 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchUser.java
+++ b/bot/main/talium/inputs/Twitch4J/TwitchUser.java
@@ -1,22 +1,83 @@
 package talium.inputs.Twitch4J;
 
+import java.util.Objects;
+
 /**
  * TwitchUser, lediglich dazu gedacht, um einen TwitchUser in einer Chatnachricht zu repräsentieren,
  * und ist nicht dazu gedacht in der Datenbank gespeichert zu werden, denn die Twitch Permissions und Badges könnten
  * sich während der Laufzeit ändern
- * <p>
- * Wenn eine Nachricht Systemintern entsteht/simuliert wird, werden beim Erstellen standard werte eingefügt:
- * name = -SYSTEM-
- * id = -SYSTEM-
- * permission = OWNER
- * subscriberMonths = Integer.MAX_VALUE
- * subscriptionTier = Integer.MAX_VALUE
  */
-public record TwitchUser(
-        String id,
-        String name,
-        TwitchUserPermission permission,
-        int subscriberMonths,
-        int subscriptionTier
-) {
+public final class TwitchUser {
+    private final String id;
+    private final String name;
+    private final TwitchUserPermission permission;
+    private final int subscriberMonths;
+    private final int subscriptionTier;
+
+    public TwitchUser(
+            String id,
+            String name,
+            TwitchUserPermission permission,
+            int subscriberMonths,
+            int subscriptionTier
+    ) throws ChatMessage.ChatMessageMalformedExceptions {
+        if (id == null || id.isEmpty())
+            throw new ChatMessage.ChatMessageMalformedExceptions("Twitch User ID cannot be empty");
+        this.id = id;
+        if (name == null || name.isEmpty())
+            throw new ChatMessage.ChatMessageMalformedExceptions("Username cannot be empty");
+        this.name = name;
+        this.permission = permission;
+        if (subscriberMonths < 0 || subscriptionTier < 0)
+            throw new ChatMessage.ChatMessageMalformedExceptions("Subscriber Months and Tier are not allowed to be negative");
+        this.subscriberMonths = subscriberMonths;
+        this.subscriptionTier = subscriptionTier;
+    }
+
+    public String id() {
+        return id;
+    }
+
+    public String name() {
+        return name;
+    }
+
+    public TwitchUserPermission permission() {
+        return permission;
+    }
+
+    public int subscriberMonths() {
+        return subscriberMonths;
+    }
+
+    public int subscriptionTier() {
+        return subscriptionTier;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) return true;
+        if (obj == null || obj.getClass() != this.getClass()) return false;
+        var that = (TwitchUser) obj;
+        return Objects.equals(this.id, that.id) &&
+                Objects.equals(this.name, that.name) &&
+                Objects.equals(this.permission, that.permission) &&
+                this.subscriberMonths == that.subscriberMonths &&
+                this.subscriptionTier == that.subscriptionTier;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, permission, subscriberMonths, subscriptionTier);
+    }
+
+    @Override
+    public String toString() {
+        return "TwitchUser[" +
+                "id=" + id + ", " +
+                "name=" + name + ", " +
+                "permission=" + permission + ", " +
+                "subscriberMonths=" + subscriberMonths + ", " +
+                "subscriptionTier=" + subscriptionTier + ']';
+    }
 }
diff --git a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
index 33530702..edb70d53 100644
--- a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
+++ b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
@@ -130,7 +130,7 @@ public static boolean inUserCooldown(ChatMessage message, String triggerId, Chat
         if (lastUseInstant == null) {
             return false;
         }
-        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAT());
+        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAt());
         return secondsBetween < userCooldown.amount;
     }
 
@@ -156,7 +156,7 @@ public static boolean inGlobalCooldown(ChatMessage message, String triggerId, Ch
         if (lastUseInstant == null) {
             return false;
         }
-        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAT());
+        var secondsBetween = ChronoUnit.SECONDS.between(lastUseInstant, message.sendAt());
         return secondsBetween < globalCooldown.amount;
     }
 

From d464d5aa8676bc7aabaaf693fcd30a40079ab370 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 13:03:50 +0100
Subject: [PATCH 55/58] move oauth

---
 bot/main/talium/TwitchBot.java                              | 2 +-
 bot/main/talium/inputs/Twitch4J/Twitch4JInput.java          | 6 +++---
 .../shared/oauth => oauthConnector}/OAuthEndpoint.java      | 2 +-
 .../shared/oauth => oauthConnector}/OauthAccount.java       | 2 +-
 .../shared/oauth => oauthConnector}/OauthAccountRepo.java   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename bot/main/talium/{inputs/shared/oauth => oauthConnector}/OAuthEndpoint.java (99%)
 rename bot/main/talium/{inputs/shared/oauth => oauthConnector}/OauthAccount.java (92%)
 rename bot/main/talium/{inputs/shared/oauth => oauthConnector}/OauthAccountRepo.java (92%)

diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 8630bd0f..cb1dbf5b 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -8,7 +8,7 @@
 import talium.inputs.TipeeeStream.TipeeeInput;
 import talium.inputs.Twitch4J.Twitch4JInput;
 import talium.inputs.Twitch4J.TwitchConfig;
-import talium.inputs.shared.oauth.OauthAccountRepo;
+import talium.oauthConnector.OauthAccountRepo;
 import talium.system.StopWatch;
 import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
 import talium.system.coinsWatchtime.WatchtimeUpdateService;
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
index 18d5689b..dff7c0e7 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
@@ -11,9 +11,9 @@
 import com.github.twitch4j.helix.TwitchHelix;
 import org.apache.commons.lang.RandomStringUtils;
 import talium.Registrar;
-import talium.inputs.shared.oauth.OAuthEndpoint;
-import talium.inputs.shared.oauth.OauthAccount;
-import talium.inputs.shared.oauth.OauthAccountRepo;
+import talium.oauthConnector.OAuthEndpoint;
+import talium.oauthConnector.OauthAccount;
+import talium.oauthConnector.OauthAccountRepo;
 import talium.system.Out;
 import talium.system.eventSystem.EventDispatcher;
 import talium.system.eventSystem.Subscriber;
diff --git a/bot/main/talium/inputs/shared/oauth/OAuthEndpoint.java b/bot/main/talium/oauthConnector/OAuthEndpoint.java
similarity index 99%
rename from bot/main/talium/inputs/shared/oauth/OAuthEndpoint.java
rename to bot/main/talium/oauthConnector/OAuthEndpoint.java
index aefbef27..31ff0647 100644
--- a/bot/main/talium/inputs/shared/oauth/OAuthEndpoint.java
+++ b/bot/main/talium/oauthConnector/OAuthEndpoint.java
@@ -1,4 +1,4 @@
-package talium.inputs.shared.oauth;
+package talium.oauthConnector;
 
 import com.github.philippheuer.credentialmanager.identityprovider.OAuth2IdentityProvider;
 import com.google.gson.Gson;
diff --git a/bot/main/talium/inputs/shared/oauth/OauthAccount.java b/bot/main/talium/oauthConnector/OauthAccount.java
similarity index 92%
rename from bot/main/talium/inputs/shared/oauth/OauthAccount.java
rename to bot/main/talium/oauthConnector/OauthAccount.java
index 93323f98..9179d6d3 100644
--- a/bot/main/talium/inputs/shared/oauth/OauthAccount.java
+++ b/bot/main/talium/oauthConnector/OauthAccount.java
@@ -1,4 +1,4 @@
-package talium.inputs.shared.oauth;
+package talium.oauthConnector;
 
 import jakarta.persistence.*;
 
diff --git a/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java b/bot/main/talium/oauthConnector/OauthAccountRepo.java
similarity index 92%
rename from bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java
rename to bot/main/talium/oauthConnector/OauthAccountRepo.java
index 4ea6557e..5a27ee65 100644
--- a/bot/main/talium/inputs/shared/oauth/OauthAccountRepo.java
+++ b/bot/main/talium/oauthConnector/OauthAccountRepo.java
@@ -1,4 +1,4 @@
-package talium.inputs.shared.oauth;
+package talium.oauthConnector;
 
 import org.jetbrains.annotations.NotNull;
 import org.springframework.data.repository.CrudRepository;

From 83b44ee23976e4d779c3b221d1790454b72d8d79 Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 13:06:00 +0100
Subject: [PATCH 56/58] move tipeee and twitch

---
 bot/main/talium/Registrar.java                         |  2 +-
 .../{inputs => }/TipeeeStream/DonationEntity.java      |  2 +-
 .../{inputs => }/TipeeeStream/DonationEvent.java       |  2 +-
 .../talium/{inputs => }/TipeeeStream/DonationRepo.java |  2 +-
 .../talium/{inputs => }/TipeeeStream/TipeeeConfig.java |  2 +-
 .../{inputs => }/TipeeeStream/TipeeeEventHandler.java  |  2 +-
 .../talium/{inputs => }/TipeeeStream/TipeeeInput.java  |  2 +-
 bot/main/talium/{inputs => }/Twitch4J/ChatMessage.java |  6 +++---
 .../talium/{inputs => }/Twitch4J/Twitch4JInput.java    |  2 +-
 .../talium/{inputs => }/Twitch4J/TwitchAPINoop.java    |  3 +--
 bot/main/talium/{inputs => }/Twitch4J/TwitchApi.java   |  2 +-
 .../talium/{inputs => }/Twitch4J/TwitchApiImpl.java    |  2 +-
 .../talium/{inputs => }/Twitch4J/TwitchConfig.java     |  2 +-
 bot/main/talium/{inputs => }/Twitch4J/TwitchUser.java  |  2 +-
 .../{inputs => }/Twitch4J/TwitchUserPermission.java    |  2 +-
 bot/main/talium/TwitchBot.java                         | 10 +++++-----
 bot/main/talium/system/Out.java                        |  4 ++--
 .../coinsWatchtime/WIPWatchtimeCommandServer.java      |  2 +-
 .../system/twitchCommands/controller/TriggerDTO.java   |  6 +-----
 .../twitchCommands/cooldown/CooldownService.java       |  4 ++--
 .../twitchCommands/persistence/TriggerEntity.java      |  2 +-
 .../twitchCommands/triggerEngine/RuntimeTrigger.java   |  2 +-
 .../twitchCommands/triggerEngine/TriggerCallback.java  |  2 +-
 .../twitchCommands/triggerEngine/TriggerEngine.java    |  2 +-
 .../TipeeeStream/TipeeeConnectionTest.java             |  2 +-
 .../{inputs => }/TipeeeStream/TipeeeInputTest.java     |  2 +-
 26 files changed, 34 insertions(+), 39 deletions(-)
 rename bot/main/talium/{inputs => }/TipeeeStream/DonationEntity.java (96%)
 rename bot/main/talium/{inputs => }/TipeeeStream/DonationEvent.java (94%)
 rename bot/main/talium/{inputs => }/TipeeeStream/DonationRepo.java (80%)
 rename bot/main/talium/{inputs => }/TipeeeStream/TipeeeConfig.java (97%)
 rename bot/main/talium/{inputs => }/TipeeeStream/TipeeeEventHandler.java (98%)
 rename bot/main/talium/{inputs => }/TipeeeStream/TipeeeInput.java (99%)
 rename bot/main/talium/{inputs => }/Twitch4J/ChatMessage.java (96%)
 rename bot/main/talium/{inputs => }/Twitch4J/Twitch4JInput.java (99%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchAPINoop.java (95%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchApi.java (93%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchApiImpl.java (99%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchConfig.java (98%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchUser.java (98%)
 rename bot/main/talium/{inputs => }/Twitch4J/TwitchUserPermission.java (91%)
 rename bot/test/talium/{inputs => }/TipeeeStream/TipeeeConnectionTest.java (97%)
 rename bot/test/talium/{inputs => }/TipeeeStream/TipeeeInputTest.java (98%)

diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 77c726b8..69b4bb08 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -2,7 +2,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.Twitch4J.TwitchUserPermission;
 import talium.system.inputSystem.HealthManager;
 import talium.system.stringTemplates.Template;
 import talium.system.stringTemplates.TemplateService;
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEntity.java b/bot/main/talium/TipeeeStream/DonationEntity.java
similarity index 96%
rename from bot/main/talium/inputs/TipeeeStream/DonationEntity.java
rename to bot/main/talium/TipeeeStream/DonationEntity.java
index 1a689f3e..8f5d5a13 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationEntity.java
+++ b/bot/main/talium/TipeeeStream/DonationEntity.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import jakarta.persistence.*;
 import org.springframework.lang.Nullable;
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java b/bot/main/talium/TipeeeStream/DonationEvent.java
similarity index 94%
rename from bot/main/talium/inputs/TipeeeStream/DonationEvent.java
rename to bot/main/talium/TipeeeStream/DonationEvent.java
index c6992666..bead993c 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationEvent.java
+++ b/bot/main/talium/TipeeeStream/DonationEvent.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import java.time.ZonedDateTime;
 import java.util.Currency;
diff --git a/bot/main/talium/inputs/TipeeeStream/DonationRepo.java b/bot/main/talium/TipeeeStream/DonationRepo.java
similarity index 80%
rename from bot/main/talium/inputs/TipeeeStream/DonationRepo.java
rename to bot/main/talium/TipeeeStream/DonationRepo.java
index df8818a4..698cb0ff 100644
--- a/bot/main/talium/inputs/TipeeeStream/DonationRepo.java
+++ b/bot/main/talium/TipeeeStream/DonationRepo.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import org.springframework.data.repository.ListCrudRepository;
 
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java b/bot/main/talium/TipeeeStream/TipeeeConfig.java
similarity index 97%
rename from bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java
rename to bot/main/talium/TipeeeStream/TipeeeConfig.java
index c90786da..05a2d501 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeConfig.java
+++ b/bot/main/talium/TipeeeStream/TipeeeConfig.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java b/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
similarity index 98%
rename from bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java
rename to bot/main/talium/TipeeeStream/TipeeeEventHandler.java
index 6a336fcd..5aae9714 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeEventHandler.java
+++ b/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import talium.system.eventSystem.EventDispatcher;
 import org.json.JSONArray;
diff --git a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java b/bot/main/talium/TipeeeStream/TipeeeInput.java
similarity index 99%
rename from bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
rename to bot/main/talium/TipeeeStream/TipeeeInput.java
index 2720d1da..c3643960 100644
--- a/bot/main/talium/inputs/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/TipeeeStream/TipeeeInput.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import io.socket.client.IO;
 import io.socket.client.Socket;
diff --git a/bot/main/talium/inputs/Twitch4J/ChatMessage.java b/bot/main/talium/Twitch4J/ChatMessage.java
similarity index 96%
rename from bot/main/talium/inputs/Twitch4J/ChatMessage.java
rename to bot/main/talium/Twitch4J/ChatMessage.java
index 3692fbfb..205d093c 100644
--- a/bot/main/talium/inputs/Twitch4J/ChatMessage.java
+++ b/bot/main/talium/Twitch4J/ChatMessage.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.common.enums.CommandPermission;
@@ -12,8 +12,8 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static talium.inputs.Twitch4J.TwitchUserPermission.*;
-import static talium.inputs.Twitch4J.TwitchUserPermission.OWNER;
+import static talium.Twitch4J.TwitchUserPermission.*;
+import static talium.Twitch4J.TwitchUserPermission.OWNER;
 
 public record ChatMessage(
         String messageId,
diff --git a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java b/bot/main/talium/Twitch4J/Twitch4JInput.java
similarity index 99%
rename from bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
rename to bot/main/talium/Twitch4J/Twitch4JInput.java
index dff7c0e7..0656ede5 100644
--- a/bot/main/talium/inputs/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/Twitch4J/Twitch4JInput.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
 import com.github.philippheuer.events4j.simple.SimpleEventHandler;
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java b/bot/main/talium/Twitch4J/TwitchAPINoop.java
similarity index 95%
rename from bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java
rename to bot/main/talium/Twitch4J/TwitchAPINoop.java
index 2cb4cc11..6d141d52 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchAPINoop.java
+++ b/bot/main/talium/Twitch4J/TwitchAPINoop.java
@@ -1,11 +1,10 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApi.java b/bot/main/talium/Twitch4J/TwitchApi.java
similarity index 93%
rename from bot/main/talium/inputs/Twitch4J/TwitchApi.java
rename to bot/main/talium/Twitch4J/TwitchApi.java
index 40404070..f25c9de7 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApi.java
+++ b/bot/main/talium/Twitch4J/TwitchApi.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java b/bot/main/talium/Twitch4J/TwitchApiImpl.java
similarity index 99%
rename from bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
rename to bot/main/talium/Twitch4J/TwitchApiImpl.java
index 91b5e8be..4cd0b23f 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchApiImpl.java
+++ b/bot/main/talium/Twitch4J/TwitchApiImpl.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
 import com.github.twitch4j.chat.TwitchChat;
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchConfig.java b/bot/main/talium/Twitch4J/TwitchConfig.java
similarity index 98%
rename from bot/main/talium/inputs/Twitch4J/TwitchConfig.java
rename to bot/main/talium/Twitch4J/TwitchConfig.java
index a63ab8b6..093f6824 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchConfig.java
+++ b/bot/main/talium/Twitch4J/TwitchConfig.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchUser.java b/bot/main/talium/Twitch4J/TwitchUser.java
similarity index 98%
rename from bot/main/talium/inputs/Twitch4J/TwitchUser.java
rename to bot/main/talium/Twitch4J/TwitchUser.java
index 519d659f..2226e295 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchUser.java
+++ b/bot/main/talium/Twitch4J/TwitchUser.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 import java.util.Objects;
 
diff --git a/bot/main/talium/inputs/Twitch4J/TwitchUserPermission.java b/bot/main/talium/Twitch4J/TwitchUserPermission.java
similarity index 91%
rename from bot/main/talium/inputs/Twitch4J/TwitchUserPermission.java
rename to bot/main/talium/Twitch4J/TwitchUserPermission.java
index ffc55351..8bf60d74 100644
--- a/bot/main/talium/inputs/Twitch4J/TwitchUserPermission.java
+++ b/bot/main/talium/Twitch4J/TwitchUserPermission.java
@@ -1,4 +1,4 @@
-package talium.inputs.Twitch4J;
+package talium.Twitch4J;
 
 /**
  * Unser Subset der Twitch4J/Twitch User Permissions/Badges {@link com.github.twitch4j.common.enums.CommandPermission}
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index cb1dbf5b..887a44e4 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -3,11 +3,11 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
 import org.springframework.context.ConfigurableApplicationContext;
-import talium.inputs.TipeeeStream.DonationRepo;
-import talium.inputs.TipeeeStream.TipeeeConfig;
-import talium.inputs.TipeeeStream.TipeeeInput;
-import talium.inputs.Twitch4J.Twitch4JInput;
-import talium.inputs.Twitch4J.TwitchConfig;
+import talium.TipeeeStream.DonationRepo;
+import talium.TipeeeStream.TipeeeConfig;
+import talium.TipeeeStream.TipeeeInput;
+import talium.Twitch4J.Twitch4JInput;
+import talium.Twitch4J.TwitchConfig;
 import talium.oauthConnector.OauthAccountRepo;
 import talium.system.StopWatch;
 import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
diff --git a/bot/main/talium/system/Out.java b/bot/main/talium/system/Out.java
index aa2e8263..d9fbdf6a 100644
--- a/bot/main/talium/system/Out.java
+++ b/bot/main/talium/system/Out.java
@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
-import talium.inputs.Twitch4J.TwitchAPINoop;
-import talium.inputs.Twitch4J.TwitchApi;
+import talium.Twitch4J.TwitchAPINoop;
+import talium.Twitch4J.TwitchApi;
 import talium.system.stringTemplates.Template;
 import talium.system.stringTemplates.TemplateService;
 import talium.system.templateParser.exeptions.*;
diff --git a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
index 0bc4848c..3ce8ecd6 100644
--- a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -1,7 +1,7 @@
 package talium.system.coinsWatchtime;
 
 import talium.Registrar;
-import talium.inputs.Twitch4J.ChatMessage;
+import talium.Twitch4J.ChatMessage;
 import talium.system.Out;
 import talium.system.coinsWatchtime.chatter.Chatter;
 import talium.system.coinsWatchtime.chatter.ChatterService;
diff --git a/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java b/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java
index d2cf13de..fcb360e2 100644
--- a/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java
+++ b/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java
@@ -1,12 +1,8 @@
 package talium.system.twitchCommands.controller;
 
-import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.Twitch4J.TwitchUserPermission;
 import talium.system.stringTemplates.TemplateDTO;
 import talium.system.twitchCommands.cooldown.ChatCooldown;
-import talium.system.twitchCommands.persistence.MessagePattern;
-import talium.system.twitchCommands.persistence.TriggerEntity;
-
-import java.util.List;
 
 public record TriggerDTO(
         String id,
diff --git a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
index edb70d53..8dba8b3d 100644
--- a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
+++ b/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
@@ -6,8 +6,8 @@
 import org.checkerframework.dataflow.qual.Pure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import talium.inputs.Twitch4J.ChatMessage;
-import talium.inputs.Twitch4J.TwitchUser;
+import talium.Twitch4J.ChatMessage;
+import talium.Twitch4J.TwitchUser;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
diff --git a/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java b/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java
index ad52d28d..f9ed09c9 100644
--- a/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java
+++ b/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java
@@ -7,7 +7,7 @@
 import talium.system.twitchCommands.controller.TriggerDTO;
 import talium.system.twitchCommands.cooldown.ChatCooldown;
 import talium.system.twitchCommands.triggerEngine.TriggerEngine;
-import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.Twitch4J.TwitchUserPermission;
 import talium.system.stringTemplates.Template;
 
 import java.util.Arrays;
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java b/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java
index d46c17d8..6592cf36 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java
@@ -2,7 +2,7 @@
 
 import talium.system.twitchCommands.persistence.TriggerEntity;
 import talium.system.twitchCommands.cooldown.ChatCooldown;
-import talium.inputs.Twitch4J.TwitchUserPermission;
+import talium.Twitch4J.TwitchUserPermission;
 
 import java.util.List;
 import java.util.regex.Pattern; /**
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java
index 3865d044..5b8f86b6 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java
@@ -1,6 +1,6 @@
 package talium.system.twitchCommands.triggerEngine;
 
-import talium.inputs.Twitch4J.ChatMessage;
+import talium.Twitch4J.ChatMessage;
 
 /**
  * Defies the functions that are valid as triggerCallbacks. <br/>
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
index fc9987ae..e953af2e 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
+++ b/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
@@ -4,7 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import talium.inputs.Twitch4J.ChatMessage;
+import talium.Twitch4J.ChatMessage;
 import talium.system.Out;
 import talium.system.eventSystem.Subscriber;
 import talium.system.stringTemplates.TemplateService;
diff --git a/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java b/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
similarity index 97%
rename from bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
rename to bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
index c7b19711..555cd46f 100644
--- a/bot/test/talium/inputs/TipeeeStream/TipeeeConnectionTest.java
+++ b/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java b/bot/test/talium/TipeeeStream/TipeeeInputTest.java
similarity index 98%
rename from bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java
rename to bot/test/talium/TipeeeStream/TipeeeInputTest.java
index f4491331..51cab676 100644
--- a/bot/test/talium/inputs/TipeeeStream/TipeeeInputTest.java
+++ b/bot/test/talium/TipeeeStream/TipeeeInputTest.java
@@ -1,4 +1,4 @@
-package talium.inputs.TipeeeStream;
+package talium.TipeeeStream;
 
 import org.json.JSONException;
 import org.json.JSONObject;

From db5c7bebeda3c79d3b42e054fa34c44c0b355b5f Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 13:09:52 +0100
Subject: [PATCH 57/58] move out of system dir

---
 .../talium/{system => }/ASCIIProgressbar.java  |  2 +-
 .../{system => }/GlobalExceptionHandler.java   |  2 +-
 bot/main/talium/{system => }/Out.java          | 14 +++++++-------
 bot/main/talium/Registrar.java                 | 18 +++++++++---------
 bot/main/talium/{system => }/StopWatch.java    |  2 +-
 .../TipeeeStream/TipeeeEventHandler.java       |  2 +-
 bot/main/talium/TipeeeStream/TipeeeInput.java  |  6 +++---
 bot/main/talium/Twitch4J/ChatMessage.java      |  2 +-
 bot/main/talium/Twitch4J/Twitch4JInput.java    | 12 ++++++------
 bot/main/talium/TwitchBot.java                 | 15 +++++++--------
 .../UnexpectedShutdownException.java           |  2 +-
 .../WIPWatchtimeCommandServer.java             |  8 ++++----
 .../coinsWatchtime/WatchtimeController.java    | 12 ++++++------
 .../coinsWatchtime/WatchtimeUpdateService.java |  6 +++---
 .../coinsWatchtime/chatter/Chatter.java        |  2 +-
 .../coinsWatchtime/chatter/ChatterDTO.java     |  2 +-
 .../coinsWatchtime/chatter/ChatterRepo.java    |  2 +-
 .../coinsWatchtime/chatter/ChatterService.java |  2 +-
 .../coinsWatchtime/chatter/LeaderboardDTO.java |  2 +-
 .../eventSystem/EventDispatcher.java           |  2 +-
 .../{system => }/eventSystem/Subscriber.java   |  2 +-
 .../{system => }/inputSystem/BotInput.java     |  2 +-
 .../inputSystem/HealthManager.java             |  3 +--
 .../{system => }/inputSystem/HealthUi.java     |  3 +--
 .../{system => }/inputSystem/InputStatus.java  |  2 +-
 .../talium/oauthConnector/OAuthEndpoint.java   |  2 +-
 .../security/HeaderAuthProcessingFilter.java   |  6 +++---
 .../security/HeaderAuthenticationProvider.java |  6 +++---
 .../{system => }/security/SecurityConfig.java  |  4 ++--
 .../security/UserAuthenticationToken.java      |  4 ++--
 .../security/auth/AuthController.java          |  6 +++---
 .../security/auth/AuthService.java             | 10 +++++-----
 .../security/auth/AuthenticationRejected.java  |  2 +-
 .../security/auth/SessionService.java          |  6 +++---
 .../security/auth/persistence/PanelUser.java   |  2 +-
 .../auth/persistence/PanelUserDTO.java         |  4 +---
 .../auth/persistence/PanelUserRepo.java        |  2 +-
 .../security/auth/persistence/Session.java     |  2 +-
 .../stringTemplates/Formatter.java             |  2 +-
 .../{system => }/stringTemplates/Template.java |  2 +-
 .../stringTemplates/TemplateController.java    |  2 +-
 .../stringTemplates/TemplateDTO.java           |  2 +-
 .../stringTemplates/TemplateRepo.java          |  2 +-
 .../stringTemplates/TemplateService.java       |  4 ++--
 .../templateParser/statements/Statement.java   |  4 ----
 .../twitchCommands/cooldown/CooldownType.java  |  9 ---------
 .../templateParser/CharakterStream.java        |  6 +++---
 .../templateParser/TemplateInterpreter.java    | 10 +++++-----
 .../templateParser/TemplateLexer.java          | 10 +++++-----
 .../templateParser/TemplateParser.java         | 14 +++++++-------
 .../exeptions/FieldDoesNotExistException.java  |  2 +-
 .../exeptions/FieldNotAccessibleException.java |  2 +-
 .../ImpossibleComparisonException.java         |  4 ++--
 .../exeptions/InterpretationException.java     |  2 +-
 .../exeptions/ParsingException.java            |  2 +-
 .../exeptions/StringTemplateException.java     |  2 +-
 .../exeptions/TemplateSyntaxException.java     |  2 +-
 .../exeptions/UnIterableArgumentException.java |  2 +-
 .../UnexpectedEndOfInputException.java         |  2 +-
 .../exeptions/UnexpectedTokenException.java    |  2 +-
 .../UnsupportedComparisonOperator.java         |  2 +-
 .../exeptions/UnsupportedDirective.java        |  2 +-
 .../exeptions/VariableValueNullException.java  |  2 +-
 .../templateParser/ifParser/IfInterpreter.java |  8 ++++----
 .../templateParser/ifParser/IfParser.java      | 16 ++++++++--------
 .../templateParser/statements/Equals.java      |  2 +-
 .../templateParser/statements/IfStatement.java |  4 ++--
 .../statements/LoopStatement.java              |  2 +-
 .../templateParser/statements/Statement.java   |  4 ++++
 .../statements/TextStatement.java              |  2 +-
 .../statements/VarStatement.java               |  4 ++--
 .../templateParser/tokens/Comparison.java      |  6 +++---
 .../templateParser/tokens/IfToken.java         |  2 +-
 .../templateParser/tokens/IfTokenKind.java     |  2 +-
 .../templateParser/tokens/TemplateToken.java   |  2 +-
 .../tokens/TemplateTokenKind.java              |  2 +-
 .../controller/CommandController.java          |  6 +++---
 .../controller/MessagePatternDTO.java          |  4 ++--
 .../twitchCommands/controller/TriggerDTO.java  |  6 +++---
 .../twitchCommands/cooldown/ChatCooldown.java  |  2 +-
 .../cooldown/CooldownService.java              |  2 +-
 .../twitchCommands/cooldown/CooldownType.java  |  9 +++++++++
 .../persistence/MessagePattern.java            |  4 ++--
 .../persistence/MessagePatternId.java          |  2 +-
 .../persistence/MessagePatternRepo.java        |  2 +-
 .../persistence/TriggerEntity.java             | 14 +++++++-------
 .../persistence/TriggerRepo.java               |  2 +-
 .../persistence/TriggerService.java            | 12 ++++++------
 .../triggerEngine/RuntimeTrigger.java          |  6 +++---
 .../triggerEngine/TriggerCallback.java         |  2 +-
 .../triggerEngine/TriggerEngine.java           | 12 ++++++------
 .../triggerEngine/TriggerProvider.java         |  8 ++++----
 .../TipeeeStream/TipeeeConnectionTest.java     |  4 ++--
 .../templateParser/CharacterStreamTest.java    |  4 ++--
 .../TemplateInterpreterTest.java               | 12 ++++++------
 .../templateParser/TemplateLexerTest.java      | 12 ++++++------
 .../templateParser/TemplateParserTest.java     |  6 +++---
 .../ifParser/IfInterpreterTest.java            |  8 ++++----
 .../templateParser/ifParser/IfParserTest.java  | 16 ++++++++--------
 99 files changed, 242 insertions(+), 247 deletions(-)
 rename bot/main/talium/{system => }/ASCIIProgressbar.java (99%)
 rename bot/main/talium/{system => }/GlobalExceptionHandler.java (95%)
 rename bot/main/talium/{system => }/Out.java (88%)
 rename bot/main/talium/{system => }/StopWatch.java (98%)
 rename bot/main/talium/{system => }/UnexpectedShutdownException.java (75%)
 rename bot/main/talium/{system => }/coinsWatchtime/WIPWatchtimeCommandServer.java (93%)
 rename bot/main/talium/{system => }/coinsWatchtime/WatchtimeController.java (91%)
 rename bot/main/talium/{system => }/coinsWatchtime/WatchtimeUpdateService.java (96%)
 rename bot/main/talium/{system => }/coinsWatchtime/chatter/Chatter.java (95%)
 rename bot/main/talium/{system => }/coinsWatchtime/chatter/ChatterDTO.java (89%)
 rename bot/main/talium/{system => }/coinsWatchtime/chatter/ChatterRepo.java (89%)
 rename bot/main/talium/{system => }/coinsWatchtime/chatter/ChatterService.java (96%)
 rename bot/main/talium/{system => }/coinsWatchtime/chatter/LeaderboardDTO.java (66%)
 rename bot/main/talium/{system => }/eventSystem/EventDispatcher.java (98%)
 rename bot/main/talium/{system => }/eventSystem/Subscriber.java (94%)
 rename bot/main/talium/{system => }/inputSystem/BotInput.java (72%)
 rename bot/main/talium/{system => }/inputSystem/HealthManager.java (97%)
 rename bot/main/talium/{system => }/inputSystem/HealthUi.java (85%)
 rename bot/main/talium/{system => }/inputSystem/InputStatus.java (91%)
 rename bot/main/talium/{system => }/security/HeaderAuthProcessingFilter.java (94%)
 rename bot/main/talium/{system => }/security/HeaderAuthenticationProvider.java (91%)
 rename bot/main/talium/{system => }/security/SecurityConfig.java (97%)
 rename bot/main/talium/{system => }/security/UserAuthenticationToken.java (94%)
 rename bot/main/talium/{system => }/security/auth/AuthController.java (96%)
 rename bot/main/talium/{system => }/security/auth/AuthService.java (94%)
 rename bot/main/talium/{system => }/security/auth/AuthenticationRejected.java (91%)
 rename bot/main/talium/{system => }/security/auth/SessionService.java (87%)
 rename bot/main/talium/{system => }/security/auth/persistence/PanelUser.java (93%)
 rename bot/main/talium/{system => }/security/auth/persistence/PanelUserDTO.java (60%)
 rename bot/main/talium/{system => }/security/auth/persistence/PanelUserRepo.java (73%)
 rename bot/main/talium/{system => }/security/auth/persistence/Session.java (92%)
 rename bot/main/talium/{system => }/stringTemplates/Formatter.java (96%)
 rename bot/main/talium/{system => }/stringTemplates/Template.java (95%)
 rename bot/main/talium/{system => }/stringTemplates/TemplateController.java (97%)
 rename bot/main/talium/{system => }/stringTemplates/TemplateDTO.java (98%)
 rename bot/main/talium/{system => }/stringTemplates/TemplateRepo.java (91%)
 rename bot/main/talium/{system => }/stringTemplates/TemplateService.java (93%)
 delete mode 100644 bot/main/talium/system/templateParser/statements/Statement.java
 delete mode 100644 bot/main/talium/system/twitchCommands/cooldown/CooldownType.java
 rename bot/main/talium/{system => }/templateParser/CharakterStream.java (94%)
 rename bot/main/talium/{system => }/templateParser/TemplateInterpreter.java (96%)
 rename bot/main/talium/{system => }/templateParser/TemplateLexer.java (91%)
 rename bot/main/talium/{system => }/templateParser/TemplateParser.java (91%)
 rename bot/main/talium/{system => }/templateParser/exeptions/FieldDoesNotExistException.java (90%)
 rename bot/main/talium/{system => }/templateParser/exeptions/FieldNotAccessibleException.java (87%)
 rename bot/main/talium/{system => }/templateParser/exeptions/ImpossibleComparisonException.java (80%)
 rename bot/main/talium/{system => }/templateParser/exeptions/InterpretationException.java (84%)
 rename bot/main/talium/{system => }/templateParser/exeptions/ParsingException.java (85%)
 rename bot/main/talium/{system => }/templateParser/exeptions/StringTemplateException.java (92%)
 rename bot/main/talium/{system => }/templateParser/exeptions/TemplateSyntaxException.java (93%)
 rename bot/main/talium/{system => }/templateParser/exeptions/UnIterableArgumentException.java (83%)
 rename bot/main/talium/{system => }/templateParser/exeptions/UnexpectedEndOfInputException.java (74%)
 rename bot/main/talium/{system => }/templateParser/exeptions/UnexpectedTokenException.java (92%)
 rename bot/main/talium/{system => }/templateParser/exeptions/UnsupportedComparisonOperator.java (81%)
 rename bot/main/talium/{system => }/templateParser/exeptions/UnsupportedDirective.java (75%)
 rename bot/main/talium/{system => }/templateParser/exeptions/VariableValueNullException.java (88%)
 rename bot/main/talium/{system => }/templateParser/ifParser/IfInterpreter.java (94%)
 rename bot/main/talium/{system => }/templateParser/ifParser/IfParser.java (92%)
 rename bot/main/talium/{system => }/templateParser/statements/Equals.java (90%)
 rename bot/main/talium/{system => }/templateParser/statements/IfStatement.java (58%)
 rename bot/main/talium/{system => }/templateParser/statements/LoopStatement.java (73%)
 create mode 100644 bot/main/talium/templateParser/statements/Statement.java
 rename bot/main/talium/{system => }/templateParser/statements/TextStatement.java (57%)
 rename bot/main/talium/{system => }/templateParser/statements/VarStatement.java (91%)
 rename bot/main/talium/{system => }/templateParser/tokens/Comparison.java (88%)
 rename bot/main/talium/{system => }/templateParser/tokens/IfToken.java (83%)
 rename bot/main/talium/{system => }/templateParser/tokens/IfTokenKind.java (84%)
 rename bot/main/talium/{system => }/templateParser/tokens/TemplateToken.java (96%)
 rename bot/main/talium/{system => }/templateParser/tokens/TemplateTokenKind.java (88%)
 rename bot/main/talium/{system => }/twitchCommands/controller/CommandController.java (94%)
 rename bot/main/talium/{system => }/twitchCommands/controller/MessagePatternDTO.java (77%)
 rename bot/main/talium/{system => }/twitchCommands/controller/TriggerDTO.java (68%)
 rename bot/main/talium/{system => }/twitchCommands/cooldown/ChatCooldown.java (93%)
 rename bot/main/talium/{system => }/twitchCommands/cooldown/CooldownService.java (99%)
 create mode 100644 bot/main/talium/twitchCommands/cooldown/CooldownType.java
 rename bot/main/talium/{system => }/twitchCommands/persistence/MessagePattern.java (92%)
 rename bot/main/talium/{system => }/twitchCommands/persistence/MessagePatternId.java (93%)
 rename bot/main/talium/{system => }/twitchCommands/persistence/MessagePatternRepo.java (88%)
 rename bot/main/talium/{system => }/twitchCommands/persistence/TriggerEntity.java (90%)
 rename bot/main/talium/{system => }/twitchCommands/persistence/TriggerRepo.java (96%)
 rename bot/main/talium/{system => }/twitchCommands/persistence/TriggerService.java (88%)
 rename bot/main/talium/{system => }/twitchCommands/triggerEngine/RuntimeTrigger.java (86%)
 rename bot/main/talium/{system => }/twitchCommands/triggerEngine/TriggerCallback.java (89%)
 rename bot/main/talium/{system => }/twitchCommands/triggerEngine/TriggerEngine.java (91%)
 rename bot/main/talium/{system => }/twitchCommands/triggerEngine/TriggerProvider.java (95%)
 rename bot/test/talium/{system => }/templateParser/CharacterStreamTest.java (92%)
 rename bot/test/talium/{system => }/templateParser/TemplateInterpreterTest.java (95%)
 rename bot/test/talium/{system => }/templateParser/TemplateLexerTest.java (92%)
 rename bot/test/talium/{system => }/templateParser/TemplateParserTest.java (97%)
 rename bot/test/talium/{system => }/templateParser/ifParser/IfInterpreterTest.java (98%)
 rename bot/test/talium/{system => }/templateParser/ifParser/IfParserTest.java (85%)

diff --git a/bot/main/talium/system/ASCIIProgressbar.java b/bot/main/talium/ASCIIProgressbar.java
similarity index 99%
rename from bot/main/talium/system/ASCIIProgressbar.java
rename to bot/main/talium/ASCIIProgressbar.java
index ce129910..e9bd5605 100644
--- a/bot/main/talium/system/ASCIIProgressbar.java
+++ b/bot/main/talium/ASCIIProgressbar.java
@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bot/main/talium/system/GlobalExceptionHandler.java b/bot/main/talium/GlobalExceptionHandler.java
similarity index 95%
rename from bot/main/talium/system/GlobalExceptionHandler.java
rename to bot/main/talium/GlobalExceptionHandler.java
index 620370b5..de453dcf 100644
--- a/bot/main/talium/system/GlobalExceptionHandler.java
+++ b/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.*;
diff --git a/bot/main/talium/system/Out.java b/bot/main/talium/Out.java
similarity index 88%
rename from bot/main/talium/system/Out.java
rename to bot/main/talium/Out.java
index d9fbdf6a..58f09a7e 100644
--- a/bot/main/talium/system/Out.java
+++ b/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.Twitch4J.TwitchAPINoop;
 import talium.Twitch4J.TwitchApi;
-import talium.system.stringTemplates.Template;
-import talium.system.stringTemplates.TemplateService;
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.TemplateParser;
-import talium.system.templateParser.statements.Statement;
+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 {
diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index 69b4bb08..c2806ca4 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -3,15 +3,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import talium.Twitch4J.TwitchUserPermission;
-import talium.system.inputSystem.HealthManager;
-import talium.system.stringTemplates.Template;
-import talium.system.stringTemplates.TemplateService;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
-import talium.system.twitchCommands.cooldown.CooldownType;
-import talium.system.twitchCommands.triggerEngine.RuntimeTrigger;
-import talium.system.twitchCommands.triggerEngine.TriggerCallback;
-import talium.system.twitchCommands.triggerEngine.TriggerEngine;
-import talium.system.twitchCommands.triggerEngine.TriggerProvider;
+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;
diff --git a/bot/main/talium/system/StopWatch.java b/bot/main/talium/StopWatch.java
similarity index 98%
rename from bot/main/talium/system/StopWatch.java
rename to bot/main/talium/StopWatch.java
index 86c266da..b627c225 100644
--- a/bot/main/talium/system/StopWatch.java
+++ b/bot/main/talium/StopWatch.java
@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/bot/main/talium/TipeeeStream/TipeeeEventHandler.java b/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
index 5aae9714..91342c32 100644
--- a/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
+++ b/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
@@ -1,6 +1,6 @@
 package talium.TipeeeStream;
 
-import talium.system.eventSystem.EventDispatcher;
+import talium.eventSystem.EventDispatcher;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/bot/main/talium/TipeeeStream/TipeeeInput.java b/bot/main/talium/TipeeeStream/TipeeeInput.java
index c3643960..6ccde536 100644
--- a/bot/main/talium/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/TipeeeStream/TipeeeInput.java
@@ -8,9 +8,9 @@
 import org.springframework.web.util.UriComponentsBuilder;
 import talium.Registrar;
 import talium.TwitchBot;
-import talium.system.inputSystem.BotInput;
-import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.InputStatus;
+import talium.inputSystem.BotInput;
+import talium.inputSystem.HealthManager;
+import talium.inputSystem.InputStatus;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
diff --git a/bot/main/talium/Twitch4J/ChatMessage.java b/bot/main/talium/Twitch4J/ChatMessage.java
index 205d093c..39f1eaf5 100644
--- a/bot/main/talium/Twitch4J/ChatMessage.java
+++ b/bot/main/talium/Twitch4J/ChatMessage.java
@@ -5,7 +5,7 @@
 import com.github.twitch4j.common.events.domain.EventUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import talium.system.twitchCommands.cooldown.CooldownService;
+import talium.twitchCommands.cooldown.CooldownService;
 
 import java.time.Instant;
 import java.util.HashSet;
diff --git a/bot/main/talium/Twitch4J/Twitch4JInput.java b/bot/main/talium/Twitch4J/Twitch4JInput.java
index 0656ede5..b3b4cfe2 100644
--- a/bot/main/talium/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/Twitch4J/Twitch4JInput.java
@@ -14,12 +14,12 @@
 import talium.oauthConnector.OAuthEndpoint;
 import talium.oauthConnector.OauthAccount;
 import talium.oauthConnector.OauthAccountRepo;
-import talium.system.Out;
-import talium.system.eventSystem.EventDispatcher;
-import talium.system.eventSystem.Subscriber;
-import talium.system.inputSystem.BotInput;
-import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.InputStatus;
+import talium.Out;
+import talium.eventSystem.EventDispatcher;
+import talium.eventSystem.Subscriber;
+import talium.inputSystem.BotInput;
+import talium.inputSystem.HealthManager;
+import talium.inputSystem.InputStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index 887a44e4..ff5f65fd 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -9,19 +9,18 @@
 import talium.Twitch4J.Twitch4JInput;
 import talium.Twitch4J.TwitchConfig;
 import talium.oauthConnector.OauthAccountRepo;
-import talium.system.StopWatch;
-import talium.system.coinsWatchtime.WIPWatchtimeCommandServer;
-import talium.system.coinsWatchtime.WatchtimeUpdateService;
-import talium.system.coinsWatchtime.chatter.ChatterService;
-import talium.system.inputSystem.BotInput;
-import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.InputStatus;
+import talium.coinsWatchtime.WIPWatchtimeCommandServer;
+import talium.coinsWatchtime.WatchtimeUpdateService;
+import talium.coinsWatchtime.chatter.ChatterService;
+import talium.inputSystem.BotInput;
+import talium.inputSystem.HealthManager;
+import talium.inputSystem.InputStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import talium.system.twitchCommands.triggerEngine.TriggerProvider;
+import talium.twitchCommands.triggerEngine.TriggerProvider;
 
 @SpringBootApplication
 @EnableJpaRepositories
diff --git a/bot/main/talium/system/UnexpectedShutdownException.java b/bot/main/talium/UnexpectedShutdownException.java
similarity index 75%
rename from bot/main/talium/system/UnexpectedShutdownException.java
rename to bot/main/talium/UnexpectedShutdownException.java
index 42139d4c..6e19e16e 100644
--- a/bot/main/talium/system/UnexpectedShutdownException.java
+++ b/bot/main/talium/UnexpectedShutdownException.java
@@ -1,4 +1,4 @@
-package talium.system;
+package talium;
 
 public class UnexpectedShutdownException extends RuntimeException {
 }
diff --git a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
similarity index 93%
rename from bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
rename to bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
index 3ce8ecd6..f3cdb718 100644
--- a/bot/main/talium/system/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -1,10 +1,10 @@
-package talium.system.coinsWatchtime;
+package talium.coinsWatchtime;
 
 import talium.Registrar;
 import talium.Twitch4J.ChatMessage;
-import talium.system.Out;
-import talium.system.coinsWatchtime.chatter.Chatter;
-import talium.system.coinsWatchtime.chatter.ChatterService;
+import talium.Out;
+import talium.coinsWatchtime.chatter.Chatter;
+import talium.coinsWatchtime.chatter.ChatterService;
 
 import java.util.HashMap;
 
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeController.java b/bot/main/talium/coinsWatchtime/WatchtimeController.java
similarity index 91%
rename from bot/main/talium/system/coinsWatchtime/WatchtimeController.java
rename to bot/main/talium/coinsWatchtime/WatchtimeController.java
index 654589ed..e49d1e77 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeController.java
+++ b/bot/main/talium/coinsWatchtime/WatchtimeController.java
@@ -1,4 +1,4 @@
-package talium.system.coinsWatchtime;
+package talium.coinsWatchtime;
 
 import com.github.twitch4j.helix.domain.User;
 import com.google.gson.Gson;
@@ -8,11 +8,11 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import talium.system.Out;
-import talium.system.coinsWatchtime.chatter.Chatter;
-import talium.system.coinsWatchtime.chatter.ChatterDTO;
-import talium.system.coinsWatchtime.chatter.ChatterService;
-import talium.system.coinsWatchtime.chatter.LeaderboardDTO;
+import talium.Out;
+import talium.coinsWatchtime.chatter.Chatter;
+import talium.coinsWatchtime.chatter.ChatterDTO;
+import talium.coinsWatchtime.chatter.ChatterService;
+import talium.coinsWatchtime.chatter.LeaderboardDTO;
 
 import java.util.ArrayList;
 import java.util.Map;
diff --git a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java b/bot/main/talium/coinsWatchtime/WatchtimeUpdateService.java
similarity index 96%
rename from bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
rename to bot/main/talium/coinsWatchtime/WatchtimeUpdateService.java
index eed5b64b..e6b5859f 100644
--- a/bot/main/talium/system/coinsWatchtime/WatchtimeUpdateService.java
+++ b/bot/main/talium/coinsWatchtime/WatchtimeUpdateService.java
@@ -1,11 +1,11 @@
-package talium.system.coinsWatchtime;
+package talium.coinsWatchtime;
 
 import com.github.twitch4j.helix.domain.Chatter;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import talium.system.Out;
-import talium.system.coinsWatchtime.chatter.ChatterService;
+import talium.Out;
+import talium.coinsWatchtime.chatter.ChatterService;
 
 import java.util.List;
 import java.util.concurrent.Executors;
diff --git a/bot/main/talium/system/coinsWatchtime/chatter/Chatter.java b/bot/main/talium/coinsWatchtime/chatter/Chatter.java
similarity index 95%
rename from bot/main/talium/system/coinsWatchtime/chatter/Chatter.java
rename to bot/main/talium/coinsWatchtime/chatter/Chatter.java
index ac6f11ba..128332ae 100644
--- a/bot/main/talium/system/coinsWatchtime/chatter/Chatter.java
+++ b/bot/main/talium/coinsWatchtime/chatter/Chatter.java
@@ -1,4 +1,4 @@
-package talium.system.coinsWatchtime.chatter;
+package talium.coinsWatchtime.chatter;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
diff --git a/bot/main/talium/system/coinsWatchtime/chatter/ChatterDTO.java b/bot/main/talium/coinsWatchtime/chatter/ChatterDTO.java
similarity index 89%
rename from bot/main/talium/system/coinsWatchtime/chatter/ChatterDTO.java
rename to bot/main/talium/coinsWatchtime/chatter/ChatterDTO.java
index 5cbc7ade..68ac7190 100644
--- a/bot/main/talium/system/coinsWatchtime/chatter/ChatterDTO.java
+++ b/bot/main/talium/coinsWatchtime/chatter/ChatterDTO.java
@@ -1,4 +1,4 @@
-package talium.system.coinsWatchtime.chatter;
+package talium.coinsWatchtime.chatter;
 
 public record ChatterDTO(String twitchUserId, long watchtimeSeconds, long coins) {
 
diff --git a/bot/main/talium/system/coinsWatchtime/chatter/ChatterRepo.java b/bot/main/talium/coinsWatchtime/chatter/ChatterRepo.java
similarity index 89%
rename from bot/main/talium/system/coinsWatchtime/chatter/ChatterRepo.java
rename to bot/main/talium/coinsWatchtime/chatter/ChatterRepo.java
index 380b905b..ddaae356 100644
--- a/bot/main/talium/system/coinsWatchtime/chatter/ChatterRepo.java
+++ b/bot/main/talium/coinsWatchtime/chatter/ChatterRepo.java
@@ -1,4 +1,4 @@
-package talium.system.coinsWatchtime.chatter;
+package talium.coinsWatchtime.chatter;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
diff --git a/bot/main/talium/system/coinsWatchtime/chatter/ChatterService.java b/bot/main/talium/coinsWatchtime/chatter/ChatterService.java
similarity index 96%
rename from bot/main/talium/system/coinsWatchtime/chatter/ChatterService.java
rename to bot/main/talium/coinsWatchtime/chatter/ChatterService.java
index 3be41b16..f7022782 100644
--- a/bot/main/talium/system/coinsWatchtime/chatter/ChatterService.java
+++ b/bot/main/talium/coinsWatchtime/chatter/ChatterService.java
@@ -1,4 +1,4 @@
-package talium.system.coinsWatchtime.chatter;
+package talium.coinsWatchtime.chatter;
 
 import org.springframework.stereotype.Service;
 
diff --git a/bot/main/talium/system/coinsWatchtime/chatter/LeaderboardDTO.java b/bot/main/talium/coinsWatchtime/chatter/LeaderboardDTO.java
similarity index 66%
rename from bot/main/talium/system/coinsWatchtime/chatter/LeaderboardDTO.java
rename to bot/main/talium/coinsWatchtime/chatter/LeaderboardDTO.java
index 4f48a630..add76a3c 100644
--- a/bot/main/talium/system/coinsWatchtime/chatter/LeaderboardDTO.java
+++ b/bot/main/talium/coinsWatchtime/chatter/LeaderboardDTO.java
@@ -1,3 +1,3 @@
-package talium.system.coinsWatchtime.chatter;
+package talium.coinsWatchtime.chatter;
 
 public record LeaderboardDTO(String twitchUserName, long watchtimeSeconds, long coins) {}
diff --git a/bot/main/talium/system/eventSystem/EventDispatcher.java b/bot/main/talium/eventSystem/EventDispatcher.java
similarity index 98%
rename from bot/main/talium/system/eventSystem/EventDispatcher.java
rename to bot/main/talium/eventSystem/EventDispatcher.java
index 492273d4..a3c3c69d 100644
--- a/bot/main/talium/system/eventSystem/EventDispatcher.java
+++ b/bot/main/talium/eventSystem/EventDispatcher.java
@@ -1,4 +1,4 @@
-package talium.system.eventSystem;
+package talium.eventSystem;
 
 import org.reflections.Reflections;
 import org.reflections.scanners.Scanners;
diff --git a/bot/main/talium/system/eventSystem/Subscriber.java b/bot/main/talium/eventSystem/Subscriber.java
similarity index 94%
rename from bot/main/talium/system/eventSystem/Subscriber.java
rename to bot/main/talium/eventSystem/Subscriber.java
index be4a0919..b0754df5 100644
--- a/bot/main/talium/system/eventSystem/Subscriber.java
+++ b/bot/main/talium/eventSystem/Subscriber.java
@@ -1,4 +1,4 @@
-package talium.system.eventSystem;
+package talium.eventSystem;
 
 import java.lang.annotation.*;
 
diff --git a/bot/main/talium/system/inputSystem/BotInput.java b/bot/main/talium/inputSystem/BotInput.java
similarity index 72%
rename from bot/main/talium/system/inputSystem/BotInput.java
rename to bot/main/talium/inputSystem/BotInput.java
index 55f17c98..1aa699ac 100644
--- a/bot/main/talium/system/inputSystem/BotInput.java
+++ b/bot/main/talium/inputSystem/BotInput.java
@@ -1,4 +1,4 @@
-package talium.system.inputSystem;
+package talium.inputSystem;
 
 public interface BotInput {
     void startup() throws Exception;
diff --git a/bot/main/talium/system/inputSystem/HealthManager.java b/bot/main/talium/inputSystem/HealthManager.java
similarity index 97%
rename from bot/main/talium/system/inputSystem/HealthManager.java
rename to bot/main/talium/inputSystem/HealthManager.java
index 95c195c2..ac546bb2 100644
--- a/bot/main/talium/system/inputSystem/HealthManager.java
+++ b/bot/main/talium/inputSystem/HealthManager.java
@@ -1,4 +1,4 @@
-package talium.system.inputSystem;
+package talium.inputSystem;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Consumer;
 
 public class HealthManager {
 
diff --git a/bot/main/talium/system/inputSystem/HealthUi.java b/bot/main/talium/inputSystem/HealthUi.java
similarity index 85%
rename from bot/main/talium/system/inputSystem/HealthUi.java
rename to bot/main/talium/inputSystem/HealthUi.java
index 16caa725..f4bba063 100644
--- a/bot/main/talium/system/inputSystem/HealthUi.java
+++ b/bot/main/talium/inputSystem/HealthUi.java
@@ -1,8 +1,7 @@
-package talium.system.inputSystem;
+package talium.inputSystem;
 
 import com.google.gson.Gson;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
diff --git a/bot/main/talium/system/inputSystem/InputStatus.java b/bot/main/talium/inputSystem/InputStatus.java
similarity index 91%
rename from bot/main/talium/system/inputSystem/InputStatus.java
rename to bot/main/talium/inputSystem/InputStatus.java
index 4f1c3661..78c4a32d 100644
--- a/bot/main/talium/system/inputSystem/InputStatus.java
+++ b/bot/main/talium/inputSystem/InputStatus.java
@@ -1,4 +1,4 @@
-package talium.system.inputSystem;
+package talium.inputSystem;
 
 /**
  * Used to Indicates the state of an Input <br/>
diff --git a/bot/main/talium/oauthConnector/OAuthEndpoint.java b/bot/main/talium/oauthConnector/OAuthEndpoint.java
index 31ff0647..9f4ab5b1 100644
--- a/bot/main/talium/oauthConnector/OAuthEndpoint.java
+++ b/bot/main/talium/oauthConnector/OAuthEndpoint.java
@@ -6,7 +6,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import talium.TwitchBot;
-import talium.system.UnexpectedShutdownException;
+import talium.UnexpectedShutdownException;
 import org.apache.commons.lang.RandomStringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/bot/main/talium/system/security/HeaderAuthProcessingFilter.java b/bot/main/talium/security/HeaderAuthProcessingFilter.java
similarity index 94%
rename from bot/main/talium/system/security/HeaderAuthProcessingFilter.java
rename to bot/main/talium/security/HeaderAuthProcessingFilter.java
index 8e3dc330..5b19bd81 100644
--- a/bot/main/talium/system/security/HeaderAuthProcessingFilter.java
+++ b/bot/main/talium/security/HeaderAuthProcessingFilter.java
@@ -1,11 +1,11 @@
-package talium.system.security;
+package talium.security;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import talium.system.security.auth.AuthService;
-import talium.system.security.auth.AuthenticationRejected;
+import talium.security.auth.AuthService;
+import talium.security.auth.AuthenticationRejected;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
diff --git a/bot/main/talium/system/security/HeaderAuthenticationProvider.java b/bot/main/talium/security/HeaderAuthenticationProvider.java
similarity index 91%
rename from bot/main/talium/system/security/HeaderAuthenticationProvider.java
rename to bot/main/talium/security/HeaderAuthenticationProvider.java
index 4bccdbe1..55ae2456 100644
--- a/bot/main/talium/system/security/HeaderAuthenticationProvider.java
+++ b/bot/main/talium/security/HeaderAuthenticationProvider.java
@@ -1,14 +1,14 @@
-package talium.system.security;
+package talium.security;
 
 import org.springframework.http.HttpStatus;
-import talium.system.security.auth.AuthService;
+import talium.security.auth.AuthService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.stereotype.Service;
-import talium.system.security.auth.AuthenticationRejected;
+import talium.security.auth.AuthenticationRejected;
 
 @Service
 public class HeaderAuthenticationProvider implements AuthenticationProvider {
diff --git a/bot/main/talium/system/security/SecurityConfig.java b/bot/main/talium/security/SecurityConfig.java
similarity index 97%
rename from bot/main/talium/system/security/SecurityConfig.java
rename to bot/main/talium/security/SecurityConfig.java
index da922be3..56d388f9 100644
--- a/bot/main/talium/system/security/SecurityConfig.java
+++ b/bot/main/talium/security/SecurityConfig.java
@@ -1,4 +1,4 @@
-package talium.system.security;
+package talium.security;
 
 import jakarta.servlet.DispatcherType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,7 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import talium.system.security.auth.AuthService;
+import talium.security.auth.AuthService;
 
 import java.util.Collections;
 
diff --git a/bot/main/talium/system/security/UserAuthenticationToken.java b/bot/main/talium/security/UserAuthenticationToken.java
similarity index 94%
rename from bot/main/talium/system/security/UserAuthenticationToken.java
rename to bot/main/talium/security/UserAuthenticationToken.java
index 9e7a7324..a7c65e6e 100644
--- a/bot/main/talium/system/security/UserAuthenticationToken.java
+++ b/bot/main/talium/security/UserAuthenticationToken.java
@@ -1,6 +1,6 @@
-package talium.system.security;
+package talium.security;
 
-import talium.system.security.auth.persistence.PanelUser;
+import talium.security.auth.persistence.PanelUser;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
diff --git a/bot/main/talium/system/security/auth/AuthController.java b/bot/main/talium/security/auth/AuthController.java
similarity index 96%
rename from bot/main/talium/system/security/auth/AuthController.java
rename to bot/main/talium/security/auth/AuthController.java
index a028f7fd..d923efee 100644
--- a/bot/main/talium/system/security/auth/AuthController.java
+++ b/bot/main/talium/security/auth/AuthController.java
@@ -1,9 +1,9 @@
-package talium.system.security.auth;
+package talium.security.auth;
 
 import com.google.gson.Gson;
 import org.springframework.http.ResponseEntity;
-import talium.system.Out;
-import talium.system.security.auth.persistence.*;
+import talium.Out;
+import talium.security.auth.persistence.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
diff --git a/bot/main/talium/system/security/auth/AuthService.java b/bot/main/talium/security/auth/AuthService.java
similarity index 94%
rename from bot/main/talium/system/security/auth/AuthService.java
rename to bot/main/talium/security/auth/AuthService.java
index 8a01a1a8..93f6a130 100644
--- a/bot/main/talium/system/security/auth/AuthService.java
+++ b/bot/main/talium/security/auth/AuthService.java
@@ -1,13 +1,13 @@
-package talium.system.security.auth;
+package talium.security.auth;
 
 import kotlin.Pair;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import talium.system.security.auth.persistence.PanelUser;
-import talium.system.security.auth.persistence.PanelUserRepo;
-import talium.system.security.auth.persistence.Session;
+import talium.security.auth.persistence.PanelUser;
+import talium.security.auth.persistence.PanelUserRepo;
+import talium.security.auth.persistence.Session;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,7 +21,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import static talium.system.security.auth.SessionService.*;
+import static talium.security.auth.SessionService.*;
 
 @Service
 public class AuthService {
diff --git a/bot/main/talium/system/security/auth/AuthenticationRejected.java b/bot/main/talium/security/auth/AuthenticationRejected.java
similarity index 91%
rename from bot/main/talium/system/security/auth/AuthenticationRejected.java
rename to bot/main/talium/security/auth/AuthenticationRejected.java
index 02c222b6..c7743151 100644
--- a/bot/main/talium/system/security/auth/AuthenticationRejected.java
+++ b/bot/main/talium/security/auth/AuthenticationRejected.java
@@ -1,4 +1,4 @@
-package talium.system.security.auth;
+package talium.security.auth;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.AuthenticationException;
diff --git a/bot/main/talium/system/security/auth/SessionService.java b/bot/main/talium/security/auth/SessionService.java
similarity index 87%
rename from bot/main/talium/system/security/auth/SessionService.java
rename to bot/main/talium/security/auth/SessionService.java
index 50036c65..c738fd37 100644
--- a/bot/main/talium/system/security/auth/SessionService.java
+++ b/bot/main/talium/security/auth/SessionService.java
@@ -1,7 +1,7 @@
-package talium.system.security.auth;
+package talium.security.auth;
 
-import talium.system.security.auth.persistence.PanelUser;
-import talium.system.security.auth.persistence.Session;
+import talium.security.auth.persistence.PanelUser;
+import talium.security.auth.persistence.Session;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bot/main/talium/system/security/auth/persistence/PanelUser.java b/bot/main/talium/security/auth/persistence/PanelUser.java
similarity index 93%
rename from bot/main/talium/system/security/auth/persistence/PanelUser.java
rename to bot/main/talium/security/auth/persistence/PanelUser.java
index 59fd3e78..32301b95 100644
--- a/bot/main/talium/system/security/auth/persistence/PanelUser.java
+++ b/bot/main/talium/security/auth/persistence/PanelUser.java
@@ -1,4 +1,4 @@
-package talium.system.security.auth.persistence;
+package talium.security.auth.persistence;
 
 import jakarta.persistence.*;
 
diff --git a/bot/main/talium/system/security/auth/persistence/PanelUserDTO.java b/bot/main/talium/security/auth/persistence/PanelUserDTO.java
similarity index 60%
rename from bot/main/talium/system/security/auth/persistence/PanelUserDTO.java
rename to bot/main/talium/security/auth/persistence/PanelUserDTO.java
index 65f11871..e5cc9274 100644
--- a/bot/main/talium/system/security/auth/persistence/PanelUserDTO.java
+++ b/bot/main/talium/security/auth/persistence/PanelUserDTO.java
@@ -1,6 +1,4 @@
-package talium.system.security.auth.persistence;
-
-import java.time.Instant;
+package talium.security.auth.persistence;
 
 public record PanelUserDTO(
         String username,
diff --git a/bot/main/talium/system/security/auth/persistence/PanelUserRepo.java b/bot/main/talium/security/auth/persistence/PanelUserRepo.java
similarity index 73%
rename from bot/main/talium/system/security/auth/persistence/PanelUserRepo.java
rename to bot/main/talium/security/auth/persistence/PanelUserRepo.java
index ed346f69..951e9838 100644
--- a/bot/main/talium/system/security/auth/persistence/PanelUserRepo.java
+++ b/bot/main/talium/security/auth/persistence/PanelUserRepo.java
@@ -1,4 +1,4 @@
-package talium.system.security.auth.persistence;
+package talium.security.auth.persistence;
 
 import org.springframework.data.repository.CrudRepository;
 
diff --git a/bot/main/talium/system/security/auth/persistence/Session.java b/bot/main/talium/security/auth/persistence/Session.java
similarity index 92%
rename from bot/main/talium/system/security/auth/persistence/Session.java
rename to bot/main/talium/security/auth/persistence/Session.java
index a3aa144d..530abb56 100644
--- a/bot/main/talium/system/security/auth/persistence/Session.java
+++ b/bot/main/talium/security/auth/persistence/Session.java
@@ -1,4 +1,4 @@
-package talium.system.security.auth.persistence;
+package talium.security.auth.persistence;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/bot/main/talium/system/stringTemplates/Formatter.java b/bot/main/talium/stringTemplates/Formatter.java
similarity index 96%
rename from bot/main/talium/system/stringTemplates/Formatter.java
rename to bot/main/talium/stringTemplates/Formatter.java
index ec8250d4..948cd2ca 100644
--- a/bot/main/talium/system/stringTemplates/Formatter.java
+++ b/bot/main/talium/stringTemplates/Formatter.java
@@ -1,4 +1,4 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 /**
  * Provides basic Formatting functions, manly to be used in Template Contexts
diff --git a/bot/main/talium/system/stringTemplates/Template.java b/bot/main/talium/stringTemplates/Template.java
similarity index 95%
rename from bot/main/talium/system/stringTemplates/Template.java
rename to bot/main/talium/stringTemplates/Template.java
index 1162ae1a..9c43910b 100644
--- a/bot/main/talium/system/stringTemplates/Template.java
+++ b/bot/main/talium/stringTemplates/Template.java
@@ -1,4 +1,4 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 import jakarta.persistence.*;
 import org.jetbrains.annotations.Nullable;
diff --git a/bot/main/talium/system/stringTemplates/TemplateController.java b/bot/main/talium/stringTemplates/TemplateController.java
similarity index 97%
rename from bot/main/talium/system/stringTemplates/TemplateController.java
rename to bot/main/talium/stringTemplates/TemplateController.java
index 0df39524..dd40b0f7 100644
--- a/bot/main/talium/system/stringTemplates/TemplateController.java
+++ b/bot/main/talium/stringTemplates/TemplateController.java
@@ -1,4 +1,4 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/bot/main/talium/system/stringTemplates/TemplateDTO.java b/bot/main/talium/stringTemplates/TemplateDTO.java
similarity index 98%
rename from bot/main/talium/system/stringTemplates/TemplateDTO.java
rename to bot/main/talium/stringTemplates/TemplateDTO.java
index fe6b52e7..34353761 100644
--- a/bot/main/talium/system/stringTemplates/TemplateDTO.java
+++ b/bot/main/talium/stringTemplates/TemplateDTO.java
@@ -1,4 +1,4 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
diff --git a/bot/main/talium/system/stringTemplates/TemplateRepo.java b/bot/main/talium/stringTemplates/TemplateRepo.java
similarity index 91%
rename from bot/main/talium/system/stringTemplates/TemplateRepo.java
rename to bot/main/talium/stringTemplates/TemplateRepo.java
index cb0eacc2..f76434c9 100644
--- a/bot/main/talium/system/stringTemplates/TemplateRepo.java
+++ b/bot/main/talium/stringTemplates/TemplateRepo.java
@@ -1,4 +1,4 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.ListCrudRepository;
diff --git a/bot/main/talium/system/stringTemplates/TemplateService.java b/bot/main/talium/stringTemplates/TemplateService.java
similarity index 93%
rename from bot/main/talium/system/stringTemplates/TemplateService.java
rename to bot/main/talium/stringTemplates/TemplateService.java
index 6cc58855..f1f604e8 100644
--- a/bot/main/talium/system/stringTemplates/TemplateService.java
+++ b/bot/main/talium/stringTemplates/TemplateService.java
@@ -1,8 +1,8 @@
-package talium.system.stringTemplates;
+package talium.stringTemplates;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import talium.system.twitchCommands.persistence.TriggerRepo;
+import talium.twitchCommands.persistence.TriggerRepo;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/bot/main/talium/system/templateParser/statements/Statement.java b/bot/main/talium/system/templateParser/statements/Statement.java
deleted file mode 100644
index ba5ab730..00000000
--- a/bot/main/talium/system/templateParser/statements/Statement.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package talium.system.templateParser.statements;
-
-public interface Statement {}
-
diff --git a/bot/main/talium/system/twitchCommands/cooldown/CooldownType.java b/bot/main/talium/system/twitchCommands/cooldown/CooldownType.java
deleted file mode 100644
index f02733f1..00000000
--- a/bot/main/talium/system/twitchCommands/cooldown/CooldownType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package talium.system.twitchCommands.cooldown;
-
-/**
- * A Unit of a Cooldown, used in {@link talium.system.twitchCommands.cooldown.ChatCooldown} to build a value with a unit
- */
-public enum CooldownType {
-    SECONDS,
-    MESSAGES
-}
diff --git a/bot/main/talium/system/templateParser/CharakterStream.java b/bot/main/talium/templateParser/CharakterStream.java
similarity index 94%
rename from bot/main/talium/system/templateParser/CharakterStream.java
rename to bot/main/talium/templateParser/CharakterStream.java
index 8682ac33..2a55b855 100644
--- a/bot/main/talium/system/templateParser/CharakterStream.java
+++ b/bot/main/talium/templateParser/CharakterStream.java
@@ -1,7 +1,7 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnexpectedTokenException;
+import talium.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.templateParser.exeptions.UnexpectedTokenException;
 
 /**
  * An indexed Stream of characters for parsing.
diff --git a/bot/main/talium/system/templateParser/TemplateInterpreter.java b/bot/main/talium/templateParser/TemplateInterpreter.java
similarity index 96%
rename from bot/main/talium/system/templateParser/TemplateInterpreter.java
rename to bot/main/talium/templateParser/TemplateInterpreter.java
index d01ccc05..813749c4 100644
--- a/bot/main/talium/system/templateParser/TemplateInterpreter.java
+++ b/bot/main/talium/templateParser/TemplateInterpreter.java
@@ -1,9 +1,9 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.ifParser.IfInterpreter;
-import talium.system.templateParser.statements.*;
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.ifParser.IfInterpreter;
+import talium.templateParser.statements.*;
+import talium.templateParser.tokens.Comparison;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InaccessibleObjectException;
diff --git a/bot/main/talium/system/templateParser/TemplateLexer.java b/bot/main/talium/templateParser/TemplateLexer.java
similarity index 91%
rename from bot/main/talium/system/templateParser/TemplateLexer.java
rename to bot/main/talium/templateParser/TemplateLexer.java
index b220767d..2f307d86 100644
--- a/bot/main/talium/system/templateParser/TemplateLexer.java
+++ b/bot/main/talium/templateParser/TemplateLexer.java
@@ -1,10 +1,10 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
 import org.springframework.lang.NonNull;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnexpectedTokenException;
-import talium.system.templateParser.exeptions.UnsupportedDirective;
-import talium.system.templateParser.tokens.TemplateToken;
+import talium.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.templateParser.exeptions.UnexpectedTokenException;
+import talium.templateParser.exeptions.UnsupportedDirective;
+import talium.templateParser.tokens.TemplateToken;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bot/main/talium/system/templateParser/TemplateParser.java b/bot/main/talium/templateParser/TemplateParser.java
similarity index 91%
rename from bot/main/talium/system/templateParser/TemplateParser.java
rename to bot/main/talium/templateParser/TemplateParser.java
index c5910f65..666e3c2e 100644
--- a/bot/main/talium/system/templateParser/TemplateParser.java
+++ b/bot/main/talium/templateParser/TemplateParser.java
@@ -1,12 +1,12 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
 import org.springframework.lang.NonNull;
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.ifParser.IfParser;
-import talium.system.templateParser.statements.*;
-import talium.system.templateParser.tokens.Comparison;
-import talium.system.templateParser.tokens.TemplateTokenKind;
-import talium.system.templateParser.tokens.TemplateToken;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.ifParser.IfParser;
+import talium.templateParser.statements.*;
+import talium.templateParser.tokens.Comparison;
+import talium.templateParser.tokens.TemplateTokenKind;
+import talium.templateParser.tokens.TemplateToken;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java b/bot/main/talium/templateParser/exeptions/FieldDoesNotExistException.java
similarity index 90%
rename from bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
rename to bot/main/talium/templateParser/exeptions/FieldDoesNotExistException.java
index 9db8acaa..a8213848 100644
--- a/bot/main/talium/system/templateParser/exeptions/FieldDoesNotExistException.java
+++ b/bot/main/talium/templateParser/exeptions/FieldDoesNotExistException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 import java.util.Arrays;
 import java.util.Set;
diff --git a/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java b/bot/main/talium/templateParser/exeptions/FieldNotAccessibleException.java
similarity index 87%
rename from bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
rename to bot/main/talium/templateParser/exeptions/FieldNotAccessibleException.java
index 1caee082..9e2eed7e 100644
--- a/bot/main/talium/system/templateParser/exeptions/FieldNotAccessibleException.java
+++ b/bot/main/talium/templateParser/exeptions/FieldNotAccessibleException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class FieldNotAccessibleException extends InterpretationException {
     public FieldNotAccessibleException(String fieldName, Class<?> onClass, Throwable cause) {
diff --git a/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java b/bot/main/talium/templateParser/exeptions/ImpossibleComparisonException.java
similarity index 80%
rename from bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
rename to bot/main/talium/templateParser/exeptions/ImpossibleComparisonException.java
index 9306c947..4330cb46 100644
--- a/bot/main/talium/system/templateParser/exeptions/ImpossibleComparisonException.java
+++ b/bot/main/talium/templateParser/exeptions/ImpossibleComparisonException.java
@@ -1,6 +1,6 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
-import talium.system.templateParser.statements.Equals;
+import talium.templateParser.statements.Equals;
 
 public class ImpossibleComparisonException extends InterpretationException {
     public ImpossibleComparisonException(Object comparandA, Object comparandB, Equals operator) {
diff --git a/bot/main/talium/system/templateParser/exeptions/InterpretationException.java b/bot/main/talium/templateParser/exeptions/InterpretationException.java
similarity index 84%
rename from bot/main/talium/system/templateParser/exeptions/InterpretationException.java
rename to bot/main/talium/templateParser/exeptions/InterpretationException.java
index 4c8b09c9..f443f9bb 100644
--- a/bot/main/talium/system/templateParser/exeptions/InterpretationException.java
+++ b/bot/main/talium/templateParser/exeptions/InterpretationException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class InterpretationException extends StringTemplateException {
     public InterpretationException(String message) {
diff --git a/bot/main/talium/system/templateParser/exeptions/ParsingException.java b/bot/main/talium/templateParser/exeptions/ParsingException.java
similarity index 85%
rename from bot/main/talium/system/templateParser/exeptions/ParsingException.java
rename to bot/main/talium/templateParser/exeptions/ParsingException.java
index 48e71148..b82d482c 100644
--- a/bot/main/talium/system/templateParser/exeptions/ParsingException.java
+++ b/bot/main/talium/templateParser/exeptions/ParsingException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class ParsingException extends StringTemplateException {
     public ParsingException(String message) {
diff --git a/bot/main/talium/system/templateParser/exeptions/StringTemplateException.java b/bot/main/talium/templateParser/exeptions/StringTemplateException.java
similarity index 92%
rename from bot/main/talium/system/templateParser/exeptions/StringTemplateException.java
rename to bot/main/talium/templateParser/exeptions/StringTemplateException.java
index c72fcf85..4cca9906 100644
--- a/bot/main/talium/system/templateParser/exeptions/StringTemplateException.java
+++ b/bot/main/talium/templateParser/exeptions/StringTemplateException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class StringTemplateException extends Exception {
     public StringTemplateException(String message) {
diff --git a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java b/bot/main/talium/templateParser/exeptions/TemplateSyntaxException.java
similarity index 93%
rename from bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
rename to bot/main/talium/templateParser/exeptions/TemplateSyntaxException.java
index 49d535ee..0b7182df 100644
--- a/bot/main/talium/system/templateParser/exeptions/TemplateSyntaxException.java
+++ b/bot/main/talium/templateParser/exeptions/TemplateSyntaxException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class TemplateSyntaxException extends ParsingException {
     public TemplateSyntaxException(String expected, String actual, int atIndex, String source) {
diff --git a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java b/bot/main/talium/templateParser/exeptions/UnIterableArgumentException.java
similarity index 83%
rename from bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
rename to bot/main/talium/templateParser/exeptions/UnIterableArgumentException.java
index 95c2eb16..75971259 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnIterableArgumentException.java
+++ b/bot/main/talium/templateParser/exeptions/UnIterableArgumentException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class UnIterableArgumentException extends InterpretationException {
     public UnIterableArgumentException(String argName) {
diff --git a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java b/bot/main/talium/templateParser/exeptions/UnexpectedEndOfInputException.java
similarity index 74%
rename from bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
rename to bot/main/talium/templateParser/exeptions/UnexpectedEndOfInputException.java
index 24f7c708..2297e184 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnexpectedEndOfInputException.java
+++ b/bot/main/talium/templateParser/exeptions/UnexpectedEndOfInputException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 
 public class UnexpectedEndOfInputException extends ParsingException {
diff --git a/bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java b/bot/main/talium/templateParser/exeptions/UnexpectedTokenException.java
similarity index 92%
rename from bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java
rename to bot/main/talium/templateParser/exeptions/UnexpectedTokenException.java
index f276da5a..82e9bc6d 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnexpectedTokenException.java
+++ b/bot/main/talium/templateParser/exeptions/UnexpectedTokenException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class UnexpectedTokenException extends TemplateSyntaxException {
     public UnexpectedTokenException(String expected, String actual, int atIndex, String source) {
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java b/bot/main/talium/templateParser/exeptions/UnsupportedComparisonOperator.java
similarity index 81%
rename from bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java
rename to bot/main/talium/templateParser/exeptions/UnsupportedComparisonOperator.java
index 313548a1..817f41ab 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedComparisonOperator.java
+++ b/bot/main/talium/templateParser/exeptions/UnsupportedComparisonOperator.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 /**
  * Comparison Operator (==, >, >=, ...) not supported
diff --git a/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java b/bot/main/talium/templateParser/exeptions/UnsupportedDirective.java
similarity index 75%
rename from bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
rename to bot/main/talium/templateParser/exeptions/UnsupportedDirective.java
index 4b1f5bc6..376791ed 100644
--- a/bot/main/talium/system/templateParser/exeptions/UnsupportedDirective.java
+++ b/bot/main/talium/templateParser/exeptions/UnsupportedDirective.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 public class UnsupportedDirective extends ParsingException {
     public UnsupportedDirective(String message) {
diff --git a/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java b/bot/main/talium/templateParser/exeptions/VariableValueNullException.java
similarity index 88%
rename from bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
rename to bot/main/talium/templateParser/exeptions/VariableValueNullException.java
index 2deb8325..981ccd2d 100644
--- a/bot/main/talium/system/templateParser/exeptions/VariableValueNullException.java
+++ b/bot/main/talium/templateParser/exeptions/VariableValueNullException.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.exeptions;
+package talium.templateParser.exeptions;
 
 /// Is thrown when a variable in a variable reference is null, but is not the final reference (field on this object are supposed to be 'opened')
 public class VariableValueNullException extends InterpretationException {
diff --git a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java b/bot/main/talium/templateParser/ifParser/IfInterpreter.java
similarity index 94%
rename from bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
rename to bot/main/talium/templateParser/ifParser/IfInterpreter.java
index 8cf11f76..29fe2334 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfInterpreter.java
+++ b/bot/main/talium/templateParser/ifParser/IfInterpreter.java
@@ -1,8 +1,8 @@
-package talium.system.templateParser.ifParser;
+package talium.templateParser.ifParser;
 
-import talium.system.templateParser.exeptions.ImpossibleComparisonException;
-import talium.system.templateParser.statements.Equals;
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.exeptions.ImpossibleComparisonException;
+import talium.templateParser.statements.Equals;
+import talium.templateParser.tokens.Comparison;
 
 import java.util.Objects;
 
diff --git a/bot/main/talium/system/templateParser/ifParser/IfParser.java b/bot/main/talium/templateParser/ifParser/IfParser.java
similarity index 92%
rename from bot/main/talium/system/templateParser/ifParser/IfParser.java
rename to bot/main/talium/templateParser/ifParser/IfParser.java
index 04e64719..82dfef31 100644
--- a/bot/main/talium/system/templateParser/ifParser/IfParser.java
+++ b/bot/main/talium/templateParser/ifParser/IfParser.java
@@ -1,13 +1,13 @@
-package talium.system.templateParser.ifParser;
+package talium.templateParser.ifParser;
 
 import org.springframework.lang.NonNull;
-import talium.system.templateParser.CharakterStream;
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.statements.Equals;
-import talium.system.templateParser.statements.VarStatement;
-import talium.system.templateParser.tokens.Comparison;
-import talium.system.templateParser.tokens.IfTokenKind;
-import talium.system.templateParser.tokens.IfToken;
+import talium.templateParser.CharakterStream;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.statements.Equals;
+import talium.templateParser.statements.VarStatement;
+import talium.templateParser.tokens.Comparison;
+import talium.templateParser.tokens.IfTokenKind;
+import talium.templateParser.tokens.IfToken;
 
 /**
  * Takes a String of an If Statements Head, and parses it into an If Statement Object.
diff --git a/bot/main/talium/system/templateParser/statements/Equals.java b/bot/main/talium/templateParser/statements/Equals.java
similarity index 90%
rename from bot/main/talium/system/templateParser/statements/Equals.java
rename to bot/main/talium/templateParser/statements/Equals.java
index d737b7d9..068422a4 100644
--- a/bot/main/talium/system/templateParser/statements/Equals.java
+++ b/bot/main/talium/templateParser/statements/Equals.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.statements;
+package talium.templateParser.statements;
 
 public enum Equals {
     EQUALS,
diff --git a/bot/main/talium/system/templateParser/statements/IfStatement.java b/bot/main/talium/templateParser/statements/IfStatement.java
similarity index 58%
rename from bot/main/talium/system/templateParser/statements/IfStatement.java
rename to bot/main/talium/templateParser/statements/IfStatement.java
index 32e95261..d3f5f81a 100644
--- a/bot/main/talium/system/templateParser/statements/IfStatement.java
+++ b/bot/main/talium/templateParser/statements/IfStatement.java
@@ -1,6 +1,6 @@
-package talium.system.templateParser.statements;
+package talium.templateParser.statements;
 
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.tokens.Comparison;
 
 import java.util.List;
 
diff --git a/bot/main/talium/system/templateParser/statements/LoopStatement.java b/bot/main/talium/templateParser/statements/LoopStatement.java
similarity index 73%
rename from bot/main/talium/system/templateParser/statements/LoopStatement.java
rename to bot/main/talium/templateParser/statements/LoopStatement.java
index 1f80b6ba..07b2ff93 100644
--- a/bot/main/talium/system/templateParser/statements/LoopStatement.java
+++ b/bot/main/talium/templateParser/statements/LoopStatement.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.statements;
+package talium.templateParser.statements;
 
 import java.util.List;
 
diff --git a/bot/main/talium/templateParser/statements/Statement.java b/bot/main/talium/templateParser/statements/Statement.java
new file mode 100644
index 00000000..0d50c818
--- /dev/null
+++ b/bot/main/talium/templateParser/statements/Statement.java
@@ -0,0 +1,4 @@
+package talium.templateParser.statements;
+
+public interface Statement {}
+
diff --git a/bot/main/talium/system/templateParser/statements/TextStatement.java b/bot/main/talium/templateParser/statements/TextStatement.java
similarity index 57%
rename from bot/main/talium/system/templateParser/statements/TextStatement.java
rename to bot/main/talium/templateParser/statements/TextStatement.java
index 7efd8a75..7a89bc61 100644
--- a/bot/main/talium/system/templateParser/statements/TextStatement.java
+++ b/bot/main/talium/templateParser/statements/TextStatement.java
@@ -1,3 +1,3 @@
-package talium.system.templateParser.statements;
+package talium.templateParser.statements;
 
 public record TextStatement(String text) implements Statement {}
diff --git a/bot/main/talium/system/templateParser/statements/VarStatement.java b/bot/main/talium/templateParser/statements/VarStatement.java
similarity index 91%
rename from bot/main/talium/system/templateParser/statements/VarStatement.java
rename to bot/main/talium/templateParser/statements/VarStatement.java
index 5d4cd06f..21df7e32 100644
--- a/bot/main/talium/system/templateParser/statements/VarStatement.java
+++ b/bot/main/talium/templateParser/statements/VarStatement.java
@@ -1,6 +1,6 @@
-package talium.system.templateParser.statements;
+package talium.templateParser.statements;
 
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
+import talium.templateParser.exeptions.TemplateSyntaxException;
 
 import java.util.Objects;
 import java.util.regex.Pattern;
diff --git a/bot/main/talium/system/templateParser/tokens/Comparison.java b/bot/main/talium/templateParser/tokens/Comparison.java
similarity index 88%
rename from bot/main/talium/system/templateParser/tokens/Comparison.java
rename to bot/main/talium/templateParser/tokens/Comparison.java
index c23fd278..cae61249 100644
--- a/bot/main/talium/system/templateParser/tokens/Comparison.java
+++ b/bot/main/talium/templateParser/tokens/Comparison.java
@@ -1,6 +1,6 @@
-package talium.system.templateParser.tokens;
+package talium.templateParser.tokens;
 
-import talium.system.templateParser.statements.Equals;
+import talium.templateParser.statements.Equals;
 
 /**
  * Represents a Comparison in an if statements head.
@@ -16,7 +16,7 @@
  * All other Types are currently not handled and will cause the comparison to throw an exception
  *
  * @see Number
- * @see talium.system.templateParser.statements.VarStatement
+ * @see talium.templateParser.statements.VarStatement
  * @see Equals
  * @param left comparand
  * @param equals operator
diff --git a/bot/main/talium/system/templateParser/tokens/IfToken.java b/bot/main/talium/templateParser/tokens/IfToken.java
similarity index 83%
rename from bot/main/talium/system/templateParser/tokens/IfToken.java
rename to bot/main/talium/templateParser/tokens/IfToken.java
index 02384beb..7aa25b06 100644
--- a/bot/main/talium/system/templateParser/tokens/IfToken.java
+++ b/bot/main/talium/templateParser/tokens/IfToken.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.tokens;
+package talium.templateParser.tokens;
 
 /**
  * Token for parsing the If Statements head, used in the dedicated if parser pass.
diff --git a/bot/main/talium/system/templateParser/tokens/IfTokenKind.java b/bot/main/talium/templateParser/tokens/IfTokenKind.java
similarity index 84%
rename from bot/main/talium/system/templateParser/tokens/IfTokenKind.java
rename to bot/main/talium/templateParser/tokens/IfTokenKind.java
index 06bc0dda..0de53bb8 100644
--- a/bot/main/talium/system/templateParser/tokens/IfTokenKind.java
+++ b/bot/main/talium/templateParser/tokens/IfTokenKind.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.tokens;
+package talium.templateParser.tokens;
 
 /**
  * Indicates the encountered token type while parsing the IF statements head.
diff --git a/bot/main/talium/system/templateParser/tokens/TemplateToken.java b/bot/main/talium/templateParser/tokens/TemplateToken.java
similarity index 96%
rename from bot/main/talium/system/templateParser/tokens/TemplateToken.java
rename to bot/main/talium/templateParser/tokens/TemplateToken.java
index dcfb765a..b2e74267 100644
--- a/bot/main/talium/system/templateParser/tokens/TemplateToken.java
+++ b/bot/main/talium/templateParser/tokens/TemplateToken.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.tokens;
+package talium.templateParser.tokens;
 
 /**
  * Major (primary) token Object, used for first parser pass.
diff --git a/bot/main/talium/system/templateParser/tokens/TemplateTokenKind.java b/bot/main/talium/templateParser/tokens/TemplateTokenKind.java
similarity index 88%
rename from bot/main/talium/system/templateParser/tokens/TemplateTokenKind.java
rename to bot/main/talium/templateParser/tokens/TemplateTokenKind.java
index 7a063cdd..65cb9a1a 100644
--- a/bot/main/talium/system/templateParser/tokens/TemplateTokenKind.java
+++ b/bot/main/talium/templateParser/tokens/TemplateTokenKind.java
@@ -1,4 +1,4 @@
-package talium.system.templateParser.tokens;
+package talium.templateParser.tokens;
 
 /**
  * Major (primary) token type, indicates what type of major token was encountered.
diff --git a/bot/main/talium/system/twitchCommands/controller/CommandController.java b/bot/main/talium/twitchCommands/controller/CommandController.java
similarity index 94%
rename from bot/main/talium/system/twitchCommands/controller/CommandController.java
rename to bot/main/talium/twitchCommands/controller/CommandController.java
index 76acefa4..f3d3278a 100644
--- a/bot/main/talium/system/twitchCommands/controller/CommandController.java
+++ b/bot/main/talium/twitchCommands/controller/CommandController.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.controller;
+package talium.twitchCommands.controller;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -7,8 +7,8 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.*;
-import talium.system.twitchCommands.persistence.TriggerEntity;
-import talium.system.twitchCommands.persistence.TriggerService;
+import talium.twitchCommands.persistence.TriggerEntity;
+import talium.twitchCommands.persistence.TriggerService;
 
 @RestController
 @RequestMapping(value = "/commands", produces = "application/json")
diff --git a/bot/main/talium/system/twitchCommands/controller/MessagePatternDTO.java b/bot/main/talium/twitchCommands/controller/MessagePatternDTO.java
similarity index 77%
rename from bot/main/talium/system/twitchCommands/controller/MessagePatternDTO.java
rename to bot/main/talium/twitchCommands/controller/MessagePatternDTO.java
index 87793b32..fe8d5b58 100644
--- a/bot/main/talium/system/twitchCommands/controller/MessagePatternDTO.java
+++ b/bot/main/talium/twitchCommands/controller/MessagePatternDTO.java
@@ -1,6 +1,6 @@
-package talium.system.twitchCommands.controller;
+package talium.twitchCommands.controller;
 
-import talium.system.twitchCommands.persistence.MessagePattern;
+import talium.twitchCommands.persistence.MessagePattern;
 
 public record MessagePatternDTO(
         String pattern,
diff --git a/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java b/bot/main/talium/twitchCommands/controller/TriggerDTO.java
similarity index 68%
rename from bot/main/talium/system/twitchCommands/controller/TriggerDTO.java
rename to bot/main/talium/twitchCommands/controller/TriggerDTO.java
index fcb360e2..2c7cf6cf 100644
--- a/bot/main/talium/system/twitchCommands/controller/TriggerDTO.java
+++ b/bot/main/talium/twitchCommands/controller/TriggerDTO.java
@@ -1,8 +1,8 @@
-package talium.system.twitchCommands.controller;
+package talium.twitchCommands.controller;
 
 import talium.Twitch4J.TwitchUserPermission;
-import talium.system.stringTemplates.TemplateDTO;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
+import talium.stringTemplates.TemplateDTO;
+import talium.twitchCommands.cooldown.ChatCooldown;
 
 public record TriggerDTO(
         String id,
diff --git a/bot/main/talium/system/twitchCommands/cooldown/ChatCooldown.java b/bot/main/talium/twitchCommands/cooldown/ChatCooldown.java
similarity index 93%
rename from bot/main/talium/system/twitchCommands/cooldown/ChatCooldown.java
rename to bot/main/talium/twitchCommands/cooldown/ChatCooldown.java
index df43e7c3..02eb0d05 100644
--- a/bot/main/talium/system/twitchCommands/cooldown/ChatCooldown.java
+++ b/bot/main/talium/twitchCommands/cooldown/ChatCooldown.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.cooldown;
+package talium.twitchCommands.cooldown;
 
 import jakarta.annotation.Nonnull;
 import jakarta.persistence.Embeddable;
diff --git a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java b/bot/main/talium/twitchCommands/cooldown/CooldownService.java
similarity index 99%
rename from bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
rename to bot/main/talium/twitchCommands/cooldown/CooldownService.java
index 8dba8b3d..4ff70947 100644
--- a/bot/main/talium/system/twitchCommands/cooldown/CooldownService.java
+++ b/bot/main/talium/twitchCommands/cooldown/CooldownService.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.cooldown;
+package talium.twitchCommands.cooldown;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import kotlin.Pair;
diff --git a/bot/main/talium/twitchCommands/cooldown/CooldownType.java b/bot/main/talium/twitchCommands/cooldown/CooldownType.java
new file mode 100644
index 00000000..6f8c723c
--- /dev/null
+++ b/bot/main/talium/twitchCommands/cooldown/CooldownType.java
@@ -0,0 +1,9 @@
+package talium.twitchCommands.cooldown;
+
+/**
+ * A Unit of a Cooldown, used in {@link talium.twitchCommands.cooldown.ChatCooldown} to build a value with a unit
+ */
+public enum CooldownType {
+    SECONDS,
+    MESSAGES
+}
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java b/bot/main/talium/twitchCommands/persistence/MessagePattern.java
similarity index 92%
rename from bot/main/talium/system/twitchCommands/persistence/MessagePattern.java
rename to bot/main/talium/twitchCommands/persistence/MessagePattern.java
index d334f698..79bbbc54 100644
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePattern.java
+++ b/bot/main/talium/twitchCommands/persistence/MessagePattern.java
@@ -1,7 +1,7 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import jakarta.persistence.*;
-import talium.system.twitchCommands.controller.MessagePatternDTO;
+import talium.twitchCommands.controller.MessagePatternDTO;
 
 /**
  * A pattern that a message needs to match against in a {@link TriggerEntity}
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePatternId.java b/bot/main/talium/twitchCommands/persistence/MessagePatternId.java
similarity index 93%
rename from bot/main/talium/system/twitchCommands/persistence/MessagePatternId.java
rename to bot/main/talium/twitchCommands/persistence/MessagePatternId.java
index 695c6412..75e56688 100644
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePatternId.java
+++ b/bot/main/talium/twitchCommands/persistence/MessagePatternId.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import java.io.Serializable;
 
diff --git a/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java b/bot/main/talium/twitchCommands/persistence/MessagePatternRepo.java
similarity index 88%
rename from bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java
rename to bot/main/talium/twitchCommands/persistence/MessagePatternRepo.java
index 95d94c0a..3932a7f5 100644
--- a/bot/main/talium/system/twitchCommands/persistence/MessagePatternRepo.java
+++ b/bot/main/talium/twitchCommands/persistence/MessagePatternRepo.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
diff --git a/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java b/bot/main/talium/twitchCommands/persistence/TriggerEntity.java
similarity index 90%
rename from bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java
rename to bot/main/talium/twitchCommands/persistence/TriggerEntity.java
index f9ed09c9..38bf276f 100644
--- a/bot/main/talium/system/twitchCommands/persistence/TriggerEntity.java
+++ b/bot/main/talium/twitchCommands/persistence/TriggerEntity.java
@@ -1,14 +1,14 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import jakarta.persistence.*;
 import org.jetbrains.annotations.Nullable;
-import talium.system.stringTemplates.TemplateDTO;
-import talium.system.twitchCommands.controller.MessagePatternDTO;
-import talium.system.twitchCommands.controller.TriggerDTO;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
-import talium.system.twitchCommands.triggerEngine.TriggerEngine;
+import talium.stringTemplates.TemplateDTO;
+import talium.twitchCommands.controller.MessagePatternDTO;
+import talium.twitchCommands.controller.TriggerDTO;
+import talium.twitchCommands.cooldown.ChatCooldown;
+import talium.twitchCommands.triggerEngine.TriggerEngine;
 import talium.Twitch4J.TwitchUserPermission;
-import talium.system.stringTemplates.Template;
+import talium.stringTemplates.Template;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java b/bot/main/talium/twitchCommands/persistence/TriggerRepo.java
similarity index 96%
rename from bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java
rename to bot/main/talium/twitchCommands/persistence/TriggerRepo.java
index 9019edb7..7bc021ca 100644
--- a/bot/main/talium/system/twitchCommands/persistence/TriggerRepo.java
+++ b/bot/main/talium/twitchCommands/persistence/TriggerRepo.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.ListCrudRepository;
diff --git a/bot/main/talium/system/twitchCommands/persistence/TriggerService.java b/bot/main/talium/twitchCommands/persistence/TriggerService.java
similarity index 88%
rename from bot/main/talium/system/twitchCommands/persistence/TriggerService.java
rename to bot/main/talium/twitchCommands/persistence/TriggerService.java
index aa5dfe7f..4d69ac24 100644
--- a/bot/main/talium/system/twitchCommands/persistence/TriggerService.java
+++ b/bot/main/talium/twitchCommands/persistence/TriggerService.java
@@ -1,18 +1,18 @@
-package talium.system.twitchCommands.persistence;
+package talium.twitchCommands.persistence;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import talium.system.twitchCommands.triggerEngine.RuntimeTrigger;
-import talium.system.stringTemplates.TemplateService;
-import talium.system.twitchCommands.triggerEngine.TriggerEngine;
-import talium.system.twitchCommands.triggerEngine.TriggerProvider;
+import talium.twitchCommands.triggerEngine.RuntimeTrigger;
+import talium.stringTemplates.TemplateService;
+import talium.twitchCommands.triggerEngine.TriggerEngine;
+import talium.twitchCommands.triggerEngine.TriggerProvider;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
-import static talium.system.twitchCommands.triggerEngine.TriggerProvider.transformTrigger;
+import static talium.twitchCommands.triggerEngine.TriggerProvider.transformTrigger;
 
 @Service
 public class TriggerService {
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java b/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
similarity index 86%
rename from bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java
rename to bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
index 6592cf36..202da236 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/RuntimeTrigger.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
@@ -1,7 +1,7 @@
-package talium.system.twitchCommands.triggerEngine;
+package talium.twitchCommands.triggerEngine;
 
-import talium.system.twitchCommands.persistence.TriggerEntity;
-import talium.system.twitchCommands.cooldown.ChatCooldown;
+import talium.twitchCommands.persistence.TriggerEntity;
+import talium.twitchCommands.cooldown.ChatCooldown;
 import talium.Twitch4J.TwitchUserPermission;
 
 import java.util.List;
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java b/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
similarity index 89%
rename from bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java
rename to bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
index 5b8f86b6..ea2aebcc 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerCallback.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
@@ -1,4 +1,4 @@
-package talium.system.twitchCommands.triggerEngine;
+package talium.twitchCommands.triggerEngine;
 
 import talium.Twitch4J.ChatMessage;
 
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java b/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
similarity index 91%
rename from bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
rename to bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
index e953af2e..03e162d7 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerEngine.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
@@ -1,16 +1,16 @@
-package talium.system.twitchCommands.triggerEngine;
+package talium.twitchCommands.triggerEngine;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import talium.Twitch4J.ChatMessage;
-import talium.system.Out;
-import talium.system.eventSystem.Subscriber;
-import talium.system.stringTemplates.TemplateService;
+import talium.Out;
+import talium.eventSystem.Subscriber;
+import talium.stringTemplates.TemplateService;
 
-import static talium.system.twitchCommands.triggerEngine.TriggerProvider.triggers;
-import static talium.system.twitchCommands.cooldown.CooldownService.*;
+import static talium.twitchCommands.triggerEngine.TriggerProvider.triggers;
+import static talium.twitchCommands.cooldown.CooldownService.*;
 
 //TODO reference triggerId guidelines
 
diff --git a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java b/bot/main/talium/twitchCommands/triggerEngine/TriggerProvider.java
similarity index 95%
rename from bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
rename to bot/main/talium/twitchCommands/triggerEngine/TriggerProvider.java
index 57abfffa..37f0ff33 100644
--- a/bot/main/talium/system/twitchCommands/triggerEngine/TriggerProvider.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/TriggerProvider.java
@@ -1,10 +1,10 @@
-package talium.system.twitchCommands.triggerEngine;
+package talium.twitchCommands.triggerEngine;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import talium.system.twitchCommands.persistence.MessagePattern;
-import talium.system.twitchCommands.persistence.TriggerEntity;
-import talium.system.twitchCommands.persistence.TriggerService;
+import talium.twitchCommands.persistence.MessagePattern;
+import talium.twitchCommands.persistence.TriggerEntity;
+import talium.twitchCommands.persistence.TriggerService;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java b/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
index 555cd46f..ff2d31a3 100644
--- a/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
+++ b/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
@@ -5,8 +5,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import talium.system.inputSystem.HealthManager;
-import talium.system.inputSystem.InputStatus;
+import talium.inputSystem.HealthManager;
+import talium.inputSystem.InputStatus;
 
 import java.time.Instant;
 
diff --git a/bot/test/talium/system/templateParser/CharacterStreamTest.java b/bot/test/talium/templateParser/CharacterStreamTest.java
similarity index 92%
rename from bot/test/talium/system/templateParser/CharacterStreamTest.java
rename to bot/test/talium/templateParser/CharacterStreamTest.java
index f7a50083..c337f93a 100644
--- a/bot/test/talium/system/templateParser/CharacterStreamTest.java
+++ b/bot/test/talium/templateParser/CharacterStreamTest.java
@@ -1,7 +1,7 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
 import org.junit.jupiter.api.Test;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.templateParser.exeptions.UnexpectedEndOfInputException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java b/bot/test/talium/templateParser/TemplateInterpreterTest.java
similarity index 95%
rename from bot/test/talium/system/templateParser/TemplateInterpreterTest.java
rename to bot/test/talium/templateParser/TemplateInterpreterTest.java
index b1f8bb0f..48200fb8 100644
--- a/bot/test/talium/system/templateParser/TemplateInterpreterTest.java
+++ b/bot/test/talium/templateParser/TemplateInterpreterTest.java
@@ -1,16 +1,16 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.statements.*;
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.statements.*;
+import talium.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static talium.system.templateParser.TemplateInterpreter.getNestedReplacement;
-import static talium.system.templateParser.TemplateInterpreter.populate;
+import static talium.templateParser.TemplateInterpreter.getNestedReplacement;
+import static talium.templateParser.TemplateInterpreter.populate;
 
 public class TemplateInterpreterTest {
     static List<Statement> TEMPLATE_VAR;
diff --git a/bot/test/talium/system/templateParser/TemplateLexerTest.java b/bot/test/talium/templateParser/TemplateLexerTest.java
similarity index 92%
rename from bot/test/talium/system/templateParser/TemplateLexerTest.java
rename to bot/test/talium/templateParser/TemplateLexerTest.java
index 827224f6..858cac8c 100644
--- a/bot/test/talium/system/templateParser/TemplateLexerTest.java
+++ b/bot/test/talium/templateParser/TemplateLexerTest.java
@@ -1,11 +1,11 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
 import org.junit.jupiter.api.Test;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnexpectedTokenException;
-import talium.system.templateParser.exeptions.UnsupportedDirective;
-import talium.system.templateParser.tokens.TemplateToken;
-import talium.system.templateParser.tokens.TemplateTokenKind;
+import talium.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.templateParser.exeptions.UnexpectedTokenException;
+import talium.templateParser.exeptions.UnsupportedDirective;
+import talium.templateParser.tokens.TemplateToken;
+import talium.templateParser.tokens.TemplateTokenKind;
 
 import java.util.List;
 
diff --git a/bot/test/talium/system/templateParser/TemplateParserTest.java b/bot/test/talium/templateParser/TemplateParserTest.java
similarity index 97%
rename from bot/test/talium/system/templateParser/TemplateParserTest.java
rename to bot/test/talium/templateParser/TemplateParserTest.java
index 0cfc0430..e46f8cc2 100644
--- a/bot/test/talium/system/templateParser/TemplateParserTest.java
+++ b/bot/test/talium/templateParser/TemplateParserTest.java
@@ -1,10 +1,10 @@
-package talium.system.templateParser;
+package talium.templateParser;
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.junit.jupiter.api.Test;
-import talium.system.templateParser.exeptions.*;
-import talium.system.templateParser.statements.TextStatement;
+import talium.templateParser.exeptions.*;
+import talium.templateParser.statements.TextStatement;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java b/bot/test/talium/templateParser/ifParser/IfInterpreterTest.java
similarity index 98%
rename from bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
rename to bot/test/talium/templateParser/ifParser/IfInterpreterTest.java
index 64846be6..55377468 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfInterpreterTest.java
+++ b/bot/test/talium/templateParser/ifParser/IfInterpreterTest.java
@@ -1,8 +1,8 @@
-package talium.system.templateParser.ifParser;
+package talium.templateParser.ifParser;
 
-import talium.system.templateParser.exeptions.ImpossibleComparisonException;
-import talium.system.templateParser.statements.Equals;
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.exeptions.ImpossibleComparisonException;
+import talium.templateParser.statements.Equals;
+import talium.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
diff --git a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java b/bot/test/talium/templateParser/ifParser/IfParserTest.java
similarity index 85%
rename from bot/test/talium/system/templateParser/ifParser/IfParserTest.java
rename to bot/test/talium/templateParser/ifParser/IfParserTest.java
index 7e32f506..8a6e7e2e 100644
--- a/bot/test/talium/system/templateParser/ifParser/IfParserTest.java
+++ b/bot/test/talium/templateParser/ifParser/IfParserTest.java
@@ -1,16 +1,16 @@
-package talium.system.templateParser.ifParser;
+package talium.templateParser.ifParser;
 
-import talium.system.templateParser.exeptions.TemplateSyntaxException;
-import talium.system.templateParser.exeptions.UnexpectedEndOfInputException;
-import talium.system.templateParser.exeptions.UnsupportedComparisonOperator;
-import talium.system.templateParser.statements.Equals;
-import talium.system.templateParser.statements.VarStatement;
-import talium.system.templateParser.tokens.Comparison;
+import talium.templateParser.exeptions.TemplateSyntaxException;
+import talium.templateParser.exeptions.UnexpectedEndOfInputException;
+import talium.templateParser.exeptions.UnsupportedComparisonOperator;
+import talium.templateParser.statements.Equals;
+import talium.templateParser.statements.VarStatement;
+import talium.templateParser.tokens.Comparison;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
-import static talium.system.templateParser.ifParser.IfParser.parse;
+import static talium.templateParser.ifParser.IfParser.parse;
 
 public class IfParserTest {
 

From 650e58746bfbf70b506a8eb7b24d7c67b1d2a56d Mon Sep 17 00:00:00 2001
From: orciument <orciument@gmail.com>
Date: Fri, 7 Feb 2025 13:11:10 +0100
Subject: [PATCH 58/58] lowercase twitch and tipeee

---
 bot/main/talium/Out.java                               |  4 ++--
 bot/main/talium/Registrar.java                         |  2 +-
 bot/main/talium/TwitchBot.java                         | 10 +++++-----
 .../coinsWatchtime/WIPWatchtimeCommandServer.java      |  2 +-
 .../{TipeeeStream => tipeeeStream}/DonationEntity.java |  2 +-
 .../{TipeeeStream => tipeeeStream}/DonationEvent.java  |  2 +-
 .../{TipeeeStream => tipeeeStream}/DonationRepo.java   |  2 +-
 .../{TipeeeStream => tipeeeStream}/TipeeeConfig.java   |  2 +-
 .../TipeeeEventHandler.java                            |  2 +-
 .../{TipeeeStream => tipeeeStream}/TipeeeInput.java    |  2 +-
 .../talium/{Twitch4J => twitch4J}/ChatMessage.java     |  6 +++---
 .../talium/{Twitch4J => twitch4J}/Twitch4JInput.java   |  2 +-
 .../talium/{Twitch4J => twitch4J}/TwitchAPINoop.java   |  2 +-
 bot/main/talium/{Twitch4J => twitch4J}/TwitchApi.java  |  2 +-
 .../talium/{Twitch4J => twitch4J}/TwitchApiImpl.java   |  2 +-
 .../talium/{Twitch4J => twitch4J}/TwitchConfig.java    |  2 +-
 bot/main/talium/{Twitch4J => twitch4J}/TwitchUser.java |  2 +-
 .../{Twitch4J => twitch4J}/TwitchUserPermission.java   |  2 +-
 .../talium/twitchCommands/controller/TriggerDTO.java   |  2 +-
 .../twitchCommands/cooldown/CooldownService.java       |  4 ++--
 .../twitchCommands/persistence/TriggerEntity.java      |  2 +-
 .../twitchCommands/triggerEngine/RuntimeTrigger.java   |  2 +-
 .../twitchCommands/triggerEngine/TriggerCallback.java  |  2 +-
 .../twitchCommands/triggerEngine/TriggerEngine.java    |  2 +-
 .../TipeeeConnectionTest.java                          |  2 +-
 .../TipeeeInputTest.java                               |  2 +-
 26 files changed, 34 insertions(+), 34 deletions(-)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/DonationEntity.java (97%)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/DonationEvent.java (95%)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/DonationRepo.java (83%)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/TipeeeConfig.java (98%)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/TipeeeEventHandler.java (98%)
 rename bot/main/talium/{TipeeeStream => tipeeeStream}/TipeeeInput.java (99%)
 rename bot/main/talium/{Twitch4J => twitch4J}/ChatMessage.java (97%)
 rename bot/main/talium/{Twitch4J => twitch4J}/Twitch4JInput.java (99%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchAPINoop.java (98%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchApi.java (94%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchApiImpl.java (99%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchConfig.java (98%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchUser.java (99%)
 rename bot/main/talium/{Twitch4J => twitch4J}/TwitchUserPermission.java (92%)
 rename bot/test/talium/{TipeeeStream => tipeeeStream}/TipeeeConnectionTest.java (97%)
 rename bot/test/talium/{TipeeeStream => tipeeeStream}/TipeeeInputTest.java (98%)

diff --git a/bot/main/talium/Out.java b/bot/main/talium/Out.java
index 58f09a7e..e865669c 100644
--- a/bot/main/talium/Out.java
+++ b/bot/main/talium/Out.java
@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
-import talium.Twitch4J.TwitchAPINoop;
-import talium.Twitch4J.TwitchApi;
+import talium.twitch4J.TwitchAPINoop;
+import talium.twitch4J.TwitchApi;
 import talium.stringTemplates.Template;
 import talium.stringTemplates.TemplateService;
 import talium.templateParser.exeptions.*;
diff --git a/bot/main/talium/Registrar.java b/bot/main/talium/Registrar.java
index c2806ca4..93b510fb 100644
--- a/bot/main/talium/Registrar.java
+++ b/bot/main/talium/Registrar.java
@@ -2,7 +2,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import talium.Twitch4J.TwitchUserPermission;
+import talium.twitch4J.TwitchUserPermission;
 import talium.inputSystem.HealthManager;
 import talium.stringTemplates.Template;
 import talium.stringTemplates.TemplateService;
diff --git a/bot/main/talium/TwitchBot.java b/bot/main/talium/TwitchBot.java
index ff5f65fd..192658e9 100644
--- a/bot/main/talium/TwitchBot.java
+++ b/bot/main/talium/TwitchBot.java
@@ -3,11 +3,11 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.persistence.PreRemove;
 import org.springframework.context.ConfigurableApplicationContext;
-import talium.TipeeeStream.DonationRepo;
-import talium.TipeeeStream.TipeeeConfig;
-import talium.TipeeeStream.TipeeeInput;
-import talium.Twitch4J.Twitch4JInput;
-import talium.Twitch4J.TwitchConfig;
+import talium.tipeeeStream.DonationRepo;
+import talium.tipeeeStream.TipeeeConfig;
+import talium.tipeeeStream.TipeeeInput;
+import talium.twitch4J.Twitch4JInput;
+import talium.twitch4J.TwitchConfig;
 import talium.oauthConnector.OauthAccountRepo;
 import talium.coinsWatchtime.WIPWatchtimeCommandServer;
 import talium.coinsWatchtime.WatchtimeUpdateService;
diff --git a/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java b/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
index f3cdb718..8e9f7cbb 100644
--- a/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
+++ b/bot/main/talium/coinsWatchtime/WIPWatchtimeCommandServer.java
@@ -1,7 +1,7 @@
 package talium.coinsWatchtime;
 
 import talium.Registrar;
-import talium.Twitch4J.ChatMessage;
+import talium.twitch4J.ChatMessage;
 import talium.Out;
 import talium.coinsWatchtime.chatter.Chatter;
 import talium.coinsWatchtime.chatter.ChatterService;
diff --git a/bot/main/talium/TipeeeStream/DonationEntity.java b/bot/main/talium/tipeeeStream/DonationEntity.java
similarity index 97%
rename from bot/main/talium/TipeeeStream/DonationEntity.java
rename to bot/main/talium/tipeeeStream/DonationEntity.java
index 8f5d5a13..5f2fa198 100644
--- a/bot/main/talium/TipeeeStream/DonationEntity.java
+++ b/bot/main/talium/tipeeeStream/DonationEntity.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import jakarta.persistence.*;
 import org.springframework.lang.Nullable;
diff --git a/bot/main/talium/TipeeeStream/DonationEvent.java b/bot/main/talium/tipeeeStream/DonationEvent.java
similarity index 95%
rename from bot/main/talium/TipeeeStream/DonationEvent.java
rename to bot/main/talium/tipeeeStream/DonationEvent.java
index bead993c..e2708c14 100644
--- a/bot/main/talium/TipeeeStream/DonationEvent.java
+++ b/bot/main/talium/tipeeeStream/DonationEvent.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import java.time.ZonedDateTime;
 import java.util.Currency;
diff --git a/bot/main/talium/TipeeeStream/DonationRepo.java b/bot/main/talium/tipeeeStream/DonationRepo.java
similarity index 83%
rename from bot/main/talium/TipeeeStream/DonationRepo.java
rename to bot/main/talium/tipeeeStream/DonationRepo.java
index 698cb0ff..74c8daf5 100644
--- a/bot/main/talium/TipeeeStream/DonationRepo.java
+++ b/bot/main/talium/tipeeeStream/DonationRepo.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import org.springframework.data.repository.ListCrudRepository;
 
diff --git a/bot/main/talium/TipeeeStream/TipeeeConfig.java b/bot/main/talium/tipeeeStream/TipeeeConfig.java
similarity index 98%
rename from bot/main/talium/TipeeeStream/TipeeeConfig.java
rename to bot/main/talium/tipeeeStream/TipeeeConfig.java
index 05a2d501..72fb5409 100644
--- a/bot/main/talium/TipeeeStream/TipeeeConfig.java
+++ b/bot/main/talium/tipeeeStream/TipeeeConfig.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/bot/main/talium/TipeeeStream/TipeeeEventHandler.java b/bot/main/talium/tipeeeStream/TipeeeEventHandler.java
similarity index 98%
rename from bot/main/talium/TipeeeStream/TipeeeEventHandler.java
rename to bot/main/talium/tipeeeStream/TipeeeEventHandler.java
index 91342c32..ff3ea0a2 100644
--- a/bot/main/talium/TipeeeStream/TipeeeEventHandler.java
+++ b/bot/main/talium/tipeeeStream/TipeeeEventHandler.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import talium.eventSystem.EventDispatcher;
 import org.json.JSONArray;
diff --git a/bot/main/talium/TipeeeStream/TipeeeInput.java b/bot/main/talium/tipeeeStream/TipeeeInput.java
similarity index 99%
rename from bot/main/talium/TipeeeStream/TipeeeInput.java
rename to bot/main/talium/tipeeeStream/TipeeeInput.java
index 6ccde536..277e56b8 100644
--- a/bot/main/talium/TipeeeStream/TipeeeInput.java
+++ b/bot/main/talium/tipeeeStream/TipeeeInput.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import io.socket.client.IO;
 import io.socket.client.Socket;
diff --git a/bot/main/talium/Twitch4J/ChatMessage.java b/bot/main/talium/twitch4J/ChatMessage.java
similarity index 97%
rename from bot/main/talium/Twitch4J/ChatMessage.java
rename to bot/main/talium/twitch4J/ChatMessage.java
index 39f1eaf5..b43659a2 100644
--- a/bot/main/talium/Twitch4J/ChatMessage.java
+++ b/bot/main/talium/twitch4J/ChatMessage.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import com.github.twitch4j.chat.events.channel.ChannelMessageEvent;
 import com.github.twitch4j.common.enums.CommandPermission;
@@ -12,8 +12,8 @@
 import java.util.Optional;
 import java.util.Set;
 
-import static talium.Twitch4J.TwitchUserPermission.*;
-import static talium.Twitch4J.TwitchUserPermission.OWNER;
+import static talium.twitch4J.TwitchUserPermission.*;
+import static talium.twitch4J.TwitchUserPermission.OWNER;
 
 public record ChatMessage(
         String messageId,
diff --git a/bot/main/talium/Twitch4J/Twitch4JInput.java b/bot/main/talium/twitch4J/Twitch4JInput.java
similarity index 99%
rename from bot/main/talium/Twitch4J/Twitch4JInput.java
rename to bot/main/talium/twitch4J/Twitch4JInput.java
index b3b4cfe2..f010570a 100644
--- a/bot/main/talium/Twitch4J/Twitch4JInput.java
+++ b/bot/main/talium/twitch4J/Twitch4JInput.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
 import com.github.philippheuer.events4j.simple.SimpleEventHandler;
diff --git a/bot/main/talium/Twitch4J/TwitchAPINoop.java b/bot/main/talium/twitch4J/TwitchAPINoop.java
similarity index 98%
rename from bot/main/talium/Twitch4J/TwitchAPINoop.java
rename to bot/main/talium/twitch4J/TwitchAPINoop.java
index 6d141d52..0c5e454f 100644
--- a/bot/main/talium/Twitch4J/TwitchAPINoop.java
+++ b/bot/main/talium/twitch4J/TwitchAPINoop.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
diff --git a/bot/main/talium/Twitch4J/TwitchApi.java b/bot/main/talium/twitch4J/TwitchApi.java
similarity index 94%
rename from bot/main/talium/Twitch4J/TwitchApi.java
rename to bot/main/talium/twitch4J/TwitchApi.java
index f25c9de7..e377eaf7 100644
--- a/bot/main/talium/Twitch4J/TwitchApi.java
+++ b/bot/main/talium/twitch4J/TwitchApi.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import com.github.twitch4j.helix.domain.Chatter;
 import com.github.twitch4j.helix.domain.User;
diff --git a/bot/main/talium/Twitch4J/TwitchApiImpl.java b/bot/main/talium/twitch4J/TwitchApiImpl.java
similarity index 99%
rename from bot/main/talium/Twitch4J/TwitchApiImpl.java
rename to bot/main/talium/twitch4J/TwitchApiImpl.java
index 4cd0b23f..d2f80ad1 100644
--- a/bot/main/talium/Twitch4J/TwitchApiImpl.java
+++ b/bot/main/talium/twitch4J/TwitchApiImpl.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import com.github.philippheuer.credentialmanager.domain.OAuth2Credential;
 import com.github.twitch4j.chat.TwitchChat;
diff --git a/bot/main/talium/Twitch4J/TwitchConfig.java b/bot/main/talium/twitch4J/TwitchConfig.java
similarity index 98%
rename from bot/main/talium/Twitch4J/TwitchConfig.java
rename to bot/main/talium/twitch4J/TwitchConfig.java
index 093f6824..912a66e8 100644
--- a/bot/main/talium/Twitch4J/TwitchConfig.java
+++ b/bot/main/talium/twitch4J/TwitchConfig.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/bot/main/talium/Twitch4J/TwitchUser.java b/bot/main/talium/twitch4J/TwitchUser.java
similarity index 99%
rename from bot/main/talium/Twitch4J/TwitchUser.java
rename to bot/main/talium/twitch4J/TwitchUser.java
index 2226e295..b0449d0b 100644
--- a/bot/main/talium/Twitch4J/TwitchUser.java
+++ b/bot/main/talium/twitch4J/TwitchUser.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 import java.util.Objects;
 
diff --git a/bot/main/talium/Twitch4J/TwitchUserPermission.java b/bot/main/talium/twitch4J/TwitchUserPermission.java
similarity index 92%
rename from bot/main/talium/Twitch4J/TwitchUserPermission.java
rename to bot/main/talium/twitch4J/TwitchUserPermission.java
index 8bf60d74..a35e650e 100644
--- a/bot/main/talium/Twitch4J/TwitchUserPermission.java
+++ b/bot/main/talium/twitch4J/TwitchUserPermission.java
@@ -1,4 +1,4 @@
-package talium.Twitch4J;
+package talium.twitch4J;
 
 /**
  * Unser Subset der Twitch4J/Twitch User Permissions/Badges {@link com.github.twitch4j.common.enums.CommandPermission}
diff --git a/bot/main/talium/twitchCommands/controller/TriggerDTO.java b/bot/main/talium/twitchCommands/controller/TriggerDTO.java
index 2c7cf6cf..df040e7a 100644
--- a/bot/main/talium/twitchCommands/controller/TriggerDTO.java
+++ b/bot/main/talium/twitchCommands/controller/TriggerDTO.java
@@ -1,6 +1,6 @@
 package talium.twitchCommands.controller;
 
-import talium.Twitch4J.TwitchUserPermission;
+import talium.twitch4J.TwitchUserPermission;
 import talium.stringTemplates.TemplateDTO;
 import talium.twitchCommands.cooldown.ChatCooldown;
 
diff --git a/bot/main/talium/twitchCommands/cooldown/CooldownService.java b/bot/main/talium/twitchCommands/cooldown/CooldownService.java
index 4ff70947..ea823ea3 100644
--- a/bot/main/talium/twitchCommands/cooldown/CooldownService.java
+++ b/bot/main/talium/twitchCommands/cooldown/CooldownService.java
@@ -6,8 +6,8 @@
 import org.checkerframework.dataflow.qual.Pure;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import talium.Twitch4J.ChatMessage;
-import talium.Twitch4J.TwitchUser;
+import talium.twitch4J.ChatMessage;
+import talium.twitch4J.TwitchUser;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
diff --git a/bot/main/talium/twitchCommands/persistence/TriggerEntity.java b/bot/main/talium/twitchCommands/persistence/TriggerEntity.java
index 38bf276f..8541e0f7 100644
--- a/bot/main/talium/twitchCommands/persistence/TriggerEntity.java
+++ b/bot/main/talium/twitchCommands/persistence/TriggerEntity.java
@@ -7,7 +7,7 @@
 import talium.twitchCommands.controller.TriggerDTO;
 import talium.twitchCommands.cooldown.ChatCooldown;
 import talium.twitchCommands.triggerEngine.TriggerEngine;
-import talium.Twitch4J.TwitchUserPermission;
+import talium.twitch4J.TwitchUserPermission;
 import talium.stringTemplates.Template;
 
 import java.util.Arrays;
diff --git a/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java b/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
index 202da236..7e8776d1 100644
--- a/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/RuntimeTrigger.java
@@ -2,7 +2,7 @@
 
 import talium.twitchCommands.persistence.TriggerEntity;
 import talium.twitchCommands.cooldown.ChatCooldown;
-import talium.Twitch4J.TwitchUserPermission;
+import talium.twitch4J.TwitchUserPermission;
 
 import java.util.List;
 import java.util.regex.Pattern; /**
diff --git a/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java b/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
index ea2aebcc..9a6b3e4b 100644
--- a/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/TriggerCallback.java
@@ -1,6 +1,6 @@
 package talium.twitchCommands.triggerEngine;
 
-import talium.Twitch4J.ChatMessage;
+import talium.twitch4J.ChatMessage;
 
 /**
  * Defies the functions that are valid as triggerCallbacks. <br/>
diff --git a/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java b/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
index 03e162d7..fef1a91a 100644
--- a/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
+++ b/bot/main/talium/twitchCommands/triggerEngine/TriggerEngine.java
@@ -4,7 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import talium.Twitch4J.ChatMessage;
+import talium.twitch4J.ChatMessage;
 import talium.Out;
 import talium.eventSystem.Subscriber;
 import talium.stringTemplates.TemplateService;
diff --git a/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java b/bot/test/talium/tipeeeStream/TipeeeConnectionTest.java
similarity index 97%
rename from bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
rename to bot/test/talium/tipeeeStream/TipeeeConnectionTest.java
index ff2d31a3..9e536d6c 100644
--- a/bot/test/talium/TipeeeStream/TipeeeConnectionTest.java
+++ b/bot/test/talium/tipeeeStream/TipeeeConnectionTest.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
diff --git a/bot/test/talium/TipeeeStream/TipeeeInputTest.java b/bot/test/talium/tipeeeStream/TipeeeInputTest.java
similarity index 98%
rename from bot/test/talium/TipeeeStream/TipeeeInputTest.java
rename to bot/test/talium/tipeeeStream/TipeeeInputTest.java
index 51cab676..228d50e2 100644
--- a/bot/test/talium/TipeeeStream/TipeeeInputTest.java
+++ b/bot/test/talium/tipeeeStream/TipeeeInputTest.java
@@ -1,4 +1,4 @@
-package talium.TipeeeStream;
+package talium.tipeeeStream;
 
 import org.json.JSONException;
 import org.json.JSONObject;