From 89585cae0eaa446153c445af1a1d9fd06c3b9ded Mon Sep 17 00:00:00 2001
From: Roscoe <roscoe@wah.moe>
Date: Sun, 15 Feb 2026 23:31:34 +0000
Subject: [PATCH] Use env vars instead of json

---
 .env                                    |  2 ++
 .idea/runConfigurations/Doki.xml        |  3 +++
 README.md                               | 13 ++++++-------
 config.example.json                     |  4 ----
 pom.xml                                 |  2 +-
 src/main/java/net/hypr/doki/Config.java | 22 ++++++++++------------
 src/main/java/net/hypr/doki/Doki.java   |  8 ++++++--
 src/main/resources/config.schema.json   | 12 ------------
 8 files changed, 28 insertions(+), 38 deletions(-)
 create mode 100644 .env
 delete mode 100644 config.example.json
 delete mode 100644 src/main/resources/config.schema.json

diff --git a/.env b/.env
new file mode 100644
index 0000000..e952d6d
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+DOKI_TOKEN=OTM4NTIyNzgxMDM1OTIxNDQ4.G49Qim.wrCrGvb3YwTQEMMoJ0P3LpSCWcaeL2AAuOOsEI
+DOKI_WARNING_CHANNEL=1320191969137393736
\ No newline at end of file
diff --git a/.idea/runConfigurations/Doki.xml b/.idea/runConfigurations/Doki.xml
index dbd38ab..931d0a4 100644
--- a/.idea/runConfigurations/Doki.xml
+++ b/.idea/runConfigurations/Doki.xml
@@ -1,5 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Doki" type="Application" factoryName="Application">
+    <option name="envFilePaths">
+      <option value="$PROJECT_DIR$/.env" />
+    </option>
     <option name="MAIN_CLASS_NAME" value="net.hypr.doki.Doki" />
     <module name="doki" />
     <method v="2">
diff --git a/README.md b/README.md
index 5a04bcf..de0203e 100644
--- a/README.md
+++ b/README.md
@@ -18,13 +18,12 @@ A multipurpose Discord bot written in Java.
 
 ---
 
-## Config file schema
-```json
-{
-  "token": "your_token",
-  "warningChannel": 0
-}
-```
+## Enviromnent Variables
+
+| Variable               | Description                |
+|------------------------|----------------------------|
+| `DOKI_TOKEN`           | Discord token for the bot  |
+| `DOKI_WARNING_CHANNEL` | Channel to log warnings to |
 
 ---
 
diff --git a/config.example.json b/config.example.json
deleted file mode 100644
index 72ad5a6..0000000
--- a/config.example.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "token": "CHANGEME",
-  "warningChannel": 0
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 583c1f1..8a6f75d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.hypr</groupId>
     <artifactId>doki</artifactId>
-    <version>1.0.9</version>
+    <version>1.1.0</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
diff --git a/src/main/java/net/hypr/doki/Config.java b/src/main/java/net/hypr/doki/Config.java
index 8c2a56b..c42be4d 100644
--- a/src/main/java/net/hypr/doki/Config.java
+++ b/src/main/java/net/hypr/doki/Config.java
@@ -1,18 +1,20 @@
 package net.hypr.doki;
 
 import com.freya02.botcommands.api.Logging;
-import com.google.gson.Gson;
 import org.slf4j.Logger;
 
 import java.io.*;
-import java.nio.charset.StandardCharsets;
 
 //You can add more fields in this class, if your input json matches the structure
 //You will need a valid config.json in the resources folder for this to work
 public class Config {
-    @SuppressWarnings("unused") private String token;
-    @SuppressWarnings("unused") private long warningChannel;
+    @SuppressWarnings("unused") private final String token;
+    @SuppressWarnings("unused") private final long warningChannel;
 
+    private Config(String token, long warningChannel) {
+        this.token = token;
+        this.warningChannel = warningChannel;
+    }
     /**
      * Returns the configuration object for this bot
      *
@@ -21,14 +23,10 @@ public class Config {
      */
     public static Config readConfig() throws IOException {
         Logger log = Logging.getLogger();
-        try (InputStream in = new FileInputStream("./config.json")) {
-            Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8);
-            log.info("Loaded config");
-            return new Gson().fromJson(reader, Config.class);
-        } catch (IOException | NullPointerException e) {
-            log.error("Failed to load config.json, does the file exist?");
-            throw new IOException(e);
-        }
+        return new Config(
+                System.getenv("DOKI_TOKEN"),
+                Long.parseLong(System.getenv("DOKI_WARNING_CHANNEL"))
+        );
     }
 
     public String getToken() {
diff --git a/src/main/java/net/hypr/doki/Doki.java b/src/main/java/net/hypr/doki/Doki.java
index 2fd96ed..6ffc821 100644
--- a/src/main/java/net/hypr/doki/Doki.java
+++ b/src/main/java/net/hypr/doki/Doki.java
@@ -38,8 +38,12 @@ public class Doki {
         // Print some information about the bot
         log.info("Bot connected as {}", jda.getSelfUser().getAsTag());
         log.info("The bot is present in the following guilds:");
-        for (Guild guild : jda.getGuildCache()) {
-            log.info("\t- {} ({})", guild.getName(), guild.getId());
+        try {
+            for (Guild guild : jda.getGuildCache()) {
+                log.info("\t- {} ({})", guild.getName(), guild.getId());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
 
         new Doki(jda, config);
diff --git a/src/main/resources/config.schema.json b/src/main/resources/config.schema.json
deleted file mode 100644
index a5464fb..0000000
--- a/src/main/resources/config.schema.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-    "token": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "token"
-  ]
-}
\ No newline at end of file