Skip to content

Commit 12e5643

Browse files
ddivad195ddivad195
authored
Merge pull request #129 from the-programmers-hangout/fix/point-decay
fix: fix point decay issue, update dkt snapshot version
2 parents ce547fc + 62fd6ee commit 12e5643

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+255
-233
lines changed

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ version = Versions.BOT
33
description = "judgebot"
44

55
plugins {
6-
kotlin("jvm") version "1.5.10"
7-
kotlin("plugin.serialization") version "1.5.31"
6+
kotlin("jvm") version "1.6.0"
7+
kotlin("plugin.serialization") version "1.6.0"
88
id("com.github.johnrengelman.shadow") version "7.0.0"
99
}
1010

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package me.ddivad.judgebot
22

33
import dev.kord.common.annotation.KordPreview
4-
import dev.kord.common.kColor
54
import dev.kord.core.supplier.EntitySupplyStrategy
65
import dev.kord.gateway.Intent
76
import dev.kord.gateway.Intents
@@ -11,8 +10,9 @@ import me.ddivad.judgebot.dataclasses.Permissions
1110
import me.ddivad.judgebot.services.*
1211
import me.ddivad.judgebot.services.infractions.BanService
1312
import me.ddivad.judgebot.services.infractions.MuteService
14-
import me.jakejmattson.discordkt.api.dsl.bot
15-
import me.jakejmattson.discordkt.api.extensions.addInlineField
13+
import me.jakejmattson.discordkt.dsl.bot
14+
import me.jakejmattson.discordkt.extensions.addInlineField
15+
import me.jakejmattson.discordkt.extensions.pfpUrl
1616
import java.awt.Color
1717

1818
@KordPreview
@@ -25,6 +25,7 @@ suspend fun main() {
2525

2626
bot(token) {
2727
val configuration = data("config/config.json") { Configuration() }
28+
2829
prefix {
2930
guild?.let { configuration[guild!!.id.value]?.prefix } ?: defaultPrefix
3031
}
@@ -49,11 +50,9 @@ suspend fun main() {
4950
val botStats = it.discord.getInjectionObjects(BotStatsService::class)
5051
val channel = it.channel
5152
val self = channel.kord.getSelf()
52-
5353
color = it.discord.configuration.theme
54-
5554
thumbnail {
56-
url = self.avatar.url
55+
url = self.pfpUrl
5756
}
5857

5958
field {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.ddivad.judgebot.arguments
22

3-
import me.jakejmattson.discordkt.api.arguments.*
4-
import me.jakejmattson.discordkt.api.commands.CommandEvent
3+
import me.jakejmattson.discordkt.arguments.*
4+
import me.jakejmattson.discordkt.commands.CommandEvent
55

66
val validConfigParameters = mutableListOf(
77
"setPrefix",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package me.ddivad.judgebot.arguments
22

33
import dev.kord.core.entity.Member
4-
import me.jakejmattson.discordkt.api.arguments.*
5-
import me.jakejmattson.discordkt.api.commands.CommandEvent
6-
import me.jakejmattson.discordkt.api.extensions.isSelf
7-
import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
4+
import me.jakejmattson.discordkt.arguments.*
5+
import me.jakejmattson.discordkt.commands.CommandEvent
6+
import me.jakejmattson.discordkt.extensions.isSelf
7+
import me.jakejmattson.discordkt.extensions.toSnowflakeOrNull
88

99
open class LowerMemberArg(override val name: String = "LowerMemberArg") : Argument<Member> {
1010
companion object : LowerMemberArg()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package me.ddivad.judgebot.arguments
22

33
import dev.kord.core.entity.User
4-
import me.jakejmattson.discordkt.api.arguments.*
5-
import me.jakejmattson.discordkt.api.commands.CommandEvent
6-
import me.jakejmattson.discordkt.api.extensions.isSelf
7-
import me.jakejmattson.discordkt.api.extensions.toSnowflakeOrNull
4+
import me.jakejmattson.discordkt.arguments.*
5+
import me.jakejmattson.discordkt.commands.CommandEvent
6+
import me.jakejmattson.discordkt.extensions.isSelf
7+
import me.jakejmattson.discordkt.extensions.toSnowflakeOrNull
88

99
open class LowerUserArg(override val name: String = "LowerUserArg") : Argument<User> {
1010
companion object : LowerUserArg()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package me.ddivad.judgebot.arguments
33
import dev.kord.core.entity.Guild
44
import me.ddivad.judgebot.dataclasses.Rule
55
import me.ddivad.judgebot.services.DatabaseService
6-
import me.jakejmattson.discordkt.api.arguments.*
7-
import me.jakejmattson.discordkt.api.commands.CommandEvent
6+
import me.jakejmattson.discordkt.arguments.*
7+
import me.jakejmattson.discordkt.commands.CommandEvent
88

99
open class RuleArg(override val name: String = "Rule") : Argument<Rule> {
1010
override val description = "A rule number"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import me.ddivad.judgebot.dataclasses.Permissions
88
import me.ddivad.judgebot.embeds.createActivePunishmentsEmbed
99
import me.ddivad.judgebot.services.DatabaseService
1010
import me.ddivad.judgebot.services.infractions.MuteService
11-
import me.jakejmattson.discordkt.api.commands.commands
11+
import me.jakejmattson.discordkt.commands.commands
1212

1313
@Suppress("unused")
1414
fun guildConfigCommands(configuration: Configuration,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import me.ddivad.judgebot.dataclasses.Permissions
99
import me.ddivad.judgebot.embeds.createInformationEmbed
1010
import me.ddivad.judgebot.extensions.testDmStatus
1111
import me.ddivad.judgebot.services.DatabaseService
12-
import me.jakejmattson.discordkt.api.arguments.EveryArg
13-
import me.jakejmattson.discordkt.api.arguments.IntegerArg
14-
import me.jakejmattson.discordkt.api.commands.commands
15-
import me.jakejmattson.discordkt.api.extensions.sendPrivateMessage
12+
import me.jakejmattson.discordkt.arguments.EveryArg
13+
import me.jakejmattson.discordkt.arguments.IntegerArg
14+
import me.jakejmattson.discordkt.commands.commands
15+
import me.jakejmattson.discordkt.extensions.sendPrivateMessage
1616

1717
@Suppress("unused")
1818
fun createInformationCommands(databaseService: DatabaseService) = commands("Information") {
@@ -30,7 +30,7 @@ fun createInformationCommands(databaseService: DatabaseService) = commands("Info
3030
return@execute
3131
}
3232
val user = databaseService.users.getOrCreateUser(target, guild)
33-
val information = Info(content, author.id.asString)
33+
val information = Info(content, author.id.toString())
3434
databaseService.users.addInfo(guild, user, information)
3535
target.sendPrivateMessage {
3636
createInformationEmbed(guild, target, information)
@@ -45,7 +45,7 @@ fun createInformationCommands(databaseService: DatabaseService) = commands("Info
4545
execute(LowerMemberArg, IntegerArg("Info ID")) {
4646
val (target, id) = args
4747
val user = databaseService.users.getOrCreateUser(target, guild)
48-
if (user.getGuildInfo(guild.id.asString).info.isEmpty()) {
48+
if (user.getGuildInfo(guild.id.toString()).info.isEmpty()) {
4949
respond("${target.mention} has no information records.")
5050
return@execute
5151
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import me.ddivad.judgebot.services.*
1717
import me.ddivad.judgebot.services.infractions.BadPfpService
1818
import me.ddivad.judgebot.services.infractions.BadnameService
1919
import me.ddivad.judgebot.services.infractions.InfractionService
20-
import me.jakejmattson.discordkt.api.arguments.BooleanArg
21-
import me.jakejmattson.discordkt.api.arguments.EveryArg
22-
import me.jakejmattson.discordkt.api.arguments.IntegerArg
23-
import me.jakejmattson.discordkt.api.commands.commands
24-
import me.jakejmattson.discordkt.api.conversations.ConversationResult
20+
import me.jakejmattson.discordkt.arguments.BooleanArg
21+
import me.jakejmattson.discordkt.arguments.EveryArg
22+
import me.jakejmattson.discordkt.arguments.IntegerArg
23+
import me.jakejmattson.discordkt.commands.commands
24+
import me.jakejmattson.discordkt.conversations.ConversationResult
2525

2626
@KordPreview
2727
@Suppress("unused")
@@ -102,7 +102,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
102102
return@execute
103103
}
104104

105-
val badPfp = Infraction(author.id.asString, "BadPfp", InfractionType.BadPfp)
105+
val badPfp = Infraction(author.id.toString(), "BadPfp", InfractionType.BadPfp)
106106
badPfpService.applyBadPfp(targetMember, guild, timeLimit)
107107
respond("${targetMember.mention} has been muted and a badpfp has been triggered with a time limit of $minutesUntilBan minutes.")
108108
}
@@ -122,7 +122,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
122122
requiredPermission = Permissions.ADMINISTRATOR
123123
execute(LowerUserArg) {
124124
val user = databaseService.users.getOrCreateUser(args.first, guild)
125-
if (user.getGuildInfo(guild.id.asString).infractions.isEmpty()) {
125+
if (user.getGuildInfo(guild.id.toString()).infractions.isEmpty()) {
126126
respond("User has no infractions.")
127127
return@execute
128128
}
@@ -136,7 +136,7 @@ fun createInfractionCommands(databaseService: DatabaseService,
136136
requiredPermission = Permissions.ADMINISTRATOR
137137
execute(LowerUserArg, IntegerArg("Infraction ID")) {
138138
val user = databaseService.users.getOrCreateUser(args.first, guild)
139-
if (user.getGuildInfo(guild.id.asString).infractions.isEmpty()) {
139+
if (user.getGuildInfo(guild.id.toString()).infractions.isEmpty()) {
140140
respond("User has no infractions.")
141141
return@execute
142142
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import me.ddivad.judgebot.extensions.testDmStatus
99
import me.ddivad.judgebot.services.infractions.MuteService
1010
import me.ddivad.judgebot.services.infractions.RoleState
1111
import me.ddivad.judgebot.util.timeToString
12-
import me.jakejmattson.discordkt.api.arguments.EveryArg
13-
import me.jakejmattson.discordkt.api.arguments.TimeArg
14-
import me.jakejmattson.discordkt.api.arguments.UserArg
15-
import me.jakejmattson.discordkt.api.commands.commands
12+
import me.jakejmattson.discordkt.arguments.EveryArg
13+
import me.jakejmattson.discordkt.arguments.TimeArg
14+
import me.jakejmattson.discordkt.arguments.UserArg
15+
import me.jakejmattson.discordkt.commands.commands
1616
import kotlin.math.roundToLong
1717

1818
@Suppress("unused")

0 commit comments

Comments
 (0)