Merge pull request #326 from HyacinthBots/develop

Release 4.6.1
HyacinthBots · Jan 15, 2023 · 7e60b6e · 7e60b6e
2 parents 7f83060 + c2b0a5b
commit 7e60b6e
Show file tree

Hide file tree

Showing 43 changed files with 36 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 }
 
 group = "org.hyacinthbots.lilybot"
-version = "4.6.0"
+version = "4.6.1"
 
 repositories {
     mavenCentral()
@@ -31,6 +31,11 @@ repositories {
         url = uri("https://oss.sonatype.org/content/repositories/snapshots")
     }
 
+	maven {
+		name = "Sonatype Snapshots S01"
+		url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+	}
+
     maven {
         name = "Fabric"
         url = uri("https://maven.fabricmc.net/")

diff --git a/docs/changelogs/2.0.0.md → docs/changelogs/2.x.x/2.0.0.md b/docs/changelogs/2.0.0.md → docs/changelogs/2.x.x/2.0.0.md
diff --git a/docs/changelogs/2.0.1.md → docs/changelogs/2.x.x/2.0.1.md b/docs/changelogs/2.0.1.md → docs/changelogs/2.x.x/2.0.1.md
diff --git a/docs/changelogs/2.1.0.md → docs/changelogs/2.x.x/2.1.0.md b/docs/changelogs/2.1.0.md → docs/changelogs/2.x.x/2.1.0.md
diff --git a/docs/changelogs/3.0.0.md → docs/changelogs/3.x.x/3.0.0.md b/docs/changelogs/3.0.0.md → docs/changelogs/3.x.x/3.0.0.md
diff --git a/docs/changelogs/3.1.0.md → docs/changelogs/3.x.x/3.1.0.md b/docs/changelogs/3.1.0.md → docs/changelogs/3.x.x/3.1.0.md
diff --git a/docs/changelogs/3.1.1.md → docs/changelogs/3.x.x/3.1.1.md b/docs/changelogs/3.1.1.md → docs/changelogs/3.x.x/3.1.1.md
diff --git a/docs/changelogs/3.2.0.md → docs/changelogs/3.x.x/3.2.0.md b/docs/changelogs/3.2.0.md → docs/changelogs/3.x.x/3.2.0.md
diff --git a/docs/changelogs/3.2.1.md → docs/changelogs/3.x.x/3.2.1.md b/docs/changelogs/3.2.1.md → docs/changelogs/3.x.x/3.2.1.md
diff --git a/docs/changelogs/3.2.2.md → docs/changelogs/3.x.x/3.2.2.md b/docs/changelogs/3.2.2.md → docs/changelogs/3.x.x/3.2.2.md
diff --git a/docs/changelogs/3.3.0.md → docs/changelogs/3.x.x/3.3.0.md b/docs/changelogs/3.3.0.md → docs/changelogs/3.x.x/3.3.0.md
diff --git a/docs/changelogs/3.3.1.md → docs/changelogs/3.x.x/3.3.1.md b/docs/changelogs/3.3.1.md → docs/changelogs/3.x.x/3.3.1.md
diff --git a/docs/changelogs/3.3.2.md → docs/changelogs/3.x.x/3.3.2.md b/docs/changelogs/3.3.2.md → docs/changelogs/3.x.x/3.3.2.md
diff --git a/docs/changelogs/3.3.3.md → docs/changelogs/3.x.x/3.3.3.md b/docs/changelogs/3.3.3.md → docs/changelogs/3.x.x/3.3.3.md
diff --git a/docs/changelogs/3.4.0.md → docs/changelogs/3.x.x/3.4.0.md b/docs/changelogs/3.4.0.md → docs/changelogs/3.x.x/3.4.0.md
diff --git a/docs/changelogs/3.4.1.md → docs/changelogs/3.x.x/3.4.1.md b/docs/changelogs/3.4.1.md → docs/changelogs/3.x.x/3.4.1.md
diff --git a/docs/changelogs/3.4.2.md → docs/changelogs/3.x.x/3.4.2.md b/docs/changelogs/3.4.2.md → docs/changelogs/3.x.x/3.4.2.md
diff --git a/docs/changelogs/3.4.3.md → docs/changelogs/3.x.x/3.4.3.md b/docs/changelogs/3.4.3.md → docs/changelogs/3.x.x/3.4.3.md
diff --git a/docs/changelogs/3.4.4.md → docs/changelogs/3.x.x/3.4.4.md b/docs/changelogs/3.4.4.md → docs/changelogs/3.x.x/3.4.4.md
diff --git a/docs/changelogs/3.4.5.md → docs/changelogs/3.x.x/3.4.5.md b/docs/changelogs/3.4.5.md → docs/changelogs/3.x.x/3.4.5.md
diff --git a/docs/changelogs/3.4.6.md → docs/changelogs/3.x.x/3.4.6.md b/docs/changelogs/3.4.6.md → docs/changelogs/3.x.x/3.4.6.md
diff --git a/docs/changelogs/3.5.0.md → docs/changelogs/3.x.x/3.5.0.md b/docs/changelogs/3.5.0.md → docs/changelogs/3.x.x/3.5.0.md
diff --git a/docs/changelogs/3.5.1.md → docs/changelogs/3.x.x/3.5.1.md b/docs/changelogs/3.5.1.md → docs/changelogs/3.x.x/3.5.1.md
diff --git a/docs/changelogs/3.5.2.md → docs/changelogs/3.x.x/3.5.2.md b/docs/changelogs/3.5.2.md → docs/changelogs/3.x.x/3.5.2.md
diff --git a/docs/changelogs/3.5.3.md → docs/changelogs/3.x.x/3.5.3.md b/docs/changelogs/3.5.3.md → docs/changelogs/3.x.x/3.5.3.md
diff --git a/docs/changelogs/3.5.4.md → docs/changelogs/3.x.x/3.5.4.md b/docs/changelogs/3.5.4.md → docs/changelogs/3.x.x/3.5.4.md
diff --git a/docs/changelogs/3.5.5.md → docs/changelogs/3.x.x/3.5.5.md b/docs/changelogs/3.5.5.md → docs/changelogs/3.x.x/3.5.5.md
diff --git a/docs/changelogs/4.0.0.md → docs/changelogs/4.x.x/4.0.0.md b/docs/changelogs/4.0.0.md → docs/changelogs/4.x.x/4.0.0.md
diff --git a/docs/changelogs/4.0.1.md → docs/changelogs/4.x.x/4.0.1.md b/docs/changelogs/4.0.1.md → docs/changelogs/4.x.x/4.0.1.md
diff --git a/docs/changelogs/4.1.0.md → docs/changelogs/4.x.x/4.1.0.md b/docs/changelogs/4.1.0.md → docs/changelogs/4.x.x/4.1.0.md
diff --git a/docs/changelogs/4.1.1.md → docs/changelogs/4.x.x/4.1.1.md b/docs/changelogs/4.1.1.md → docs/changelogs/4.x.x/4.1.1.md
diff --git a/docs/changelogs/4.2.0.md → docs/changelogs/4.x.x/4.2.0.md b/docs/changelogs/4.2.0.md → docs/changelogs/4.x.x/4.2.0.md
diff --git a/docs/changelogs/4.3.0.md → docs/changelogs/4.x.x/4.3.0.md b/docs/changelogs/4.3.0.md → docs/changelogs/4.x.x/4.3.0.md
diff --git a/docs/changelogs/4.4.0.md → docs/changelogs/4.x.x/4.4.0.md b/docs/changelogs/4.4.0.md → docs/changelogs/4.x.x/4.4.0.md
diff --git a/docs/changelogs/4.4.1.md → docs/changelogs/4.x.x/4.4.1.md b/docs/changelogs/4.4.1.md → docs/changelogs/4.x.x/4.4.1.md
diff --git a/docs/changelogs/4.4.2.md → docs/changelogs/4.x.x/4.4.2.md b/docs/changelogs/4.4.2.md → docs/changelogs/4.x.x/4.4.2.md
diff --git a/docs/changelogs/4.5.0.md → docs/changelogs/4.x.x/4.5.0.md b/docs/changelogs/4.5.0.md → docs/changelogs/4.x.x/4.5.0.md
diff --git a/docs/changelogs/4.6.0.md → docs/changelogs/4.x.x/4.6.0.md b/docs/changelogs/4.6.0.md → docs/changelogs/4.x.x/4.6.0.md
diff --git a/docs/changelogs/4.x.x/4.6.1.md b/docs/changelogs/4.x.x/4.6.1.md
@@ -0,0 +1,20 @@
+# LilyBot 4.6.1
+
+This update fixes some bugs that were introduced with the new auto-threading system.
+
+**The support channel system is now deprecated (replaced by auto-threading) and will be removed in version 4.7.0.
+If you have a support channel, it's been automatically migrated to an auto-threaded channel.**
+
+You can find the full changelog below.
+
+New:
+* An option in auto-threading to add moderators as well as the target role.
+
+Change:
+* Switch to the new maven artifact for our doc-generator and Discord moderation actions.
+
+Fix:
+* Moderators being added to every thread.
+* Auto-threading not properly detecting the status of old threads.
+
+You can find a list of all the commits in this update [here](https://github.com/hyacinthbots/LilyBot/compare/v4.6.0...v4.6.1)
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -21,5 +21,5 @@ github-api = { module = "org.kohsuke:github-api", version.ref = "github-api" }
 kmongo = { module = "org.litote.kmongo:kmongo-coroutine-serialization", version.ref = "kmongo" }
 detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt"}
 cozy-welcome = {module = "org.quiltmc.community:module-welcome", version.ref = "cozy-welcome"}
-dma = { module = "com.github.nocomment1105:discord-moderation-actions", version.ref = "dma"}
+dma = { module = "org.hyacinthbots:discord-moderation-actions", version.ref = "dma"}
 docgenerator = { module = "org.hyacinthbots:doc-generator", version.ref = "docgenerator" }
diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt b/src/main/kotlin/org/hyacinthbots/lilybot/extensions/moderation/ModerationCommands.kt
@@ -46,19 +46,19 @@ import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.rest.builder.message.EmbedBuilder
 import dev.kord.rest.builder.message.create.embed
 import dev.kord.rest.request.KtorRequestException
-import io.github.nocomment1105.discordmoderationactions.builder.ban
-import io.github.nocomment1105.discordmoderationactions.builder.kick
-import io.github.nocomment1105.discordmoderationactions.builder.removeTimeout
-import io.github.nocomment1105.discordmoderationactions.builder.softban
-import io.github.nocomment1105.discordmoderationactions.builder.timeout
-import io.github.nocomment1105.discordmoderationactions.builder.unban
-import io.github.nocomment1105.discordmoderationactions.enums.ActionResults
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList
 import kotlinx.datetime.Clock
 import kotlinx.datetime.DateTimePeriod
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.plus
+import org.hyacinthbots.discordmoderationactions.builder.ban
+import org.hyacinthbots.discordmoderationactions.builder.kick
+import org.hyacinthbots.discordmoderationactions.builder.removeTimeout
+import org.hyacinthbots.discordmoderationactions.builder.softban
+import org.hyacinthbots.discordmoderationactions.builder.timeout
+import org.hyacinthbots.discordmoderationactions.builder.unban
+import org.hyacinthbots.discordmoderationactions.enums.ActionResults
 import org.hyacinthbots.lilybot.database.collections.ModerationConfigCollection
 import org.hyacinthbots.lilybot.database.collections.WarnCollection
 import org.hyacinthbots.lilybot.extensions.config.ConfigOptions

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/utils/ResponseHelper.kt b/src/main/kotlin/org/hyacinthbots/lilybot/utils/ResponseHelper.kt
@@ -6,7 +6,7 @@ import dev.kord.core.entity.Guild
 import dev.kord.core.entity.Message
 import dev.kord.core.entity.User
 import dev.kord.rest.builder.message.EmbedBuilder
-import io.github.nocomment1105.discordmoderationactions.enums.DmResult
+import org.hyacinthbots.discordmoderationactions.enums.DmResult
 
 /**
  * This is the base moderation embed for all moderation actions. This should be posted to the action log of a guild.

diff --git a/src/main/kotlin/org/hyacinthbots/lilybot/utils/_Utils.kt b/src/main/kotlin/org/hyacinthbots/lilybot/utils/_Utils.kt
@@ -7,11 +7,11 @@ import dev.kord.core.behavior.GuildBehavior
 import dev.kord.core.behavior.RoleBehavior
 import dev.kord.core.entity.Message
 import dev.kord.core.supplier.EntitySupplyStrategy
-import io.github.nocomment1105.discordmoderationactions.enums.DmResult
 import kotlinx.coroutines.flow.count
 import kotlinx.coroutines.runBlocking
 import kotlinx.datetime.DateTimePeriod
 import mu.KotlinLogging
+import org.hyacinthbots.discordmoderationactions.enums.DmResult
 import org.hyacinthbots.lilybot.database.Database
 import org.hyacinthbots.lilybot.database.collections.ConfigMetaCollection
 import org.hyacinthbots.lilybot.database.collections.GalleryChannelCollection