more env variables

kr45732 · Jun 27, 2024 · 1efd7b2 · 1efd7b2
1 parent 97e0e46
commit 1efd7b2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/setup-resources/ExampleDevSettings.properties b/setup-resources/ExampleDevSettings.properties
@@ -35,12 +35,18 @@ BOT_STATUS_CHANNEL_ID =
 # text channel in PRIMARY_GUILD where networth bug reports are logged to
 NETWORTH_BUG_REPORT_CHANNEL_ID =
 
-# text channel where NEU-repo updates are forward to (see step 6 in README)
+# text channel where NEU-repo updates are forwarded to (see step 6 in README)
 NEU_REPO_UPDATE_CHANNEL_ID =
 
-# GitHub link to your clone of https://github.com/kr45732/skyblock-plus-data formatted as is "username/repo" (e.g. "kr45732/skyblock-plus-data")
+# text channel where your self-hosted https://github.com/kr45732/rust-query-api webhook logs too
+QUERY_API_LOG_CHANNEL_ID =
+
+# GitHub link to your clone of https://github.com/kr45732/skyblock-plus-data formatted as "username/repo" (e.g. "kr45732/skyblock-plus-data")
 DATA_REPO_GITHUB =
 
+# email used for automatic GitHub commits in the data repo (e.g. "52721908+kr45732@users.noreply.github.com")
+GITHUB_EMAIL =
+
 # used for prefix commands (mainly dev commands)
 # requires message content intent to be enabled to use prefix
 # if you don't have the message content intent & want to use prefix commands, then just mention the bot instead of a prefix

diff --git a/src/main/java/com/skyblockplus/utils/AuctionFlipper.java b/src/main/java/com/skyblockplus/utils/AuctionFlipper.java
@@ -54,7 +54,7 @@ public class AuctionFlipper {
 
 	public static void onGuildMessageReceived(MessageReceivedEvent event) {
 		try {
-			if (event.getChannel().getId().equals("958771784004567063") && event.isWebhookMessage()) {
+			if (event.getChannel().getId().equals(QUERY_API_LOG_CHANNEL_ID) && event.isWebhookMessage()) {
 				String desc = event.getMessage().getEmbeds().get(0).getDescription();
 				if (desc.contains(" query auctions into database in ")) {
 					resetQueryItems();

diff --git a/src/main/java/com/skyblockplus/utils/utils/Utils.java b/src/main/java/com/skyblockplus/utils/utils/Utils.java
@@ -188,6 +188,8 @@ public class Utils {
 	public static String BOT_STATUS_CHANNEL_ID = "";
 	public static String NEU_REPO_UPDATE_CHANNEL_ID = "";
 	public static String DATA_REPO_GITHUB = "";
+	public static String GITHUB_EMAIL = "";
+	public static String QUERY_API_LOG_CHANNEL_ID = "";
 	public static TextChannel errorLogChannel;
 	public static ShardManager jda;
 	public static Database database;
@@ -321,6 +323,8 @@ public static void initialize() {
 			BOT_STATUS_CHANNEL_ID = (String) appProps.get("BOT_STATUS_CHANNEL_ID");
 			NEU_REPO_UPDATE_CHANNEL_ID = (String) appProps.get("NEU_REPO_UPDATE_CHANNEL_ID");
 			DATA_REPO_GITHUB = (String) appProps.get("DATA_REPO_GITHUB");
+			GITHUB_EMAIL = (String) appProps.get("GITHUB_EMAIL");
+			QUERY_API_LOG_CHANNEL_ID = (String) appProps.get("QUERY_API_LOG_CHANNEL_ID");
 		} catch (IOException e) {
 			HYPIXEL_API_KEY = System.getenv("HYPIXEL_API_KEY");
 			BOT_TOKEN = System.getenv("BOT_TOKEN");
@@ -352,6 +356,8 @@ public static void initialize() {
 			BOT_STATUS_CHANNEL_ID = System.getenv("BOT_STATUS_CHANNEL_ID");
 			NEU_REPO_UPDATE_CHANNEL_ID = System.getenv("NEU_REPO_UPDATE_CHANNEL_ID");
 			DATA_REPO_GITHUB = System.getenv("DATA_REPO_GITHUB");
+			GITHUB_EMAIL = System.getenv("GITHUB_EMAIL");
+			QUERY_API_LOG_CHANNEL_ID = System.getenv("QUERY_API_LOG_CHANNEL_ID");
 		}
 	}
 
@@ -871,8 +877,8 @@ public static void updateDataRepo() {
 				skyblockPlusDataRepo
 					.commit()
 					.setAllowEmpty(false)
-					.setAuthor("kr45732", "52721908+kr45732@users.noreply.github.com")
-					.setCommitter("kr45732", "52721908+kr45732@users.noreply.github.com")
+					.setAuthor("Skyblock Plus", GITHUB_EMAIL)
+					.setCommitter("Skyblock Plus", GITHUB_EMAIL)
 					.setMessage("Automatic update (" + neuRepo.log().setMaxCount(1).call().iterator().next().getName() + ")")
 					.call();
 				skyblockPlusDataRepo.push().setCredentialsProvider(new UsernamePasswordCredentialsProvider(GITHUB_TOKEN, "")).call();