From fc2ec9a162f8224f03e936ff0965b62781d0dc47 Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Tue, 2 Apr 2019 20:45:58 -0500
Subject: [PATCH] Use d4j v3.0.1, add redis stores (not working yet).

---
 .../discal/client/DisCalClient.java           | 24 +++++++++++--------
 client/src/main/resources/logback.xml         |  4 +++-
 core/pom.xml                                  |  6 ++---
 .../discal/core/object/BotSettings.java       |  4 +++-
 pom.xml                                       |  3 +++
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/client/src/main/java/org/dreamexposure/discal/client/DisCalClient.java b/client/src/main/java/org/dreamexposure/discal/client/DisCalClient.java
index da7f8a77..a5389de2 100644
--- a/client/src/main/java/org/dreamexposure/discal/client/DisCalClient.java
+++ b/client/src/main/java/org/dreamexposure/discal/client/DisCalClient.java
@@ -3,6 +3,9 @@ package org.dreamexposure.discal.client;
 import discord4j.core.DiscordClient;
 import discord4j.core.DiscordClientBuilder;
 import discord4j.core.event.domain.lifecycle.ReadyEvent;
+import discord4j.store.redis.RedisStoreService;
+import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisURI;
 import org.dreamexposure.discal.client.listeners.discal.CrossTalkEventListener;
 import org.dreamexposure.discal.client.listeners.discord.ReadyEventListener;
 import org.dreamexposure.discal.client.message.MessageManager;
@@ -81,20 +84,21 @@ public class DisCalClient {
 	 */
 	private static DiscordClient createClient() {
 		DiscordClientBuilder clientBuilder = new DiscordClientBuilder(BotSettings.TOKEN.get());
-		//Handle shard count and index.
+		//Handle shard count and index for multiple java instances
 		clientBuilder.setShardIndex(Integer.valueOf(BotSettings.SHARD_INDEX.get()));
 		clientBuilder.setShardCount(Integer.valueOf(BotSettings.SHARD_COUNT.get()));
 
-		/*
-		//Redis info + store service
-		RedisURI uri = RedisURI.Builder
-			.redis(BotSettings.REDIS_HOSTNAME.get(), Integer.valueOf(BotSettings.REDIS_PORT.get()))
-			.withPassword(BotSettings.REDIS_PASSWORD.get())
-			.build();
 
-		RedisStoreService rss = new RedisStoreService(RedisClient.create(uri));
-		clientBuilder.setStoreService(rss);
-		 */
+		//Redis info + store service for caching
+		if (BotSettings.USE_REDIS_STORES.get().equalsIgnoreCase("true")) {
+			RedisURI uri = RedisURI.Builder
+				.redis(BotSettings.REDIS_HOSTNAME.get(), Integer.valueOf(BotSettings.REDIS_PORT.get()))
+				.withPassword(BotSettings.REDIS_PASSWORD.get())
+				.build();
+
+			RedisStoreService rss = new RedisStoreService(RedisClient.create(uri));
+			clientBuilder.setStoreService(rss);
+		}
 
 		return clientBuilder.build();
 	}
diff --git a/client/src/main/resources/logback.xml b/client/src/main/resources/logback.xml
index 6cf28c96..daeaa5be 100644
--- a/client/src/main/resources/logback.xml
+++ b/client/src/main/resources/logback.xml
@@ -2,10 +2,12 @@
 <configuration scan="true">
 	<logger name="io.netty" level="INFO"/>
 	<logger name="reactor" level="INFO"/>
+	<logger name="proxy" level="info"/>
 	<logger name="reactor.retry" level="DEBUG"/>
 	<logger name="discord4j.core" level="DEBUG"/>
 	<logger name="discord4j.gateway" level="INFO"/>
 	<logger name="discord4j.gateway.client" level="DEBUG"/>
+	<logger name="io.lettuce" level="INFO"/>
 
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -13,7 +15,7 @@
 		</encoder>
 	</appender>
 
-	<root level="INFO">
+	<root level="DEBUG">
 		<appender-ref ref="CONSOLE"/>
 	</root>
 </configuration>
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index c4d916f1..cb3a95c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,16 +20,14 @@
 		<dependency>
 			<groupId>com.discord4j</groupId>
 			<artifactId>discord4j-core</artifactId>
-			<version>3.0.0</version>
+			<version>${discord4j.version}</version>
 		</dependency>
 		<!--Discord4J Redis Stores-->
-		<!--
 		<dependency>
 			<groupId>com.discord4j</groupId>
 			<artifactId>stores-redis</artifactId>
-			<version>3.0.0</version>
+			<version>${discord4j.stores.version}</version>
 		</dependency>
-		-->
 		<!-- Allows you to log events from Discord4J -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
diff --git a/core/src/main/java/org/dreamexposure/discal/core/object/BotSettings.java b/core/src/main/java/org/dreamexposure/discal/core/object/BotSettings.java
index 6215e99c..57acd8a4 100644
--- a/core/src/main/java/org/dreamexposure/discal/core/object/BotSettings.java
+++ b/core/src/main/java/org/dreamexposure/discal/core/object/BotSettings.java
@@ -19,7 +19,9 @@ public enum BotSettings {
 	CROSSTALK_SERVER_PORT, CROSSTALK_SERVER_HOST,
 	CROSSTALK_CLIENT_PORT, CROSSTALK_CLIENT_HOST,
 
-	REDIS_PASSWORD, REDIS_HOSTNAME, REDIS_PORT;
+	REDIS_PASSWORD, REDIS_HOSTNAME, REDIS_PORT,
+
+	USE_REDIS_STORES;
 
 	private String val;
 
diff --git a/pom.xml b/pom.xml
index e886c2a9..c27eac2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,9 @@
 
 		<thymeleaf.version>3.0.9.RELEASE</thymeleaf.version>
 		<thymeleaf-layout-dialect.version>2.2.1</thymeleaf-layout-dialect.version>
+
+		<discord4j.version>3.0.1</discord4j.version>
+		<discord4j.stores.version>3.0.1</discord4j.stores.version>
 	</properties>
 
 	<groupId>org.dreamexposure</groupId>