Merge pull request #130 from the-programmers-hangout/develop

release: merge develop with master for v2.7.0

Author: ddivad195

build.gradle.kts

@@ -3,7 +3,8 @@ version = Versions.BOT
 description = "judgebot"
 
 plugins {
-    kotlin("jvm") version "1.5.10"
+    kotlin("jvm") version "1.6.0"
+    kotlin("plugin.serialization") version "1.6.0"
     id("com.github.johnrengelman.shadow") version "7.0.0"
 }
 

src/main/kotlin/me/ddivad/judgebot/Main.kt

@@ -1,7 +1,6 @@
 package me.ddivad.judgebot
 
 import dev.kord.common.annotation.KordPreview
-import dev.kord.common.kColor
 import dev.kord.core.supplier.EntitySupplyStrategy
 import dev.kord.gateway.Intent
 import dev.kord.gateway.Intents
@@ -11,8 +10,9 @@ import me.ddivad.judgebot.dataclasses.Permissions
 import me.ddivad.judgebot.services.*
 import me.ddivad.judgebot.services.infractions.BanService
 import me.ddivad.judgebot.services.infractions.MuteService
-import me.jakejmattson.discordkt.api.dsl.bot
-import me.jakejmattson.discordkt.api.extensions.addInlineField
+import me.jakejmattson.discordkt.dsl.bot
+import me.jakejmattson.discordkt.extensions.addInlineField
+import me.jakejmattson.discordkt.extensions.pfpUrl
 import java.awt.Color
 
 @KordPreview
@@ -24,8 +24,9 @@ suspend fun main() {
     require(token != null) { "Expected the bot token as an environment variable" }
 
     bot(token) {
+        val configuration = data("config/config.json") { Configuration() }
+
         prefix {
-            val configuration = discord.getInjectionObjects(Configuration::class)
             guild?.let { configuration[guild!!.id.value]?.prefix } ?: defaultPrefix
         }
 
@@ -49,11 +50,9 @@ suspend fun main() {
             val botStats = it.discord.getInjectionObjects(BotStatsService::class)
             val channel = it.channel
             val self = channel.kord.getSelf()
-
-            color = it.discord.configuration.theme?.kColor
-
+            color = it.discord.configuration.theme
             thumbnail {
-                url = self.avatar.url
+                url = self.pfpUrl
             }
 
             field {
@@ -70,7 +69,7 @@ suspend fun main() {
             field {
                 name = "Build Info"
                 value = "```" +
-                    "Version:   2.6.0\n" +
+                    "Version:   2.7.0\n" +
                     "DiscordKt: ${versions.library}\n" +
                     "Kord: ${versions.kord}\n" +
                     "Kotlin:    $kotlinVersion" +

src/main/kotlin/me/ddivad/judgebot/arguments/GuildConfigArg.kt

@@ -1,7 +1,7 @@
 package me.ddivad.judgebot.arguments
 
-import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.commands.CommandEvent
+import me.jakejmattson.discordkt.arguments.*
+import me.jakejmattson.discordkt.commands.CommandEvent
 
 val validConfigParameters = mutableListOf(
     "setPrefix",

src/main/kotlin/me/ddivad/judgebot/arguments/LowerMemberArg.kt

@@ -1,10 +1,10 @@
 package me.ddivad.judgebot.arguments
 
 import dev.kord.core.entity.Member
-import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.commands.CommandEvent
-import me.jakejmattson.discordkt.api.extensions.isSelf
-import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
+import me.jakejmattson.discordkt.arguments.*
+import me.jakejmattson.discordkt.commands.CommandEvent
+import me.jakejmattson.discordkt.extensions.isSelf
+import me.jakejmattson.discordkt.extensions.toSnowflakeOrNull
 
 open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argument<Member> {
     companion object : LowerMemberArg()

src/main/kotlin/me/ddivad/judgebot/arguments/LowerUserArg.kt

@@ -1,10 +1,10 @@
 package me.ddivad.judgebot.arguments
 
 import dev.kord.core.entity.User
-import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.commands.CommandEvent
-import me.jakejmattson.discordkt.api.extensions.isSelf
-import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
+import me.jakejmattson.discordkt.arguments.*
+import me.jakejmattson.discordkt.commands.CommandEvent
+import me.jakejmattson.discordkt.extensions.isSelf
+import me.jakejmattson.discordkt.extensions.toSnowflakeOrNull
 
 open class LowerUserArg(override val name: String = "LowerUserArg") : Argument<User> {
     companion object : LowerUserArg()

src/main/kotlin/me/ddivad/judgebot/arguments/RuleArg.kt

@@ -3,8 +3,8 @@ package me.ddivad.judgebot.arguments
 import dev.kord.core.entity.Guild
 import me.ddivad.judgebot.dataclasses.Rule
 import me.ddivad.judgebot.services.DatabaseService
-import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.commands.CommandEvent
+import me.jakejmattson.discordkt.arguments.*
+import me.jakejmattson.discordkt.commands.CommandEvent
 
 open class RuleArg(override val name: String = "Rule") : Argument<Rule> {
     override val description = "A rule number"

src/main/kotlin/me/ddivad/judgebot/commands/GuildCommands.kt

@@ -8,13 +8,13 @@ import me.ddivad.judgebot.dataclasses.Permissions
 import me.ddivad.judgebot.embeds.createActivePunishmentsEmbed
 import me.ddivad.judgebot.services.DatabaseService
 import me.ddivad.judgebot.services.infractions.MuteService
-import me.jakejmattson.discordkt.api.commands.commands
+import me.jakejmattson.discordkt.commands.commands
 
 @Suppress("unused")
 fun guildConfigCommands(configuration: Configuration,
                         databaseService: DatabaseService,
                         muteService: MuteService) = commands("Guild") {
-    guildCommand("setup") {
+    command("setup") {
         description = "Configure a guild to use Judgebot."
         requiredPermission = Permissions.ADMINISTRATOR
         execute {
@@ -30,7 +30,7 @@ fun guildConfigCommands(configuration: Configuration,
         }
     }
 
-    guildCommand("configuration") {
+    command("configuration") {
         description = "Update configuration parameters for this guild (conversation)."
         requiredPermission = Permissions.STAFF
         execute(GuildConfigArg.optional("options")) {
@@ -44,7 +44,7 @@ fun guildConfigCommands(configuration: Configuration,
         }
     }
 
-    guildCommand("activePunishments") {
+    command("activePunishments") {
         description = "View active punishments for a guild."
         requiredPermission = Permissions.STAFF
         execute {

src/main/kotlin/me/ddivad/judgebot/commands/InfoCommands.kt

@@ -9,14 +9,14 @@ import me.ddivad.judgebot.dataclasses.Permissions
 import me.ddivad.judgebot.embeds.createInformationEmbed
 import me.ddivad.judgebot.extensions.testDmStatus
 import me.ddivad.judgebot.services.DatabaseService
-import me.jakejmattson.discordkt.api.arguments.EveryArg
-import me.jakejmattson.discordkt.api.arguments.IntegerArg
-import me.jakejmattson.discordkt.api.commands.commands
-import me.jakejmattson.discordkt.api.extensions.sendPrivateMessage
+import me.jakejmattson.discordkt.arguments.EveryArg
+import me.jakejmattson.discordkt.arguments.IntegerArg
+import me.jakejmattson.discordkt.commands.commands
+import me.jakejmattson.discordkt.extensions.sendPrivateMessage
 
 @Suppress("unused")
 fun createInformationCommands(databaseService: DatabaseService) = commands("Information") {
-    guildCommand("info") {
+    command("info") {
         description = "Send an information message to a guild member"
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg, EveryArg("Info Content")) {
@@ -30,7 +30,7 @@ fun createInformationCommands(databaseService: DatabaseService) = commands("Info
                 return@execute
             }
             val user = databaseService.users.getOrCreateUser(target, guild)
-            val information = Info(content, author.id.asString)
+            val information = Info(content, author.id.toString())
             databaseService.users.addInfo(guild, user, information)
             target.sendPrivateMessage {
                 createInformationEmbed(guild, target, information)
@@ -39,13 +39,13 @@ fun createInformationCommands(databaseService: DatabaseService) = commands("Info
         }
     }
 
-    guildCommand("removeInfo") {
+    command("removeInfo") {
         description = "Remove an information message from a member record."
         requiredPermission = Permissions.STAFF
         execute(LowerMemberArg, IntegerArg("Info ID")) {
             val (target, id) = args
             val user = databaseService.users.getOrCreateUser(target, guild)
-            if (user.getGuildInfo(guild.id.asString).info.isEmpty()) {
+            if (user.getGuildInfo(guild.id.toString()).info.isEmpty()) {
                 respond("${target.mention} has no information records.")
                 return@execute
             }

src/main/kotlin/me/ddivad/judgebot/commands/InfractionCommands.kt

@@ -17,11 +17,11 @@ import me.ddivad.judgebot.services.*
 import me.ddivad.judgebot.services.infractions.BadPfpService
 import me.ddivad.judgebot.services.infractions.BadnameService
 import me.ddivad.judgebot.services.infractions.InfractionService
-import me.jakejmattson.discordkt.api.arguments.BooleanArg
-import me.jakejmattson.discordkt.api.arguments.EveryArg
-import me.jakejmattson.discordkt.api.arguments.IntegerArg
-import me.jakejmattson.discordkt.api.commands.commands
-import me.jakejmattson.discordkt.api.conversations.ConversationResult
+import me.jakejmattson.discordkt.arguments.BooleanArg
+import me.jakejmattson.discordkt.arguments.EveryArg
+import me.jakejmattson.discordkt.arguments.IntegerArg
+import me.jakejmattson.discordkt.commands.commands
+import me.jakejmattson.discordkt.conversations.ConversationResult
 
 @KordPreview
 @Suppress("unused")
@@ -30,7 +30,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
                              infractionService: InfractionService,
                              badPfpService: BadPfpService,
                              badnameService: BadnameService) = commands("Infraction") {
-    guildCommand("strike", "s", "S") {
+    command("strike", "s", "S") {
         description = "Strike a user."
         requiredPermission = Permissions.STAFF
         execute(LowerMemberArg, IntegerArg("Weight").optional(1), EveryArg("Reason")) {
@@ -59,7 +59,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
         }
     }
 
-    guildCommand("warn", "w", "W") {
+    command("warn", "w", "W") {
         description = "Warn a user."
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg, EveryArg("Reason")) {
@@ -77,7 +77,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
         }
     }
 
-    guildCommand("badpfp") {
+    command("badpfp") {
         description = "Notifies the user that they should change their profile pic and applies a 30 minute mute. Bans the user if they don't change picture."
         requiredPermission = Permissions.STAFF
         execute(BooleanArg("cancel", "apply", "cancel").optional(true), LowerMemberArg) {
@@ -102,13 +102,13 @@ fun createInfractionCommands(databaseService: DatabaseService,
                 return@execute
             }
 
-            val badPfp = Infraction(author.id.asString, "BadPfp", InfractionType.BadPfp)
+            val badPfp = Infraction(author.id.toString(), "BadPfp", InfractionType.BadPfp)
             badPfpService.applyBadPfp(targetMember, guild, timeLimit)
             respond("${targetMember.mention} has been muted and a badpfp has been triggered with a time limit of $minutesUntilBan minutes.")
         }
     }
 
-    guildCommand("badname") {
+    command("badname") {
         description = "Rename a guild member that has a bad name."
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg) {
@@ -117,12 +117,12 @@ fun createInfractionCommands(databaseService: DatabaseService,
         }
     }
 
-    guildCommand("cleanseInfractions") {
+    command("cleanseInfractions") {
         description = "Use this to delete (permanently) as user's infractions."
         requiredPermission = Permissions.ADMINISTRATOR
         execute(LowerUserArg) {
             val user = databaseService.users.getOrCreateUser(args.first, guild)
-            if (user.getGuildInfo(guild.id.asString).infractions.isEmpty()) {
+            if (user.getGuildInfo(guild.id.toString()).infractions.isEmpty()) {
                 respond("User has no infractions.")
                 return@execute
             }
@@ -131,12 +131,12 @@ fun createInfractionCommands(databaseService: DatabaseService,
         }
     }
 
-    guildCommand("removeInfraction") {
+    command("removeInfraction") {
         description = "Use this to delete (permanently) an infraction from a user."
         requiredPermission = Permissions.ADMINISTRATOR
         execute(LowerUserArg, IntegerArg("Infraction ID")) {
             val user = databaseService.users.getOrCreateUser(args.first, guild)
-            if (user.getGuildInfo(guild.id.asString).infractions.isEmpty()) {
+            if (user.getGuildInfo(guild.id.toString()).infractions.isEmpty()) {
                 respond("User has no infractions.")
                 return@execute
             }

src/main/kotlin/me/ddivad/judgebot/commands/MuteCommands.kt

@@ -9,15 +9,15 @@ import me.ddivad.judgebot.extensions.testDmStatus
 import me.ddivad.judgebot.services.infractions.MuteService
 import me.ddivad.judgebot.services.infractions.RoleState
 import me.ddivad.judgebot.util.timeToString
-import me.jakejmattson.discordkt.api.arguments.EveryArg
-import me.jakejmattson.discordkt.api.arguments.TimeArg
-import me.jakejmattson.discordkt.api.arguments.UserArg
-import me.jakejmattson.discordkt.api.commands.commands
+import me.jakejmattson.discordkt.arguments.EveryArg
+import me.jakejmattson.discordkt.arguments.TimeArg
+import me.jakejmattson.discordkt.arguments.UserArg
+import me.jakejmattson.discordkt.commands.commands
 import kotlin.math.roundToLong
 
 @Suppress("unused")
 fun createMuteCommands(muteService: MuteService) = commands("Mute") {
-    guildCommand("mute") {
+    command("mute") {
         description = "Mute a user for a specified time."
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg, TimeArg("Time"), EveryArg("Reason")) {
@@ -34,7 +34,7 @@ fun createMuteCommands(muteService: MuteService) = commands("Mute") {
         }
     }
 
-    guildCommand("unmute") {
+    command("unmute") {
         description = "Unmute a user."
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg) {
@@ -49,7 +49,7 @@ fun createMuteCommands(muteService: MuteService) = commands("Mute") {
         }
     }
 
-    guildCommand("gag") {
+    command("gag") {
         description = "Mute a user for 5 minutes while you deal with something"
         requiredPermission = Permissions.MODERATOR
         execute(LowerMemberArg) {