From 354933d5c0bb9dcc3170fde5e14bec6a38aa04b5 Mon Sep 17 00:00:00 2001 From: allison <67673392+Allybe@users.noreply.github.com> Date: Wed, 26 Aug 2026 22:41:16 -0500 Subject: [PATCH] more worky --- pom.xml | 35 ++++++++++++--- src/main/java/tech/allydoes/Constants.java | 9 ++++ src/main/java/tech/allydoes/Main.java | 1 - .../allydoes/database/DatabaseManager.java | 43 +++++-------------- .../tech/allydoes/discord/DiscordManager.java | 4 +- .../tech/allydoes/web/POST/PostStatus.java | 1 - 6 files changed, 49 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 2fc9fef..7233dbf 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ 4.2.17.Final 2.25.4 6.5.0 - 3.2.0 42.7.13 @@ -60,16 +59,38 @@ - - io.github.cdimascio - dotenv-java - ${dot.version} - - org.postgresql postgresql ${postgresql.version} + + + + + maven-assembly-plugin + 3.6.0 + + + + tech.allydoes.Main + + + + dep + + + + + make-assembly + package + + single + + + + + + \ No newline at end of file diff --git a/src/main/java/tech/allydoes/Constants.java b/src/main/java/tech/allydoes/Constants.java index eafafb0..5803e8a 100644 --- a/src/main/java/tech/allydoes/Constants.java +++ b/src/main/java/tech/allydoes/Constants.java @@ -3,4 +3,13 @@ package tech.allydoes; public class Constants { public static final boolean PRODUCTION = true; public static final String TESTING_GUILD = "926369143186403329"; + + public static final String BOT_TOKEN = "MTU0MjMzMDM2OTc1MDMzOTcwNQ.G3V2nZ.JHs0uiA_naF4XW2sJOXsokoVMB9koRKIRtzrr8"; + public static final String TESTING_TOKEN = "MTEzMTIzNzM2ODA2Njc0MDMyNA.GsjDqa.aS5Rrvo-JMHF5tUnOXOUqPCsUWONNcF8H7Dp7c"; + + public static final String DB_USER = "postgres"; + public static final String DB_PASSWORD = "Senator46Aqua6Outward6Resolved6Bargraph6Dotted"; + public static final String DB_HOST = "localhost"; + public static final String DB_PORT = "5432"; + } diff --git a/src/main/java/tech/allydoes/Main.java b/src/main/java/tech/allydoes/Main.java index 8e33568..cc34506 100644 --- a/src/main/java/tech/allydoes/Main.java +++ b/src/main/java/tech/allydoes/Main.java @@ -1,6 +1,5 @@ package tech.allydoes; -import io.github.cdimascio.dotenv.Dotenv; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; diff --git a/src/main/java/tech/allydoes/database/DatabaseManager.java b/src/main/java/tech/allydoes/database/DatabaseManager.java index 010cc5b..9702272 100644 --- a/src/main/java/tech/allydoes/database/DatabaseManager.java +++ b/src/main/java/tech/allydoes/database/DatabaseManager.java @@ -1,28 +1,22 @@ package tech.allydoes.database; -import io.github.cdimascio.dotenv.Dotenv; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import tech.allydoes.Constants; import java.sql.*; import java.util.ArrayList; public class DatabaseManager { private final Logger LOGGER = LogManager.getLogger(DatabaseManager.class); - private final Dotenv dotenv = Dotenv.load(); public DatabaseManager() { initializeDatabase(); } private void initializeDatabase() { - String user = dotenv.get("DB_USER"); - String password = dotenv.get("DB_PASSWORD"); - String host = dotenv.get("DB_HOST"); - String port = dotenv.get("DB_PORT"); - - String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/postgres", host, port); - try (Connection conn = DriverManager.getConnection(defaultDbUrl, user, password)) { + String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/postgres", Constants.DB_HOST, Constants.DB_PORT); + try (Connection conn = DriverManager.getConnection(defaultDbUrl, Constants.DB_USER, Constants.DB_PASSWORD)) { conn.setAutoCommit(true); boolean dbExists = false; @@ -49,8 +43,8 @@ public class DatabaseManager { LOGGER.error("Database initialization failed on default DB: {}", e.getMessage()); } - String notifierDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", host, port); - try (Connection conn = DriverManager.getConnection(notifierDbUrl, user, password)) { + String notifierDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", Constants.DB_HOST, Constants.DB_PORT); + try (Connection conn = DriverManager.getConnection(notifierDbUrl, Constants.DB_USER, Constants.DB_PASSWORD)) { try (Statement statement = conn.createStatement()) { statement.executeUpdate(Queries.CREATE_SERVER_TABLE); LOGGER.debug("Server table verified/created successfully."); @@ -63,14 +57,9 @@ public class DatabaseManager { } public ArrayList getAllNotifiers() { - String user = dotenv.get("DB_USER"); - String password = dotenv.get("DB_PASSWORD"); - String host = dotenv.get("DB_HOST"); - String port = dotenv.get("DB_PORT"); - ArrayList notified = new ArrayList<>(); - String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", host, port); - try (Connection conn = DriverManager.getConnection(defaultDbUrl, user, password)) { + String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", Constants.DB_HOST, Constants.DB_PORT); + try (Connection conn = DriverManager.getConnection(defaultDbUrl, Constants.DB_USER, Constants.DB_PASSWORD)) { conn.setAutoCommit(true); try (Statement statement = conn.createStatement()) { @@ -92,13 +81,8 @@ public class DatabaseManager { } public void putNotifier(String guildId, String channelId, String messageId) { - String user = dotenv.get("DB_USER"); - String password = dotenv.get("DB_PASSWORD"); - String host = dotenv.get("DB_HOST"); - String port = dotenv.get("DB_PORT"); - - String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", host, port); - try (Connection conn = DriverManager.getConnection(defaultDbUrl, user, password)) { + String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", Constants.DB_HOST, Constants.DB_PORT); + try (Connection conn = DriverManager.getConnection(defaultDbUrl, Constants.DB_USER, Constants.DB_PASSWORD)) { conn.setAutoCommit(true); try (PreparedStatement preparedStatement = conn.prepareStatement(Queries.INSERT_SERVER_CHANNEL)) { @@ -115,13 +99,8 @@ public class DatabaseManager { } public void deleteNotifier(String guildId) { - String user = dotenv.get("DB_USER"); - String password = dotenv.get("DB_PASSWORD"); - String host = dotenv.get("DB_HOST"); - String port = dotenv.get("DB_PORT"); - - String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", host, port); - try (Connection conn = DriverManager.getConnection(defaultDbUrl, user, password)) { + String defaultDbUrl = String.format("jdbc:postgresql://%s:%s/notifier", Constants.DB_HOST, Constants.DB_PORT); + try (Connection conn = DriverManager.getConnection(defaultDbUrl, Constants.DB_USER, Constants.DB_PASSWORD)) { conn.setAutoCommit(true); try (PreparedStatement preparedStatement = conn.prepareStatement(Queries.DELETE_SERVER_CHANNEL)) { diff --git a/src/main/java/tech/allydoes/discord/DiscordManager.java b/src/main/java/tech/allydoes/discord/DiscordManager.java index 426fd44..bee2245 100644 --- a/src/main/java/tech/allydoes/discord/DiscordManager.java +++ b/src/main/java/tech/allydoes/discord/DiscordManager.java @@ -1,6 +1,5 @@ package tech.allydoes.discord; -import io.github.cdimascio.dotenv.Dotenv; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Activity; @@ -23,14 +22,13 @@ public class DiscordManager { public final Logger LOGGER; private final JDA jda; private final HashMap commands; - private final Dotenv dotenv = Dotenv.load(); public DiscordManager() throws InterruptedException { LOGGER = LogManager.getLogger(DiscordManager.class); commands = new HashMap<>(); commands.put("savechannel", new SaveChannelCommand()); - String botToken = Constants.PRODUCTION ? dotenv.get("DISCORD_TOKEN") : dotenv.get("TESTING_TOKEN"); + String botToken = Constants.PRODUCTION ? Constants.BOT_TOKEN : Constants.TESTING_TOKEN; jda = JDABuilder .create(botToken, GatewayIntent.GUILD_MESSAGES) .addEventListeners(new SlashCommandInteractionListener()) diff --git a/src/main/java/tech/allydoes/web/POST/PostStatus.java b/src/main/java/tech/allydoes/web/POST/PostStatus.java index bf1fd42..87024eb 100644 --- a/src/main/java/tech/allydoes/web/POST/PostStatus.java +++ b/src/main/java/tech/allydoes/web/POST/PostStatus.java @@ -7,7 +7,6 @@ import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpResponseStatus; import tech.allydoes.Main; import tech.allydoes.discord.DiscordManager; -import tech.allydoes.web.HttpServerHandler; import tech.allydoes.web.RequestHandler; import java.util.List;