It now compiles! Also remove unneeded deps

This commit is contained in:
NovaFox161
2021-07-05 19:40:03 -05:00
committed by Nova Fox
parent 33060c146e
commit 12da0434fb
4 changed files with 12 additions and 30 deletions

View File

@@ -1,9 +1,11 @@
package org.dreamexposure.discal.client
import discord4j.common.store.Store
import discord4j.common.store.legacy.LegacyStoreLayout
import discord4j.core.DiscordClientBuilder
import discord4j.core.GatewayDiscordClient
import discord4j.core.`object`.presence.Activity
import discord4j.core.`object`.presence.Presence
import discord4j.core.`object`.presence.ClientActivity
import discord4j.core.`object`.presence.ClientPresence
import discord4j.core.event.domain.channel.TextChannelDeleteEvent
import discord4j.core.event.domain.lifecycle.ReadyEvent
import discord4j.core.event.domain.message.MessageCreateEvent
@@ -100,8 +102,8 @@ class DisCalClient {
.build().gateway()
.setEnabledIntents(getIntents())
.setSharding(getStrategy())
.setStoreService(getStores())
.setInitialPresence { Presence.doNotDisturb(Activity.playing("Booting Up!")) }
.setStore(Store.fromLayout(LegacyStoreLayout.of(getStores())))
.setInitialPresence { ClientPresence.doNotDisturb(ClientActivity.playing("Booting Up!")) }
.withGateway { client ->
DisCalClient.client = client
@@ -158,7 +160,7 @@ private fun getStores(): StoreService {
return if (BotSettings.USE_REDIS_STORES.get().equals("true", ignoreCase = true)) {
val uri = RedisURI.Builder
.redis(BotSettings.REDIS_HOSTNAME.get(), BotSettings.REDIS_PORT.get().toInt())
.withPassword(BotSettings.REDIS_PASSWORD.get())
.withPassword(BotSettings.REDIS_PASSWORD.get().toCharArray())
.build()
val rss = RedisStoreService.Builder()

View File

@@ -1,7 +1,7 @@
package org.dreamexposure.discal.client.service
import discord4j.core.`object`.presence.Activity
import discord4j.core.`object`.presence.Presence
import discord4j.core.`object`.presence.ClientActivity
import discord4j.core.`object`.presence.ClientPresence
import org.dreamexposure.discal.Application
import org.dreamexposure.discal.client.DisCalClient
import org.dreamexposure.discal.core.database.DatabaseManager
@@ -58,7 +58,7 @@ class StatusChanger: ApplicationRunner {
.replace("{version}", GlobalVal.version)
DisCalClient.client!!.updatePresence(Presence.online(Activity.playing(status)))
DisCalClient.client!!.updatePresence(ClientPresence.online(ClientActivity.playing(status)))
})
}

18
pom.xml
View File

@@ -41,9 +41,7 @@
<r2dbc.mysql.version>0.8.1.RELEASE</r2dbc.mysql.version>
<r2dbc.pool.version>0.8.3.RELEASE</r2dbc.pool.version>
<netty.version.forced>4.1.56.Final</netty.version.forced>
<reactor.version.bom>Dysprosium-SR21</reactor.version.bom>
<reactor.version.bom>2020.0.8</reactor.version.bom>
<discal.version.name>${revision}</discal.version.name>
@@ -127,18 +125,6 @@
<artifactId>annotations</artifactId>
<version>20.1.0</version>
</dependency>
<!-- *dies* forced due to stores-redis:lettuce-core giving 4.1.38 -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty.version.forced}</version>
</dependency>
<!-- *dies* Forced due to so many issues -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.12.2</version>
</dependency>
<!--Forcing reactor version-->
<dependency>
<groupId>io.projectreactor</groupId>
@@ -176,7 +162,7 @@
</exclusion>
</exclusions>
</dependency>
<!--r2jdbc Driver-->
<!--r2dbc Driver-->
<dependency>
<groupId>dev.miku</groupId>
<artifactId>r2dbc-mysql</artifactId>

View File

@@ -33,12 +33,6 @@
<version>${revision}</version>
<scope>compile</scope>
</dependency>
<!--JSch for SSH Tunneling-->
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.55</version>
</dependency>
<!--FlywayDB API for Database Migrations-->
<dependency>
<groupId>org.flywaydb</groupId>