Fix Heroku Key-Value Store connection and remove Reddit (#83)

* Update Gradle and JDK

* Remove Reddit skill

* Modify Lettuce connection to match Heroku recommended setup

Author: yttrian

README.md

@@ -22,10 +22,9 @@ In order to host your own copy of Glyph, some set up will be required.
    - All references entities must be understood too
    - A free ("Trial") plan is sufficient
    - You should disable "Log interaction to Dialogflow"
-2. Create a Reddit application for the Reddit skill
-3. Create a PostgreSQL database and Redis data store
-4. Set the needed environment variables as seen in the application.conf files
-5. Build and start the bot and config website
+2. Create a PostgreSQL database and Redis data store
+3. Set the needed environment variables as seen in the application.conf files
+4. Build and start the bot and config website
 
 ## License
 

build.gradle.kts

@@ -22,7 +22,7 @@ subprojects {
 
     dependencies {
         implementation("net.dv8tion:JDA:$jdaVersion")
-        implementation("io.lettuce:lettuce-core:6.0.0.M1")
+        implementation("io.lettuce:lettuce-core:6.4.0.RELEASE")
         implementation("ch.qos.logback:logback-classic:$logbackVersion")
         testImplementation(kotlin("test"))
     }

docs/skills.rst

@@ -127,18 +127,6 @@ Example phrases:
 - roles list
 - list roles
 
-Images
-------
-Glyph can pull images from Reddit_ when asked. As of right now, these can either be memes, cats, snakes, birds, dogs and lizards.
-
-.. _Reddit: https://reddit.com/
-
-Example phrases:
-
-- image from **coaxedintoasnafu**
-- image from **youdontsurf**
-- **meme**
-
 QuickView
 ---------
 Glyph can post helpful embeds that include additional information for links from `Fur Affinity`_ and Picarto_. This feature can be controlled in the :doc:`/configuration`.
@@ -229,4 +217,4 @@ There are a few other tiny fun/easter egg skills that are so small they don't de
 Some hints are to what they are are NumberWang, Dad jokes, jokes, the Doomsday Clock, `snowstamp`_, magic 8-ball and a few others.
 
 .. _snowstamp: https://pixelatomy.com/snow-stamp/
-.. _official server: https://gl.yttr.org/server
+.. _official server: https://gl.yttr.org/server

glyph-bot/build.gradle.kts

@@ -24,7 +24,6 @@ dependencies {
     implementation("club.minnced:discord-webhooks:0.5.7")
     implementation("com.google.cloud:google-cloud-storage:1.106.0")
     implementation("com.google.cloud:google-cloud-dialogflow:1.0.0")
-    implementation("net.dean.jraw:JRAW:1.1.0")
     implementation("org.ocpsoft.prettytime:prettytime:4.0.4.Final")
     implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
     implementation("io.ktor:ktor-client-json-jvm:$ktorVersion")

glyph-bot/src/main/kotlin/Glyph.kt

@@ -20,19 +20,30 @@ import org.yttr.glyph.bot.skills.SkillDirector
 import org.yttr.glyph.bot.skills.config.ConfigDirector
 import org.yttr.glyph.bot.skills.config.ServerConfigSkill
 import org.yttr.glyph.bot.skills.creator.ChangeStatusSkill
-import org.yttr.glyph.bot.skills.moderation.*
+import org.yttr.glyph.bot.skills.moderation.AuditingDirector
+import org.yttr.glyph.bot.skills.moderation.BanSkill
+import org.yttr.glyph.bot.skills.moderation.GuildInfoSkill
+import org.yttr.glyph.bot.skills.moderation.KickSkill
+import org.yttr.glyph.bot.skills.moderation.PurgeSkill
+import org.yttr.glyph.bot.skills.moderation.UserInfoSkill
 import org.yttr.glyph.bot.skills.play.DoomsdayClockSkill
 import org.yttr.glyph.bot.skills.play.EphemeralSaySkill
 import org.yttr.glyph.bot.skills.play.RankSkill
-import org.yttr.glyph.bot.skills.play.RedditSkill
 import org.yttr.glyph.bot.skills.roles.RoleListSkill
 import org.yttr.glyph.bot.skills.roles.RoleSetSkill
 import org.yttr.glyph.bot.skills.roles.RoleUnsetSkill
 import org.yttr.glyph.bot.skills.starboard.StarboardDirector
-import org.yttr.glyph.bot.skills.util.*
+import org.yttr.glyph.bot.skills.util.FallbackSkill
+import org.yttr.glyph.bot.skills.util.FeedbackSkill
+import org.yttr.glyph.bot.skills.util.HelpSkill
+import org.yttr.glyph.bot.skills.util.SnowstampSkill
+import org.yttr.glyph.bot.skills.util.SourceSkill
+import org.yttr.glyph.bot.skills.util.StatusSkill
+import org.yttr.glyph.bot.skills.util.TimeSkill
 import org.yttr.glyph.bot.skills.wiki.WikiSkill
 import org.yttr.glyph.shared.pubsub.redis.RedisAsync
 
+
 /**
  * The Glyph object to use when building the client
  */
@@ -49,13 +60,14 @@ object Glyph {
 
     private val aiAgent: AIAgent = Dialogflow(conf.getString("dialogflow.credentials").byteInputStream())
 
-    private val redis: RedisAsync = RedisClient.create().run {
-        val redisUri = RedisURI.create(conf.getString("data.redis-url")).apply {
-            // We are using Heroku Redis which is version 5, but for some reason they give us a username.
-            // However if we supply the username it runs the version 6 command and fails to login.
-            username = null
-        }
-        connect(redisUri).async()
+    private val redis: RedisAsync = let {
+        // https://devcenter.heroku.com/articles/connecting-heroku-redis#lettuce
+        val uri = RedisURI.create(conf.getString("data.redis-url"))
+        uri.isVerifyPeer = false
+
+        val client = RedisClient.create(uri)
+        val connection = client.connect()
+        connection.async()
     }
 
     private val configDirector = ConfigDirector {
@@ -77,7 +89,6 @@ object Glyph {
         BanSkill(),
         RankSkill(),
         EphemeralSaySkill(),
-        RedditSkill(),
         WikiSkill(),
         TimeSkill(),
         FeedbackSkill(),

glyph-bot/src/main/kotlin/skills/play/RedditSkill.kt

@@ -27,14 +27,4 @@ glyph {
   }
   // Bot list website statistics
   bot-list.top = ${?DISCORDBOTLIST_TOKEN}
-  // Skills related settings
-  skills {
-    // Reddit authentication
-    reddit {
-      // Your username, do not lie to Reddit
-      username = ${REDDIT_USERNAME}
-      client-id = ${REDDIT_CLIENT_ID}
-      client-secret = ${REDDIT_CLIENT_SECRET}
-    }
-  }
 }

glyph-bot/src/main/resources/application.conf

@@ -12,5 +12,4 @@
     <logger name="io.lettuce.core.protocol.ConnectionWatchdog" level="WARN"/>
     <logger name="io.lettuce.core.protocol.ReconnectionHandler" level="WARN"/>
     <logger name="club.minnced.discord.webhook.WebhookClient" level="OFF"/>
-    <logger name="RedditSkill" level="DEBUG"/>
 </configuration>

glyph-bot/src/main/resources/logback.xml

@@ -7,5 +7,5 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
-    implementation("org.postgresql:postgresql:42.3.3")
+    implementation("org.postgresql:postgresql:42.7.4")
 }

glyph-shared/build.gradle.kts

@@ -26,7 +26,13 @@ class RedisPubSub(configure: Config.() -> Unit) : PubSub {
     }
 
     private val config = Config().also(configure)
-    private val redis = RedisClient.create(RedisURI.create(config.redisConnectionUri).apply { username = null })
+    private val redis = let {
+        // https://devcenter.heroku.com/articles/connecting-heroku-redis#lettuce
+        val uri = RedisURI.create(config.redisConnectionUri)
+        uri.isVerifyPeer = false
+
+        RedisClient.create(uri)
+    }
     private val redisCommandsAsync = redis.connect().async()
     private val redisPubSubConnection: StatefulRedisPubSub = redis.connectPubSub()