oko
/
kiafumi
2
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases Wiki Activity

Completely overhaul logging 

Now uses log4j2 as the default logger.
The output is now colorized and better organized.
The text is also much more readable.

This commit also attempts to fix the /skip issue.
This commit is contained in:
Anya 2022-05-17 14:48:47 -07:00
parent 9ae1db1b80
commit 35512486ad
14 changed files with 102 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pom.xml
View File

@ -33,12 +33,22 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5</version> <version>4.5.13</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>log4j-api</artifactId>
<version>1.7.9</version> <version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sedmelluq</groupId> <groupId>com.sedmelluq</groupId>
@ -48,7 +58,7 @@
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version> <version>8.0.29</version>
</dependency> </dependency>
<!-- DDG api (https://github.com/nstrydom2/duckduckgo-api) --> <!-- DDG api (https://github.com/nstrydom2/duckduckgo-api) -->
<dependency> <dependency>
@ -60,7 +70,7 @@
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.0.1-jre</version> <version>31.1-jre</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -78,6 +88,11 @@
<name>bintray</name> <name>bintray</name>
<url>https://jcenter.bintray.com</url> <url>https://jcenter.bintray.com</url>
</repository> </repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories> </repositories>
<build> <build>

24
src/main/java/moe/oko/Kiafumi/Kiafumi.java
View File

@ -90,8 +90,6 @@ public class Kiafumi {
// All commands to be loaded on startup! // All commands to be loaded on startup!
activeCommands = new CommandRegistrar().getCommandClasses(); activeCommands = new CommandRegistrar().getCommandClasses();
logger.info("Config load start...");
// Ensuring the configuration file is generated and/or exists. // Ensuring the configuration file is generated and/or exists.
if (!CONFIG_FILE.exists()) { if (!CONFIG_FILE.exists()) {
try (InputStream is = this.getClass().getClassLoader().getResourceAsStream("config.yml")) { try (InputStream is = this.getClass().getClassLoader().getResourceAsStream("config.yml")) {
@ -143,7 +141,6 @@ public class Kiafumi {
public void stop() { public void stop() {
var build = new EmbedBuilder() var build = new EmbedBuilder()
.setColor(EmbedUI.FAILURE) .setColor(EmbedUI.FAILURE)
.setAuthor("Kiafumi", null, Kiafumi.JDA.getSelfUser().getAvatarUrl())
.setTitle("Offline") .setTitle("Offline")
.setFooter(footer) .setFooter(footer)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
@ -178,11 +175,10 @@ public class Kiafumi {
} }
registerAllCommands(); registerAllCommands();
info("Loaded " + activeCommands.size() + " commands."); info("Finished registering commands.");
var eb = new EmbedBuilder() var eb = new EmbedBuilder()
.setColor(EmbedUI.SUCCESS) .setColor(EmbedUI.SUCCESS)
.setAuthor("Kiafumi", null, Kiafumi.JDA.getSelfUser().getAvatarUrl())
.setTitle("Online") .setTitle("Online")
.setFooter(footer) .setFooter(footer)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
@ -194,6 +190,7 @@ public class Kiafumi {
*/ */
private void registerAllCommands() { private void registerAllCommands() {
// Registers slash commands. // Registers slash commands.
info("Registering commands for guilds.");
for(Guild guild : JDA.getGuilds()) { for(Guild guild : JDA.getGuilds()) {
registerForGuild(guild); registerForGuild(guild);
} }
@ -209,7 +206,7 @@ public class Kiafumi {
* @param guild - guild to have commands provided to * @param guild - guild to have commands provided to
*/ */
public void registerForGuild(Guild guild) { public void registerForGuild(Guild guild) {
info("Registering commands for guild [" + guild.getId() + "]"); debug("Registering commands for guild [" + guild.getName() + ":" + guild.getId() + "]");
int i = 0; int i = 0;
for(CommandClass cmd : activeCommands) { for(CommandClass cmd : activeCommands) {
for(CommandInfo ci : cmd.getSlashCommandInfo()) { for(CommandInfo ci : cmd.getSlashCommandInfo()) {
@ -232,7 +229,7 @@ public class Kiafumi {
} }
} }
// Push w/ modifications. // Push w/ modifications.
//info("Command: " + ci.getName() + " registration on " + guild.getId() + " completed."); //trace("Command: " + ci.getName() + " registration on " + guild.getId() + " completed.");
try { try {
cca.queue(); cca.queue();
} catch (Exception ex) { } catch (Exception ex) {
@ -245,18 +242,15 @@ public class Kiafumi {
} }
/* /*
Static logger info reference. Static logger references.
*/ */
public static void info(String str) { public static void info(String str) {
instance.logger.info(str); instance.logger.info(str);
} }
/*
Static Logger Error reference.
*/
public static void error(String str) { public static void error(String str) {
instance.logger.error(str); instance.logger.error(str);
} }
public static void debug(String str) { instance.logger.debug(str); }
/** /**
* Used for logging commands with ease to console via a static method. * Used for logging commands with ease to console via a static method.
@ -264,15 +258,15 @@ public class Kiafumi {
* @param msg - Any message to append with this. * @param msg - Any message to append with this.
*/ */
public static void slashLog(SlashCommandInteractionEvent event, @Nullable String msg) { public static void slashLog(SlashCommandInteractionEvent event, @Nullable String msg) {
info("User[" + event.getUser().getName() + ":" + event.getUser().getId() + "] RAN " + event.getName() + "." + (msg == null ? "" : msg)); info("User [" + event.getUser().getName() + ":" + event.getUser().getId() + "] ran command: \"" + event.getName() + "\"." + (msg == null ? "" : msg));
} }
public static void slashLog(SlashCommandInteractionEvent event) { public static void slashLog(SlashCommandInteractionEvent event) {
info("User[" + event.getUser().getName() + ":" + event.getUser().getId() + "] RAN " + event.getName() + "."); info("User [" + event.getUser().getName() + ":" + event.getUser().getId() + "] ran command: \"" + event.getName() + "\".");
} }
public static void slashResponse(SlashCommandInteractionEvent event, String msg) { public static void slashResponse(SlashCommandInteractionEvent event, String msg) {
info("User[" + event.getUser().getName() + ":" + event.getUser().getId() + "] CMD RESPONSE: " + msg); info("User [" + event.getUser().getName() + ":" + event.getUser().getId() + "] was provided response: \"" + msg + "\"");
} }
// Gets the active database. // Gets the active database.

19
src/main/java/moe/oko/Kiafumi/KiafumiConfig.java
View File

@ -65,8 +65,7 @@ public class KiafumiConfig {
*/ */
public boolean load() { public boolean load() {
try { try {
var n = System.lineSeparator(); // newline var n = System.lineSeparator() + "\033[0m"; // newline
info("Starting Discord configuration load");
// Discord loaders // Discord loaders
var discord = configuration.getConfigurationSection("discord"); var discord = configuration.getConfigurationSection("discord");
@ -76,12 +75,15 @@ public class KiafumiConfig {
mainGuild = discord.getString("mainGuild"); mainGuild = discord.getString("mainGuild");
clientId = discord.getString("clientId"); clientId = discord.getString("clientId");
defaultInvitePermissionLevel = discord.getInt("invitePermissionLevel"); defaultInvitePermissionLevel = discord.getInt("invitePermissionLevel");
// Log discord settings. // Log discord settings in a neat table.
info("Discord configuration:" +n+ info("Printing loaded discord configuration." +n+
"Log Channel: " + logChannel +n+ "DISCORD CONFIGURATION" +n+
"Owner ID: " + ownerId +n+ "--------------------------------" +n+
"Primary Guild: " + mainGuild +n+ "Log Channel: \033[0;34m" + logChannel +n+
"Invite link: " + assembleDefaultInvite()); "Owner ID: \033[0;34m" + ownerId +n+
"Primary Guild: \033[0;34m" + mainGuild +n+
"Invite URL: \033[0;34m" + assembleDefaultInvite() +n+
"--------------------------------");
// Kiafumi loaders // Kiafumi loaders
var main = configuration.getConfigurationSection("main"); var main = configuration.getConfigurationSection("main");
@ -107,7 +109,6 @@ public class KiafumiConfig {
error("Failed to load configuration!"); error("Failed to load configuration!");
return false; return false;
} }
info("Configuration Loaded.");
return true; return true;
} }

9
src/main/java/moe/oko/Kiafumi/command/CommandRegistrar.java
View File

@ -11,6 +11,7 @@ import java.util.stream.Collectors;
import static moe.oko.Kiafumi.Kiafumi.error; import static moe.oko.Kiafumi.Kiafumi.error;
import static moe.oko.Kiafumi.Kiafumi.info; import static moe.oko.Kiafumi.Kiafumi.info;
import static moe.oko.Kiafumi.Kiafumi.debug;
/** /**
* CommandRegistrar Class * CommandRegistrar Class
@ -49,13 +50,13 @@ public class CommandRegistrar {
// TODO have this check the classpath that we're under and have it scan *that* instead of hard-coding it to only be moe.oko.Kiafumi path. // TODO have this check the classpath that we're under and have it scan *that* instead of hard-coding it to only be moe.oko.Kiafumi path.
var classes = findAllClassesContaining("moe.oko.Kiafumi.command"); var classes = findAllClassesContaining("moe.oko.Kiafumi.command");
List<CommandClass> commands = new ArrayList<>(); List<CommandClass> commands = new ArrayList<>();
info("[CommandRegistrar] Discovered " + classes.size() + " classes containing moe.oko.Kiafumi.command in package class."); debug("Discovered " + classes.size() + " classes containing moe.oko.Kiafumi.command in package class.");
for (Class clazz : classes) { for (Class clazz : classes) {
for (Constructor cnstr : clazz.getConstructors()) { for (Constructor cnstr : clazz.getConstructors()) {
try { try {
var obj = cnstr.newInstance(); // making an attempt. var obj = cnstr.newInstance(); // making an attempt.
if (obj instanceof CommandClass) { if (obj instanceof CommandClass) {
info("[CommandRegistrar] Registering class " + cnstr.getName()); debug("Loading command class %green(" + cnstr.getName() + ").");
commands.add((CommandClass) obj); commands.add((CommandClass) obj);
} }
} catch (InstantiationException ex) { } catch (InstantiationException ex) {
@ -63,12 +64,12 @@ public class CommandRegistrar {
} }
} }
} }
info("[CommandRegistrar] CommandClasses loaded [" + commands.size() + "]"); info("Loaded [" + commands.size() + "] command classes.");
return commands; return commands;
} catch (IllegalAccessException | InvocationTargetException exception) { } catch (IllegalAccessException | InvocationTargetException exception) {
// Now we don't ignore, this is a core issue. // Now we don't ignore, this is a core issue.
exception.printStackTrace(); exception.printStackTrace();
error("[CommandRegistrar] Fatal failure in class loading."); error("Failure in command class loading.");
return null; return null;
} }
} }

12
src/main/java/moe/oko/Kiafumi/command/music/MusicCommand.java
View File

@ -8,7 +8,6 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;
import moe.oko.Kiafumi.command.CommandClass; import moe.oko.Kiafumi.command.CommandClass;
import moe.oko.Kiafumi.model.audio.AudioInfo; import moe.oko.Kiafumi.model.audio.AudioInfo;
import moe.oko.Kiafumi.model.audio.AudioPlayerSendHandler; import moe.oko.Kiafumi.model.audio.AudioPlayerSendHandler;
@ -133,14 +132,16 @@ public class MusicCommand extends CommandClass {
if (info.hasVoted(e.getUser())) { if (info.hasVoted(e.getUser())) {
e.getHook().sendMessage("\u26A0 You've already voted to skip this song!").queue(); e.getHook().sendMessage("\u26A0 You've already voted to skip this song!").queue();
} else { } else {
// Determine requisite votes.
int votes = info.getSkips(); int votes = info.getSkips();
int required = Math.round((info.getAuthor().getVoiceState().getChannel().getMembers().size() - 1) / 2); // Determines required amount of votes int channelUsers = info.getAuthor().getVoiceState().getChannel().getMembers().size()-1;
if (votes >= (required)){ int required = channelUsers/2;
if (votes+1 >= required){
getPlayer(e.getGuild()).stopTrack(); getPlayer(e.getGuild()).stopTrack();
e.getHook().sendMessage("\u23E9 Skipping current track.").queue(); e.getHook().sendMessage("\u23E9 Skipping current track.").queue();
} else { } else {
info.addSkip(e.getUser()); info.addSkip(e.getUser());
e.getHook().sendMessage("**" + e.getUser().getName() + "** voted to skip the track. [" + (votes + 1) + "/" + (required) + "]").queue(); e.getHook().sendMessage("**" + e.getUser().getName() + "** voted to skip the track. [" + (votes+1) + "/" + (required) + "]").queue();
} }
} }
} }
@ -149,7 +150,6 @@ public class MusicCommand extends CommandClass {
slashLog(e); slashLog(e);
e.deferReply().queue(); e.deferReply().queue();
if (isIdle(e.getHook(), e.getGuild())) return; if (isIdle(e.getHook(), e.getGuild())) return;
if (isCurrentDj(e.getMember()) || isDj(e.getMember())) { if (isCurrentDj(e.getMember()) || isDj(e.getMember())) {
forceSkipTrack(e.getGuild(), e.getHook()); forceSkipTrack(e.getGuild(), e.getHook());
} else { } else {
@ -190,7 +190,7 @@ public class MusicCommand extends CommandClass {
case "play": case "play":
e.deferReply().queue(); e.deferReply().queue();
var input = e.getOption("url").getAsString(); var input = e.getOption("url").getAsString();
slashLog(e, "INPUT " + input); slashLog(e, " With search \"" + input + "\".");
if(input.contains("https://")) { if(input.contains("https://")) {
loadTrack(input, e.getMember(), e.getHook()); loadTrack(input, e.getMember(), e.getHook());
} else { } else {

2
src/main/java/moe/oko/Kiafumi/command/utility/DuckCommand.java
View File

@ -38,7 +38,7 @@ public class DuckCommand extends CommandClass {
if ("search".equals(name)) { if ("search".equals(name)) {
e.deferReply().queue(); e.deferReply().queue();
String option = e.getOption("query").getAsString(); String option = e.getOption("query").getAsString();
slashLog(e, "WITH QUERY " + option); slashLog(e, " With search \"" + option + "\".");
WebSearch ws = WebSearch.instanceOf(); WebSearch ws = WebSearch.instanceOf();
SearchResult sr; SearchResult sr;
try { try {

4
src/main/java/moe/oko/Kiafumi/command/utility/InfoCommand.java
View File

@ -38,7 +38,7 @@ public class InfoCommand extends CommandClass {
? e.getMember() ? e.getMember()
: e.getOption("user").getAsMember(); : e.getOption("user").getAsMember();
final var dTF = DateTimeFormatter.ofPattern("MM-dd-yyyy"); final var dTF = DateTimeFormatter.ofPattern("MM-dd-yyyy");
slashLog(e, "FOR USER " + member.getUser().getName() + ":" + member.getId()); slashLog(e, " For user [" + member.getUser().getName() + ":" + member.getId() + "].");
// Build embed // Build embed
EmbedBuilder eb1 = new EmbedBuilder() EmbedBuilder eb1 = new EmbedBuilder()
.setColor(EmbedUI.INFO) .setColor(EmbedUI.INFO)
@ -56,7 +56,7 @@ public class InfoCommand extends CommandClass {
// Setup variables // Setup variables
final var guild = e.getGuild(); final var guild = e.getGuild();
final var dTF2 = DateTimeFormatter.ofPattern("MM-dd-yyyy"); final var dTF2 = DateTimeFormatter.ofPattern("MM-dd-yyyy");
slashLog(e, "FOR GUILD[" + guild.getId() + ":" + guild.getName() + "]"); slashLog(e, " For guild [" + guild.getId() + ":" + guild.getName() + "]");
// Build Embed // Build Embed
EmbedBuilder eb2 = new EmbedBuilder() EmbedBuilder eb2 = new EmbedBuilder()
.setColor(EmbedUI.INFO) .setColor(EmbedUI.INFO)

24
src/main/java/moe/oko/Kiafumi/command/utility/SettingCommand.java
View File

@ -25,7 +25,7 @@ import static moe.oko.Kiafumi.Kiafumi.slashResponse;
public class SettingCommand extends CommandClass { public class SettingCommand extends CommandClass {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
return true; //Another non-disable command return true; // Another non-disable command
} }
@Override @Override
@ -41,7 +41,7 @@ public class SettingCommand extends CommandClass {
case "settings" -> { case "settings" -> {
slashLog(e); slashLog(e);
e.deferReply().queue(); e.deferReply().queue();
//No options, just fire an embed off... // No options, just fire an embed off...
EmbedBuilder eb = new EmbedBuilder() EmbedBuilder eb = new EmbedBuilder()
.setColor(EmbedUI.INFO) .setColor(EmbedUI.INFO)
.setTitle("Kiafumi Settings") .setTitle("Kiafumi Settings")
@ -49,22 +49,21 @@ public class SettingCommand extends CommandClass {
.setFooter(EmbedUI.BRAND) .setFooter(EmbedUI.BRAND)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
e.getHook().sendMessageEmbeds(eb.build()).queue(); e.getHook().sendMessageEmbeds(eb.build()).queue();
return;
} }
case "setting" -> { case "setting" -> {
//User is attempting a settings modification. Check if admin. // User is attempting a settings modification. Check if admin.
if(!e.getMember().hasPermission(Permission.ADMINISTRATOR) && !e.getMember().isOwner()) { if(!e.getMember().hasPermission(Permission.ADMINISTRATOR) && !e.getMember().isOwner()) {
slashLog(e, "FAILED PERM CHECK"); slashLog(e, EmbedUI.RESPONSE_PRIVILEGES);
e.deferReply(true).queue(); e.deferReply(true).queue();
//Private reply, other people can't see this if ephemeral. // Private reply, other people can't see this if ephemeral.
e.getHook().sendMessage("**You cannot run this command**").queue(); e.getHook().sendMessage("**You cannot run this command.**").queue();
return; return;
} }
switch (e.getSubcommandName().toLowerCase()) { switch (e.getSubcommandName().toLowerCase()) {
case "view" -> { case "view" -> {
e.deferReply().queue(); e.deferReply().queue();
String opt = e.getOption("name").getAsString(); String opt = e.getOption("name").getAsString();
slashLog(e, "SUBCOMMAND[VIEW] FOR " + opt); slashLog(e, "With subcommand \"" + name + "\". Setting \"" + opt + "\".");
EmbedBuilder eb1 = new EmbedBuilder() EmbedBuilder eb1 = new EmbedBuilder()
.setColor(EmbedUI.INFO) .setColor(EmbedUI.INFO)
.setTitle(opt) .setTitle(opt)
@ -72,13 +71,12 @@ public class SettingCommand extends CommandClass {
.setFooter(EmbedUI.BRAND) .setFooter(EmbedUI.BRAND)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
e.getHook().sendMessageEmbeds(eb1.build()).queue(); e.getHook().sendMessageEmbeds(eb1.build()).queue();
return;
} }
case "set" -> { case "set" -> {
e.deferReply().queue(); e.deferReply().queue();
String opt1 = e.getOption("name").getAsString(); String opt1 = e.getOption("name").getAsString();
String opt2 = e.getOption("value").getAsString(); String opt2 = e.getOption("value").getAsString();
slashLog(e, "SUBCOMMAND[SET] FOR " + opt1 + " TO " + opt2); slashLog(e, "With subcommand \"" + name + "\". Setting \"" + opt1 + "\" to \"" + opt2 + "\".");
String response = server.setOptionByString(opt1, opt2); String response = server.setOptionByString(opt1, opt2);
slashResponse(e, response); slashResponse(e, response);
EmbedBuilder eb2 = new EmbedBuilder() EmbedBuilder eb2 = new EmbedBuilder()
@ -88,12 +86,11 @@ public class SettingCommand extends CommandClass {
.setFooter(EmbedUI.BRAND) .setFooter(EmbedUI.BRAND)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
e.getHook().sendMessageEmbeds(eb2.build()).queue(); e.getHook().sendMessageEmbeds(eb2.build()).queue();
return;
} }
case "clear" -> { case "clear" -> {
e.deferReply().queue(); e.deferReply().queue();
String opt3 = e.getOption("name").getAsString(); String opt3 = e.getOption("name").getAsString();
slashLog(e, "SUBCOMMAND[CLEAR] FOR " + opt3); slashLog(e, "With subcommand \"" + name + "\". Setting \"" + opt3 + "\".");
String response1 = server.resetOptionByString(opt3); String response1 = server.resetOptionByString(opt3);
slashResponse(e, response1); slashResponse(e, response1);
EmbedBuilder eb3 = new EmbedBuilder() EmbedBuilder eb3 = new EmbedBuilder()
@ -103,7 +100,6 @@ public class SettingCommand extends CommandClass {
.setFooter(EmbedUI.BRAND) .setFooter(EmbedUI.BRAND)
.setTimestamp(ZonedDateTime.now()); .setTimestamp(ZonedDateTime.now());
e.getHook().sendMessageEmbeds(eb3.build()).queue(); e.getHook().sendMessageEmbeds(eb3.build()).queue();
return;
} }
} }
} }
@ -116,7 +112,7 @@ public class SettingCommand extends CommandClass {
List<CommandInfo> si = new ArrayList<>(); List<CommandInfo> si = new ArrayList<>();
CommandInfo ci2 = new CommandInfo("setting", "Permits modification, viewing, and clearing of settings.", CommandType.COMMAND); CommandInfo ci2 = new CommandInfo("setting", "Permits modification, viewing, and clearing of settings.", CommandType.COMMAND);
//For those looking here for inspiration, you CANNOT mix options and subcommands. You can only have one or the other. // For those looking here for inspiration, you CANNOT mix options and subcommands. You can only have one or the other.
CommandInfo ci = new CommandInfo("view", "Shows the current value for the setting provided.", CommandType.SUBCOMMAND); CommandInfo ci = new CommandInfo("view", "Shows the current value for the setting provided.", CommandType.SUBCOMMAND);
ci.addOption("name", "The name of the setting to display", OptionType.STRING, true); ci.addOption("name", "The name of the setting to display", OptionType.STRING, true);

8
src/main/java/moe/oko/Kiafumi/listener/MainListener.java
View File

@ -46,8 +46,12 @@ public class MainListener extends ListenerAdapter {
*/ */
@Override @Override
public void onReady(@NotNull ReadyEvent event) { public void onReady(@NotNull ReadyEvent event) {
info("Received READY signal from Discord, bot is now logged in." + System.lineSeparator() + var n = System.lineSeparator();
" Guilds Active: " + event.getGuildAvailableCount() + " Guilds Unavailable: " + event.getGuildUnavailableCount()); info("Received READY signal from Discord, bot is now logged in." +n+
"--------------------------------" +n+
"Active Guilds: " + event.getGuildAvailableCount() +n+
"Guilds Unavailable: " + event.getGuildUnavailableCount() +n+
"--------------------------------");
} }
/** /**

5
src/main/java/moe/oko/Kiafumi/model/KiafumiDB.java
View File

@ -8,8 +8,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import static moe.oko.Kiafumi.Kiafumi.error; import static moe.oko.Kiafumi.Kiafumi.*;
import static moe.oko.Kiafumi.Kiafumi.info;
/** /**
* Kiafumi DB Class * Kiafumi DB Class
@ -126,7 +125,7 @@ public class KiafumiDB {
} }
String modRole = rs.getString(6); String modRole = rs.getString(6);
Server server = new Server(id, welcomeEnabled, welcomeChannel, joinRole, protectionEnabled, modRole); Server server = new Server(id, welcomeEnabled, welcomeChannel, joinRole, protectionEnabled, modRole);
info("Loaded: " + server); debug("Loaded " + server + "from database.");
servers.add(server); servers.add(server);
} }
return servers; return servers;

15
src/main/java/moe/oko/Kiafumi/model/ServerManager.java
View File

@ -7,8 +7,7 @@ import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import static moe.oko.Kiafumi.Kiafumi.error; import static moe.oko.Kiafumi.Kiafumi.*;
import static moe.oko.Kiafumi.Kiafumi.info;
/** /**
* ServerManager Class * ServerManager Class
@ -30,7 +29,6 @@ public class ServerManager {
} }
HashMap<String, Server> serverHashMap = new HashMap<>(); HashMap<String, Server> serverHashMap = new HashMap<>();
for(Server s : loadedServers) { for(Server s : loadedServers) {
info("Loading " + s + " into memory from db.");
serverHashMap.put(s.getId(), s); serverHashMap.put(s.getId(), s);
} }
info("Successfully loaded " + serverHashMap.size() + " servers."); info("Successfully loaded " + serverHashMap.size() + " servers.");
@ -63,16 +61,15 @@ public class ServerManager {
* @return - whether the function succeeded. * @return - whether the function succeeded.
*/ */
public boolean createNewDefaultServer(Guild guild) { public boolean createNewDefaultServer(Guild guild) {
info("Started default server creation for server " + guild.getId()); var serverName = guild.getName() + ":" + guild.getId() + "].";
debug("Creating data for [" + serverName);
Server server = new Server(guild.getId()); Server server = new Server(guild.getId());
if(Kiafumi.instance.getDatabase().createServerInformation(guild)) { if(!Kiafumi.instance.getDatabase().createServerInformation(guild)) {
info("New defaults persistent for " + server);
servers.put(server.getId(), server);
return true;
} else {
error("Failed to create new defaults for " + guild.getId()); error("Failed to create new defaults for " + guild.getId());
return false; return false;
} }
servers.put(server.getId(), server);
return true;
} }
/** /**

2
src/main/java/moe/oko/Kiafumi/util/EmbedUI.java
View File

@ -7,6 +7,7 @@ import java.awt.Color;
* @author oko * @author oko
*/ */
public abstract class EmbedUI { public abstract class EmbedUI {
// TODO: restructure & rename class - it has surpassed its scope.
/** /**
* Shorthand reference for common EmbedBuilder colors & strings. * Shorthand reference for common EmbedBuilder colors & strings.
* I chose these colors based on the Pantone Color of the year. * I chose these colors based on the Pantone Color of the year.
@ -14,6 +15,7 @@ public abstract class EmbedUI {
// Strings // Strings
public static final String BRAND = "Kiafumi - oko.moe"; public static final String BRAND = "Kiafumi - oko.moe";
public static final String RESPONSE_PRIVILEGES = " Insufficient privileges.";
// Colors // Colors
public static final Color SUCCESS = new Color(136,176,75); public static final Color SUCCESS = new Color(136,176,75);

7
src/main/resources/config.yml
View File

@ -10,7 +10,7 @@
#DISCORD CONFIG STACK #DISCORD CONFIG STACK
discord: discord:
#Paste in your bot token here. #Paste in your bot token here.
token: "DO NOT SHARE THIS" token: "DO NOT SHARE"
#The main guild the bot will recognize and do protection actions on. (Use LossPrevention for more in-depth actions!) #The main guild the bot will recognize and do protection actions on. (Use LossPrevention for more in-depth actions!)
mainGuild: "" mainGuild: ""
#The channel ID the bot will send important logging messages to. #The channel ID the bot will send important logging messages to.
@ -19,8 +19,9 @@ discord:
ownerId: "" ownerId: ""
#The client ID of the bot (for invite generation) #The client ID of the bot (for invite generation)
clientId: "" clientId: ""
#Level of permissions for the invite (If you don't know this, use https://discordapi.com/permissions.html) (ADMINISTRATOR is default) #Level of permissions for the invite (If you don't know this, use https://discordapi.com/permissions.html)
invitePermissionLevel: 8 #If problems occur, you can use 8 (Administrator)
invitePermissionLevel: 139855252544
#MAIN CONFIG STACK #MAIN CONFIG STACK
main: main:
#Currently, unimplemented, maybe in the future if performance becomes and issue. #Currently, unimplemented, maybe in the future if performance becomes and issue.

18
src/main/resources/log4j2.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" monitorInterval="30">
<Properties>
<Property name="LOG_PATTERN">%d{HH:mm} %highlight{%-5level} %cyan{%logger{7}} - %m%n</Property>
</Properties>
<Appenders>
<Console name="console" target="SYSTEM_OUT" follow="true">
<PatternLayout pattern="${LOG_PATTERN}"/>
</Console>
</Appenders>
<Loggers>
<Root level="info">
<AppenderRef ref="console"/>
</Root>
</Loggers>
</Configuration>