aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/Main.java13
-rw-r--r--src/main/java/utility/SpotifyAPI.java12
2 files changed, 9 insertions, 16 deletions
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
index fbb066a..636cd3b 100644
--- a/src/main/java/Main.java
+++ b/src/main/java/Main.java
@@ -11,18 +11,15 @@ public class Main extends ListenerAdapter {
public static void main( String[] args)
{
- new Music("$",readSetting("youtubeApi"),readSetting("discordToken"));
+ new Music("$",readSetting("YOUTUBEAPIKEY"),readSetting("DISCORDTOKEN"));
}
public static String readSetting(String parameter){
- Object obj = null;
- try {
- obj = new JSONParser().parse(new FileReader("settings//config.json"));
- } catch (Exception e) {
- e.printStackTrace();
+ String value = System.getenv(parameter);
+ if (value != null) {
+ return value;
}
- JSONObject jo = (JSONObject) obj;
- return (String) jo.get(parameter);
+ throw new RuntimeException("Environment variable " + parameter + " not found");
}
diff --git a/src/main/java/utility/SpotifyAPI.java b/src/main/java/utility/SpotifyAPI.java
index 4eb4d6e..acf79eb 100644
--- a/src/main/java/utility/SpotifyAPI.java
+++ b/src/main/java/utility/SpotifyAPI.java
@@ -83,15 +83,11 @@ public class SpotifyAPI {
}
}
public static String readSetting(String parameter){
- Object obj = null;
-
- try {
- obj = new JSONParser().parse(new FileReader("settings//config.json"));
- } catch (Exception e) {
- e.printStackTrace();
+ String value = System.getenv(parameter);
+ if (value != null) {
+ return value;
}
- JSONObject jo = (JSONObject) obj;
- return (String) jo.get(parameter);
+ throw new RuntimeException("Environment variable " + parameter + " not found");
}
public static void checkRefreshToken(){
long unixTime = Instant.now().getEpochSecond();
send patches to the email below
yukais@pinapelz.com
include the subject [PATCH repo_name]
pinapelz.com
homepage