Compare commits

...

2 commits

5 changed files with 5 additions and 38 deletions

2
.gitignore vendored
View file

@ -40,7 +40,7 @@ build/
### Other Stuff ###
config*.json
config.example.json
!config.example.json
!**/resources/config.schema.json
### why would this not be here already ###

3
config.example.json Normal file
View file

@ -0,0 +1,3 @@
{
"token": "CHANGEME"
}

View file

@ -11,8 +11,6 @@ import java.nio.charset.StandardCharsets;
//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 String prefix;
@SuppressWarnings("unused") private DBConfig mariadb;
/**
* Returns the configuration object for this bot
@ -35,29 +33,4 @@ public class Config {
public String getToken() {
return token;
}
public String getPrefix() { return prefix; }
public DBConfig getDbConfig() {
return mariadb;
}
public static class DBConfig {
@SuppressWarnings("unused") private String host, user, password, database;
@SuppressWarnings("unused") private int portNumber;
public String getHost() { return host; }
public String getUser() {
return user;
}
public String getPassword() {
return password;
}
public String getDatabase() { return database; }
public int getPortNumber() {
return portNumber;
}
}
}

View file

@ -5,7 +5,6 @@ import com.freya02.botcommands.api.Logging;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.requests.GatewayIntent;
import org.slf4j.Logger;
import java.io.IOException;
@ -23,14 +22,12 @@ public class Doki {
public static JDA getJDA() {
return jda;
}
public static String getPrefix() { return config.getPrefix(); }
public static void start() throws IOException, InterruptedException {
config = Config.readConfig();
final JDA jda = JDABuilder.createLight(config.getToken())
.setActivity(Activity.customStatus("Banned from everywhere"))
.enableIntents(GatewayIntent.MESSAGE_CONTENT)
.build()
.awaitReady();

View file

@ -1,18 +1,12 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"type": "object",
"properties": {
"token": {
"type": "string"
},
"prefix": {
"type": "string"
}
},
"required": [
"token",
"prefix"
"token"
]
}