From be535ae7c35c6b6492f71a46231af7fac35bbfe1 Mon Sep 17 00:00:00 2001 From: Julius de Jeu Date: Fri, 17 Jul 2020 17:47:17 +0200 Subject: [PATCH] bump versions, make loader use non deprecated method --- build.gradle | 12 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/kotlin/nl/voidcorp/discord/Loader.kt | 2 +- .../discord/events/CommandListener.kt | 4 +- .../nl/voidcorp/discord/events/LogListener.kt | 68 ------------------- .../voidcorp/discord/events/OttoListener.kt | 2 +- 6 files changed, 10 insertions(+), 80 deletions(-) delete mode 100644 src/main/kotlin/nl/voidcorp/discord/events/LogListener.kt diff --git a/build.gradle b/build.gradle index 42bde04..cd2f086 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version '1.3.70' - id 'org.springframework.boot' version '2.2.5.RELEASE' + id 'org.jetbrains.kotlin.jvm' version '1.3.72' + id 'org.springframework.boot' version '2.3.1.RELEASE' id "io.spring.dependency-management" version "1.0.9.RELEASE" - id 'org.jetbrains.kotlin.plugin.spring' version '1.3.70' - id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.70' - id "org.jetbrains.kotlin.kapt" version "1.3.70" + id 'org.jetbrains.kotlin.plugin.spring' version '1.3.72' + id 'org.jetbrains.kotlin.plugin.jpa' version '1.3.72' + id "org.jetbrains.kotlin.kapt" version "1.3.72" } @@ -36,7 +36,7 @@ dependencies { testImplementation "org.junit.jupiter:junit-jupiter:5.4.2" - implementation 'net.dv8tion:JDA:4.1.1_101' + implementation 'net.dv8tion:JDA:4.2.0_179' runtimeOnly "com.h2database:h2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 290541c..bb8b2fc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/nl/voidcorp/discord/Loader.kt b/src/main/kotlin/nl/voidcorp/discord/Loader.kt index 8524a57..e222828 100644 --- a/src/main/kotlin/nl/voidcorp/discord/Loader.kt +++ b/src/main/kotlin/nl/voidcorp/discord/Loader.kt @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service class Loader(listeners: List, store: ConfigStore) { init { val token = System.getenv("DISCORD_TOKEN") ?: throw RuntimeException("'DISCORD_TOKEN' not set!") - val builder = DefaultShardManagerBuilder(token) + val builder = DefaultShardManagerBuilder.createDefault(token) builder.addEventListeners(listeners) diff --git a/src/main/kotlin/nl/voidcorp/discord/events/CommandListener.kt b/src/main/kotlin/nl/voidcorp/discord/events/CommandListener.kt index 42d94c6..59b619f 100644 --- a/src/main/kotlin/nl/voidcorp/discord/events/CommandListener.kt +++ b/src/main/kotlin/nl/voidcorp/discord/events/CommandListener.kt @@ -10,14 +10,12 @@ import nl.voidcorp.discord.command.CommandResult import nl.voidcorp.discord.command.CommandSettings import nl.voidcorp.discord.creator import nl.voidcorp.discord.logger -import nl.voidcorp.discord.storage.GuildRepo import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @Service class CommandListener( - @Autowired val guildRepo: GuildRepo, - @Autowired final val commands: Set, + @Autowired val commands: Set, @Autowired val commandSettings: CommandSettings ) : ListenerAdapter() { diff --git a/src/main/kotlin/nl/voidcorp/discord/events/LogListener.kt b/src/main/kotlin/nl/voidcorp/discord/events/LogListener.kt deleted file mode 100644 index a3ef71c..0000000 --- a/src/main/kotlin/nl/voidcorp/discord/events/LogListener.kt +++ /dev/null @@ -1,68 +0,0 @@ -package nl.voidcorp.discord.events - -import net.dv8tion.jda.api.EmbedBuilder -import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent -import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent -import net.dv8tion.jda.api.events.message.guild.GuildMessageUpdateEvent -import net.dv8tion.jda.api.hooks.ListenerAdapter -import nl.voidcorp.discord.jda -import nl.voidcorp.discord.storage.GuildRepo -import nl.voidcorp.discord.storage.GuildStore -import nl.voidcorp.discord.storage.MessageRepo -import nl.voidcorp.discord.storage.MessageStore -import java.awt.Color -import java.time.Clock -import java.time.LocalDateTime - -class LogListener(val repo: GuildRepo, val msg: MessageRepo) : ListenerAdapter() { - - private enum class EventType { - EDIT, - DELET - } - - override fun onGuildMessageReceived(event: GuildMessageReceivedEvent) { - msg.save(MessageStore(event.messageIdLong, event.message.contentRaw, event.guild.idLong, event.author.idLong)) - } - - override fun onGuildMessageUpdate(event: GuildMessageUpdateEvent) { - val past = msg.findByMsgId(event.messageIdLong) ?: MessageStore( - event.messageIdLong, - event.message.contentRaw, - event.guild.idLong, - event.author.idLong - ) - if (event.message.contentRaw != past.text) { - past.past.add(past.text) - past.text = event.message.contentRaw - } - msg.save(past) - sendMessageModification(past, EventType.EDIT) - } - - override fun onGuildMessageDelete(event: GuildMessageDeleteEvent) { - val past = - msg.findByMsgId(event.messageIdLong) ?: MessageStore( - event.messageIdLong, - "~~deleted~~", - event.guild.idLong, - -1 - ) - past.deleted = true - msg.save(past) - sendMessageModification(past, EventType.DELET) - } - - private fun sendMessageModification(st: MessageStore, type: EventType) { - val store = repo.findByGuildId(st.guildId) ?: GuildStore(st.guildId) - if (store.loggingChannel != null) { - val embedBuilder = EmbedBuilder().addField("Message", st.text, false) - .addField("Past", st.past.joinToString("\n"), true) - .addField("Sender", jda.getUserById(st.authorId)?.asTag ?: "someone#-1", true) - .setTitle(type.toString()).setTimestamp(LocalDateTime.now(Clock.systemUTC())) - .setColor(if (type == EventType.EDIT) Color.GREEN.brighter() else Color.RED.darker()) - jda.getTextChannelById(store.loggingChannel ?: -1)?.sendMessage(embedBuilder.build())?.queue() - } - msg.deleteInBatch(msg.findByNowBefore(LocalDateTime.now().minusDays(2))) - } -} \ No newline at end of file diff --git a/src/main/kotlin/nl/voidcorp/discord/events/OttoListener.kt b/src/main/kotlin/nl/voidcorp/discord/events/OttoListener.kt index 407689f..4fed4bb 100644 --- a/src/main/kotlin/nl/voidcorp/discord/events/OttoListener.kt +++ b/src/main/kotlin/nl/voidcorp/discord/events/OttoListener.kt @@ -16,7 +16,7 @@ class OttoListener(val configStore: ConfigStore) : ListenerAdapter() { } override fun onReconnect(event: ReconnectedEvent) { - val id = event.jda.shardInfo!!.shardId + val id = event.jda.shardInfo.shardId val reconn = event.responseNumber val version = configStore.version if(reconn >=10) exitProcess(0)