From 20c89a4f8e8bf0d2f7db64f069291867958a8279 Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Sun, 23 Nov 2025 03:45:28 +0100
Subject: [PATCH] Refactor Discord token retrieval by prioritizing environment
 variable and update lambda formatting in `DiscordSender`.

---
 .../src/main/java/com/alttd/webinterface/DiscordBot.java    | 5 -----
 .../java/com/alttd/webinterface/bot/DiscordBotInstance.java | 6 ++++--
 .../com/alttd/webinterface/send_message/DiscordSender.java  | 5 ++---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/discord/src/main/java/com/alttd/webinterface/DiscordBot.java b/discord/src/main/java/com/alttd/webinterface/DiscordBot.java
index 7361f4c..4492d94 100644
--- a/discord/src/main/java/com/alttd/webinterface/DiscordBot.java
+++ b/discord/src/main/java/com/alttd/webinterface/DiscordBot.java
@@ -7,11 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 public class DiscordBot {
 
     public static void main(String[] args) {
-        String discordToken = System.getProperty("DISCORD_TOKEN");
-        if (discordToken == null) {
-            log.error("Discord token not found, put it in the DISCORD_TOKEN environment variable");
-            System.exit(1);
-        }
         DiscordBotInstance discordBotInstance = DiscordBotInstance.getInstance();
         discordBotInstance.getJda();
     }
diff --git a/discord/src/main/java/com/alttd/webinterface/bot/DiscordBotInstance.java b/discord/src/main/java/com/alttd/webinterface/bot/DiscordBotInstance.java
index e370c72..1d3bbae 100644
--- a/discord/src/main/java/com/alttd/webinterface/bot/DiscordBotInstance.java
+++ b/discord/src/main/java/com/alttd/webinterface/bot/DiscordBotInstance.java
@@ -6,6 +6,8 @@ import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 
+import java.util.Optional;
+
 @Slf4j
 public class DiscordBotInstance {
 
@@ -22,8 +24,8 @@ public class DiscordBotInstance {
 
     public JDA getJda() {
         if (jda == null) {
-            String discordToken = System.getProperty("DISCORD_TOKEN");
-            log.info("env:\n{}", System.getenv());
+            String discordToken = Optional.ofNullable(System.getenv("DISCORD_TOKEN"))
+                    .orElse(System.getProperty("DISCORD_TOKEN"));
             if (discordToken == null) {
                 log.error("Discord token not found, put it in the DISCORD_TOKEN environment variable");
                 System.exit(1);
diff --git a/discord/src/main/java/com/alttd/webinterface/send_message/DiscordSender.java b/discord/src/main/java/com/alttd/webinterface/send_message/DiscordSender.java
index d403207..81fc468 100644
--- a/discord/src/main/java/com/alttd/webinterface/send_message/DiscordSender.java
+++ b/discord/src/main/java/com/alttd/webinterface/send_message/DiscordSender.java
@@ -69,9 +69,8 @@ public class DiscordSender {
             result.stream()
                     .filter(Optional::isPresent)
                     .map(Optional::get)
-                    .forEach(message -> {
-                        message.createThreadChannel(threadName).queue();
-                    });
+                    .forEach(message ->
+                                     message.createThreadChannel(threadName).queue());
         });
     }