diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/DisCalClient.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/DisCalClient.kt index a0063d14..1895d59c 100644 --- a/client/src/main/kotlin/org/dreamexposure/discal/client/DisCalClient.kt +++ b/client/src/main/kotlin/org/dreamexposure/discal/client/DisCalClient.kt @@ -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() diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/service/StatusChanger.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/service/StatusChanger.kt index 6c174d0e..dbb4a5bb 100644 --- a/client/src/main/kotlin/org/dreamexposure/discal/client/service/StatusChanger.kt +++ b/client/src/main/kotlin/org/dreamexposure/discal/client/service/StatusChanger.kt @@ -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))) }) } diff --git a/pom.xml b/pom.xml index 0ba7567d..ac99dc26 100644 --- a/pom.xml +++ b/pom.xml @@ -41,9 +41,7 @@ 0.8.1.RELEASE 0.8.3.RELEASE - 4.1.56.Final - - Dysprosium-SR21 + 2020.0.8 ${revision} @@ -127,18 +125,6 @@ annotations 20.1.0 - - - io.netty - netty-all - ${netty.version.forced} - - - - com.fasterxml.jackson.core - jackson-core - 2.12.2 - io.projectreactor @@ -176,7 +162,7 @@ - + dev.miku r2dbc-mysql diff --git a/server/pom.xml b/server/pom.xml index 8b93cfe5..b3bf1343 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -33,12 +33,6 @@ ${revision} compile - - - com.jcraft - jsch - 0.1.55 - org.flywaydb