Development

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: stuffydev # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -22,3 +22,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+# Configuration files
+*.properties

Procfile

@@ -0,0 +1 @@
+worker: java -jar ./target/stuffybot-java-1.0-SNAPSHOT.jar

pom.xml

@@ -15,6 +15,7 @@
     </repositories>
     <build>
         <plugins>
+            <!-- Compiler plugin for Java 17 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -23,13 +24,56 @@
                     <target>17</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>me.stuffy.stuffybot.Bot</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>me.stuffy.stuffybot.Bot</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.15.4</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>5.0.0</version>
+            <version>6.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -39,7 +83,17 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>30.1-jre</version>
+            <version>33.4.8-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.kohsuke</groupId>
+            <artifactId>github-api</artifactId>
+            <version>1.324</version>
+        </dependency>
+        <dependency>
+            <groupId>com.opencsv</groupId>
+            <artifactId>opencsv</artifactId>
+            <version>5.5.2</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/me/stuffy/stuffybot/Bot.java

@@ -4,7 +4,8 @@
 import me.stuffy.stuffybot.events.ActiveEvents;
 import me.stuffy.stuffybot.events.UpdateBotStatsEvent;
 import me.stuffy.stuffybot.interactions.InteractionHandler;
-import me.stuffy.stuffybot.utils.DiscordUtils;
+import me.stuffy.stuffybot.profiles.GlobalData;
+import me.stuffy.stuffybot.utils.Config;
 import me.stuffy.stuffybot.utils.Logger;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -14,62 +15,127 @@
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.IntegrationType;
+import net.dv8tion.jda.api.interactions.InteractionContextType;
+import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
+import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
+import org.kohsuke.github.GitHub;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 
+import static me.stuffy.stuffybot.utils.APIUtils.connectToGitHub;
+import static me.stuffy.stuffybot.utils.APIUtils.uploadLogs;
+
 public class Bot extends ListenerAdapter {
     private static Bot INSTANCE;
     private final JDA jda;
-    private Guild homeGuild;
+    private final Guild homeGuild;
+    private static GitHub GITHUB;
+    private static GlobalData GLOBAL_DATA;
 
 
     public Bot() throws InterruptedException {
         INSTANCE = this;
         // Get token from env variable
         String token = System.getenv("BOT_TOKEN");
-        JDABuilder builder = JDABuilder.createDefault(token) ;
-        builder.setActivity(Activity.customStatus("hating slash commands"));
+        JDABuilder builder = JDABuilder.createDefault(token);
+//        builder.enableIntents(GatewayIntent.MESSAGE_CONTENT); // # TODO: Remove intents when possible
+        String customStatus = Config.getCustomStatus();
+        builder.setActivity(Activity.customStatus(customStatus));
         builder.addEventListeners(this);
         JDA jda = builder.build().awaitReady();
         this.jda = jda;
 
+        String homeGuildID = Config.getHomeGuildId();
         // Initialize home guild
-        this.homeGuild = jda.getGuildById("795108903733952562");
+        this.homeGuild = jda.getGuildById(homeGuildID);
         assert this.homeGuild != null : "Failed to find home guild";
 
-
         // Log startup
-        String time = DiscordUtils.discordTimeNow();
-        String self = jda.getSelfUser().getAsMention();
-        Logger.log("<Startup> Bot " + self + " started successfully " + time + ".");
+        String startupTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss"));
+        String self = jda.getSelfUser().getName();
+        Logger.setLogName(startupTime);
+        String environment = Config.getEnvironment();
+        Logger.log("<Startup> Bot " + self + " started successfully " + startupTime + ". Environment: " + environment);
+
+        // Initialize GitHub
+        GITHUB = connectToGitHub();
+
+        // Initialize Global Data
+        GLOBAL_DATA = new GlobalData();
 
         // Listen for interactions
         jda.addEventListener(
                 new InteractionHandler()
         );
 
         // Register commands "global"ly or "local"ly
-        registerCommands("local");
+        String environmentScope = switch (Config.getEnvironment()) {
+            case "development" -> "local";
+            case "production", "development_global" -> "global";
+            default -> throw new IllegalArgumentException("Invalid environment: " + Config.getEnvironment());
+        };
+        registerCommands(environmentScope);
 
         // Start events
         new UpdateBotStatsEvent().startFixedRateEvent();
         new ActiveEvents().startFixedRateEvent();
+
+        // Handle SIGTERM
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            Logger.log("<Shutdown> Bot shutting down, saving data...");
+
+            // Close JDA
+            jda.shutdown();
+
+            // Update Bot Stats
+            try{
+                UpdateBotStatsEvent.publicExecute();
+                Logger.log("<Shutdown> Bot Stats saved, allowing for shutdown.");
+            } catch (Exception e) {
+                Logger.log("<Shutdown> Failed to save Bot Stats, allowing for shutdown.");
+            }
+            try {
+                uploadLogs();
+                Logger.log("<Shutdown> Logs uploaded, allowing for shutdown.");
+            }
+            catch (Exception e) {
+                Logger.log("<Shutdown> Failed to upload logs, allowing for shutdown.");
+            }
+        }));
     }
     public static Bot getInstance() {
         return INSTANCE;
     }
 
+    public static GitHub getGitHub() {
+        return GITHUB;
+    }
+
+    public static GlobalData getGlobalData() {
+        return GLOBAL_DATA;
+    }
+
     public Guild getHomeGuild() {
         return this.homeGuild;
     }
 
 
     public Role getVerifiedRole() {
-        return this.homeGuild.getRoleById("795118862940635216");
+        String roleID = Config.getVerifiedRoleId();
+        return this.homeGuild.getRoleById(roleID);
+    }
+
+    public Role getNotVerifiedRole() {
+        String roleID = Config.getNotVerifiedRoleId();
+        return this.homeGuild.getRoleById(roleID);
     }
 
     public static void main(String[] args) throws InterruptedException {
@@ -93,31 +159,53 @@ public void onGuildLeave(GuildLeaveEvent event) {
         Logger.log("<Guilds> Bot left guild: " + leftGuild.getName() + " (" + leftGuild.getId() + ")");
     }
 
-    public void registerCommands(String scope) {
+    private SlashCommandData createSlashCommand(String name, String description) {
+        return Commands.slash(name, description).setContexts(InteractionContextType.ALL).setIntegrationTypes(IntegrationType.ALL);
+    }
+
+    private void registerCommands(String scope) {
         OptionData ignOption = new OptionData(OptionType.STRING, "ign", "The player's IGN", false);
+        OptionData ignOptionRequired = new OptionData(OptionType.STRING, "ign", "The player's IGN", true);
         // Create a list of commands first
         ArrayList<CommandData> commandList = new ArrayList<>();
-//        commandList.add(Commands.slash("help", "*Should* show a help message"));
-        commandList.add(Commands.slash("pit", "Get Pit stats for a player")
+        commandList.add(createSlashCommand("help", "Learn about the bot and its commands"));
+        commandList.add(createSlashCommand("pit", "Get Pit stats for a player")
                 .addOptions(ignOption));
-        commandList.add(Commands.slash("stats", "Get Hypixel stats for a player")
+        commandList.add(createSlashCommand("stats", "Get Hypixel stats for a player")
                 .addOptions(ignOption));
-        commandList.add(Commands.slash("tkr", "Get TKR stats for a player")
+        commandList.add(createSlashCommand("tkr", "Get TKR stats for a player")
                 .addOptions(ignOption));
-        commandList.add(Commands.slash("maxes", "Get maxed games for a player")
+        commandList.add(createSlashCommand("maxes", "Get maxed games for a player")
                 .addOptions(ignOption));
-        commandList.add(Commands.slash("blitz", "Get Blitz Ultimate Kit xp for a player")
+        commandList.add(createSlashCommand("blitz", "Get Blitz Ultimate Kit xp for a player")
                 .addOptions(ignOption));
-        commandList.add(Commands.slash("megawalls", "Get Mega Walls skins for a player")
+        commandList.add(createSlashCommand("megawalls", "Get Mega Walls skins for a player")
                 .addOptions(ignOption)
                 .addOptions(new OptionData(OptionType.STRING, "skins", "Which skins to look at", false).setAutoComplete(true)));
-        commandList.add(Commands.slash("tournament", "Get tournament stats for a player")
+        commandList.add(createSlashCommand("tournament", "Get tournament stats for a player")
                 .addOptions(ignOption)
                 .addOptions(new OptionData(OptionType.INTEGER, "tournament", "Which tournament to look at (Leave empty for latest)", false).setAutoComplete(true)));
+        commandList.add(createSlashCommand("achievements", "Get achievement stats for a player")
+                .addOptions(ignOption)
+                .addOptions(new OptionData(OptionType.STRING, "game", "Which game to look at", false).setAutoComplete(true))
+                .addOptions(new OptionData(OptionType.STRING, "type", "Which achievements to look at", false).addChoices(
+                        new Command.Choice("All", "all"),
+                        new Command.Choice("Challenge", "challenge"),
+                        new Command.Choice("Tiered", "tiered")
+                        )
+                ));
+        commandList.add(createSlashCommand("link", "Link a Minecraft account so you don't have to type your IGN every time")
+                .addOptions(ignOptionRequired));
+        commandList.add(createSlashCommand("playcommand", "Lookup the command to quickly hop into a game")
+                .addOptions(new OptionData(OptionType.STRING, "game", "Search for a play command", true).setAutoComplete(true)));
+        commandList.add(createSlashCommand("search", "Search for an achievement by name, or description.")
+                .addOptions(new OptionData(OptionType.STRING, "search", "Search for an Achievement", true).setAutoComplete(true)));
+        commandList.add(createSlashCommand("uuid", "Get UUID info for a Minecraft player")
+                .addOptions(ignOptionRequired));
 
 
         if (scope.equals("local")) {
-            //clearLocalCommands();
+            jda.updateCommands().queue();
             this.homeGuild.updateCommands().addCommands(
                     commandList
             ).queue();
@@ -130,15 +218,14 @@ public void registerCommands(String scope) {
         } else {
             throw new IllegalArgumentException("Invalid scope: " + scope);
         }
-    }
-
-    public void clearCommands() {
-        jda.updateCommands().queue();
-        Logger.log("<Commands> Successfully cleared commands.");
-    }
 
-    public void clearLocalCommands() {
-        this.homeGuild.updateCommands().queue();
-        Logger.log("<Commands> Successfully cleared local commands.");
+        // Setup commands for home guild only
+        this.homeGuild.upsertCommand(
+                Commands.slash("setup", "Home guild setup command")
+                        .setDefaultPermissions(DefaultMemberPermissions.DISABLED)
+                        .addOptions(new OptionData(OptionType.STRING, "tosetup", "Which thing you wish to Setup", true).addChoices(
+                            new Command.Choice("Verify", "verify")
+                        ))
+        ).queue();
     }
 }