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

release: merge develop with master

Author: ddivad195

.github/workflows/discord-release.yml

@@ -0,0 +1,19 @@
+name: Post Release to Discord
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  run_main:
+    runs-on: ubuntu-18.04
+    name: Discord Webhook
+    steps:
+      - name: Send message
+        uses: ddivad195/discord-styled-releases@main
+        with:
+          project_name: "Judgebot"
+          embed_colour: "1315909"
+          webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+          webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}

build.gradle.kts

@@ -36,5 +36,5 @@ tasks {
 
 object Versions {
     const val BOT = "1.0.0"
-    const val DISCORDKT = "0.22.0-SNAPSHOT"
+    const val DISCORDKT = "0.23.0-SNAPSHOT"
 }

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

@@ -1,5 +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
@@ -14,8 +15,9 @@ import me.jakejmattson.discordkt.api.dsl.bot
 import me.jakejmattson.discordkt.api.extensions.addInlineField
 import java.awt.Color
 
+@KordPreview
 @PrivilegedIntent
-suspend fun main(args: Array<String>) {
+suspend fun main() {
     val token = System.getenv("BOT_TOKEN") ?: null
     val defaultPrefix = System.getenv("DEFAULT_PREFIX") ?: "j!"
 
@@ -31,7 +33,7 @@ suspend fun main(args: Array<String>) {
             allowMentionPrefix = true
             commandReaction = null
             theme = Color.MAGENTA
-            entitySupplyStrategy = EntitySupplyStrategy.cacheWithCachingRestFallback
+            entitySupplyStrategy = EntitySupplyStrategy.cacheWithRestFallback
             permissions(Permissions.NONE)
             intents = Intents(
                 Intent.GuildMembers,
@@ -67,10 +69,11 @@ suspend fun main(args: Array<String>) {
             field {
                 name = "Build Info"
                 value = "```" +
-                    "Version:   2.4.1\n" +
+                    "Version:   2.5.0\n" +
                     "DiscordKt: ${versions.library}\n" +
+                    "Kord: ${versions.kord}\n" +
                     "Kotlin:    $kotlinVersion" +
-                    "```"
+                        "```"
             }
             field {
                 name = "Uptime"

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.dsl.CommandEvent
+import me.jakejmattson.discordkt.api.commands.CommandEvent
 
 val validConfigParameters = mutableListOf(
     "setPrefix",
@@ -23,7 +23,7 @@ val validConfigParameters = mutableListOf(
     "options"
 )
 
-open class GuildConfigArg(override val name: String = "GuildConfig") : ArgumentType<String> {
+open class GuildConfigArg(override val name: String = "GuildConfig") : Argument<String> {
     override val description = "A Guild configuration"
 
     companion object : GuildConfigArg()

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

@@ -2,10 +2,11 @@ package me.ddivad.judgebot.arguments
 
 import dev.kord.core.entity.Member
 import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.dsl.CommandEvent
+import me.jakejmattson.discordkt.api.commands.CommandEvent
+import me.jakejmattson.discordkt.api.extensions.isSelf
 import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
 
-open class LowerMemberArg(override val name: String = "LowerMemberArg") : ArgumentType<Member> {
+open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argument<Member> {
     companion object : LowerMemberArg()
 
     override val description = "A Member with a lower rank"
@@ -19,8 +20,9 @@ open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argume
         val author = event.author.asMember(event.guild!!.id)
 
         return when {
-            event.discord.permissions.isHigherLevel(event.discord, member, author) ->
+            event.discord.permissions.isHigherLevel(event.discord, member, author) || event.author.isSelf() ->
                 Error("You don't have the permission to use this command on the target user.")
+            event.author == member -> Error("You can't use this command on yourself!")
             else -> Success(member)
         }
     }

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

@@ -2,10 +2,11 @@ package me.ddivad.judgebot.arguments
 
 import dev.kord.core.entity.User
 import me.jakejmattson.discordkt.api.arguments.*
-import me.jakejmattson.discordkt.api.dsl.CommandEvent
+import me.jakejmattson.discordkt.api.commands.CommandEvent
+import me.jakejmattson.discordkt.api.extensions.isSelf
 import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
 
-open class LowerUserArg(override val name: String = "LowerUserArg") : ArgumentType<User> {
+open class LowerUserArg(override val name: String = "LowerUserArg") : Argument<User> {
     companion object : LowerUserArg()
 
     override val description = "A user with a lower rank"
@@ -20,9 +21,12 @@ open class LowerUserArg(override val name: String = "LowerUserArg") : ArgumentTy
         val author = event.author.asMember(event.guild!!.id)
 
         return when {
-            event.discord.permissions.isHigherLevel(event.discord, member, author) ->
+            event.discord.permissions.isHigherLevel(event.discord, member, author) || event.author.isSelf() ->
                 Error("You don't have the permission to use this command on the target user.")
+            event.author == member -> Error("You can't use this command on yourself!")
             else -> Success(member.asUser())
         }
     }
+
+    override fun formatData(data: User) = "@${data.tag}"
 }

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

@@ -4,9 +4,9 @@ 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.dsl.CommandEvent
+import me.jakejmattson.discordkt.api.commands.CommandEvent
 
-open class RuleArg(override val name: String = "Rule") : ArgumentType<Rule> {
+open class RuleArg(override val name: String = "Rule") : Argument<Rule> {
     override val description = "A rule number"
 
     override suspend fun generateExamples(event: CommandEvent<*>): List<String> = mutableListOf("1", "2", "3")

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

@@ -8,8 +8,9 @@ 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.dsl.commands
+import me.jakejmattson.discordkt.api.commands.commands
 
+@Suppress("unused")
 fun guildConfigCommands(configuration: Configuration,
                         databaseService: DatabaseService,
                         muteService: MuteService) = commands("Guild") {

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

@@ -11,7 +11,7 @@ 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.dsl.commands
+import me.jakejmattson.discordkt.api.commands.commands
 import me.jakejmattson.discordkt.api.extensions.sendPrivateMessage
 
 @Suppress("unused")

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

@@ -1,5 +1,6 @@
 package me.ddivad.judgebot.commands
 
+import dev.kord.common.annotation.KordPreview
 import me.ddivad.judgebot.arguments.LowerUserArg
 import dev.kord.common.exception.RequestException
 import dev.kord.core.behavior.reply
@@ -19,9 +20,10 @@ 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.api.dsl.commands
 
+@KordPreview
 @Suppress("unused")
 fun createInfractionCommands(databaseService: DatabaseService,
                              config: Configuration,