Skip to content

Commit 362bda0

Browse files
zt64zt64
committed
update to kordex 2
1 parent d078bd4 commit 362bda0

36 files changed

+251
-233
lines changed

‎bot/src/main/kotlin/dev/zt64/minkinator/Main.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package dev.zt64.minkinator
22

3-
import com.kotlindiscord.kord.extensions.ExtensibleBot
4-
import com.kotlindiscord.kord.extensions.checks.userFor
5-
import com.kotlindiscord.kord.extensions.utils.env
6-
import com.kotlindiscord.kord.extensions.utils.envOrNull
7-
import com.kotlindiscord.kord.extensions.utils.loadModule
83
import dev.kord.common.Color
94
import dev.kord.gateway.Intent
105
import dev.kord.gateway.PrivilegedIntent
116
import dev.kord.gateway.builder.Shards
127
import dev.kord.rest.builder.message.embed
8+
import dev.kordex.core.ExtensibleBot
9+
import dev.kordex.core.checks.userFor
10+
import dev.kordex.core.utils.env
11+
import dev.kordex.core.utils.envOrNull
12+
import dev.kordex.core.utils.loadModule
1313
import dev.zt64.minkinator.extension.*
1414
import dev.zt64.minkinator.extension.filter.FilterExtension
1515
import dev.zt64.minkinator.extension.media.EffectsExtension
@@ -42,7 +42,7 @@ suspend fun main() {
4242
+SvgExtension
4343
+EventLogExtension
4444
+FilterExtension
45-
+MarkovExtension
45+
// +MarkovExtension
4646
+AvatarExtension
4747
+NameNormalizerExtension
4848
+AnimalsExtension

‎bot/src/main/kotlin/dev/zt64/minkinator/converter/Argument.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.zt64.minkinator.converter
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
3+
import dev.kordex.core.commands.Arguments
44
import kotlin.reflect.KProperty
55

66
interface Argument<T> {

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/AnimalsExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
43
import dev.kord.common.Color
54
import dev.kord.rest.builder.message.embed
5+
import dev.kordex.core.extensions.Extension
66
import dev.zt64.minkinator.util.footer
77
import dev.zt64.minkinator.util.publicSlashCommand
88
import dev.zt64.minkinator.util.success

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/AvatarExtension.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalMember
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
63
import dev.kord.common.Color
74
import dev.kord.core.entity.Member
85
import dev.kord.rest.Image
96
import dev.kord.rest.builder.message.embed
7+
import dev.kordex.core.commands.Arguments
8+
import dev.kordex.core.commands.converters.impl.optionalMember
9+
import dev.kordex.core.extensions.Extension
1010
import dev.zt64.minkinator.util.*
1111

1212
object AvatarExtension : Extension() {

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/BanExtension.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.checks.hasPermission
5-
import com.kotlindiscord.kord.extensions.commands.Arguments
6-
import com.kotlindiscord.kord.extensions.commands.converters.impl.*
7-
import com.kotlindiscord.kord.extensions.extensions.Extension
8-
import com.kotlindiscord.kord.extensions.utils.toDuration
93
import dev.kord.common.Color
104
import dev.kord.common.entity.Permission
115
import dev.kord.core.behavior.ban
126
import dev.kord.rest.builder.message.embed
7+
import dev.kordex.core.checks.anyGuild
8+
import dev.kordex.core.checks.hasPermission
9+
import dev.kordex.core.commands.Arguments
10+
import dev.kordex.core.commands.converters.impl.*
11+
import dev.kordex.core.extensions.Extension
12+
import dev.kordex.core.utils.toDuration
1313
import dev.zt64.minkinator.util.*
1414
import kotlinx.datetime.TimeZone
1515

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/BigmojiExtension.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.emoji
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
63
import com.sksamuel.scrimage.ImmutableImage
74
import com.sksamuel.scrimage.nio.AnimatedGifReader
85
import com.sksamuel.scrimage.nio.ImageSource
@@ -12,6 +9,9 @@ import dev.kord.core.entity.GuildEmoji
129
import dev.kord.core.entity.StandardEmoji
1310
import dev.kord.gateway.Intent
1411
import dev.kord.rest.NamedFile
12+
import dev.kordex.core.commands.Arguments
13+
import dev.kordex.core.commands.converters.impl.emoji
14+
import dev.kordex.core.extensions.Extension
1515
import dev.zt64.minkinator.util.publicSlashCommand
1616
import io.ktor.client.request.forms.*
1717
import io.ktor.utils.io.jvm.javaio.*

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/CaptionExtension.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.attachment
5-
import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingBoolean
6-
import com.kotlindiscord.kord.extensions.commands.converters.impl.string
7-
import com.kotlindiscord.kord.extensions.extensions.Extension
83
import com.sksamuel.scrimage.ImmutableImage
94
import com.sksamuel.scrimage.Position
105
import com.sksamuel.scrimage.canvas.drawables.Text
6+
import dev.kordex.core.commands.Arguments
7+
import dev.kordex.core.commands.converters.impl.attachment
8+
import dev.kordex.core.commands.converters.impl.defaultingBoolean
9+
import dev.kordex.core.commands.converters.impl.string
10+
import dev.kordex.core.extensions.Extension
1111
import dev.zt64.minkinator.extension.media.mutateGif
1212
import dev.zt64.minkinator.extension.media.mutateImage
1313
import dev.zt64.minkinator.util.publicSlashCommand

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/CoinTossExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
43
import dev.kord.common.Color
54
import dev.kord.rest.builder.message.embed
5+
import dev.kordex.core.extensions.Extension
66
import dev.zt64.minkinator.util.publicSlashCommand
77
import dev.zt64.minkinator.util.success
88

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/ConnectFourExtension.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.commands.Arguments
5-
import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalUser
6-
import com.kotlindiscord.kord.extensions.extensions.Extension
73
import dev.kord.rest.builder.message.embed
4+
import dev.kordex.core.checks.anyGuild
5+
import dev.kordex.core.commands.Arguments
6+
import dev.kordex.core.commands.converters.impl.optionalUser
7+
import dev.kordex.core.extensions.Extension
88
import dev.zt64.minkinator.util.footer
99
import dev.zt64.minkinator.util.publicSlashCommand
1010

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/CountExtension.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
4-
import com.kotlindiscord.kord.extensions.extensions.event
53
import dev.kord.core.event.message.MessageCreateEvent
4+
import dev.kordex.core.extensions.Extension
5+
import dev.kordex.core.extensions.event
66
import dev.zt64.minkinator.util.chatCommand
77
import dev.zt64.minkinator.util.chatGroupCommand
88
import org.koin.core.component.inject

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/EventLogExtension.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.events.ChatCommandInvocationEvent
4-
import com.kotlindiscord.kord.extensions.commands.events.SlashCommandInvocationEvent
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
63
import dev.kord.core.entity.channel.GuildChannel
74
import dev.kord.core.event.gateway.ReadyEvent
85
import dev.kord.core.event.guild.MemberJoinEvent
96
import dev.kord.core.event.guild.MemberLeaveEvent
7+
import dev.kordex.core.commands.events.ChatCommandInvocationEvent
8+
import dev.kordex.core.commands.events.SlashCommandInvocationEvent
9+
import dev.kordex.core.extensions.Extension
1010
import dev.zt64.minkinator.util.event
1111

1212
object EventLogExtension : Extension() {

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/GptExtension.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ import com.aallam.openai.api.model.ModelId
99
import com.aallam.openai.api.moderation.ModerationRequest
1010
import com.aallam.openai.client.LoggingConfig
1111
import com.aallam.openai.client.OpenAI
12-
import com.kotlindiscord.kord.extensions.checks.anyGuild
13-
import com.kotlindiscord.kord.extensions.checks.isNotBot
14-
import com.kotlindiscord.kord.extensions.events.EventContext
15-
import com.kotlindiscord.kord.extensions.extensions.Extension
16-
import com.kotlindiscord.kord.extensions.extensions.chatGroupCommand
17-
import com.kotlindiscord.kord.extensions.extensions.event
18-
import com.kotlindiscord.kord.extensions.utils.env
1912
import dev.kord.common.entity.Snowflake
2013
import dev.kord.core.behavior.channel.withTyping
2114
import dev.kord.core.behavior.edit
@@ -25,6 +18,13 @@ import dev.kord.gateway.Intent
2518
import dev.kord.gateway.PrivilegedIntent
2619
import dev.kord.x.emoji.Emojis
2720
import dev.kord.x.emoji.toReaction
21+
import dev.kordex.core.checks.anyGuild
22+
import dev.kordex.core.checks.isNotBot
23+
import dev.kordex.core.events.EventContext
24+
import dev.kordex.core.extensions.Extension
25+
import dev.kordex.core.extensions.chatGroupCommand
26+
import dev.kordex.core.extensions.event
27+
import dev.kordex.core.utils.env
2828
import dev.zt64.minkinator.util.isSuperuser
2929
import dev.zt64.minkinator.util.mentions
3030
import dev.zt64.minkinator.util.reply

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/GuessmojiExtension.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.int
5-
import com.kotlindiscord.kord.extensions.components.components
6-
import com.kotlindiscord.kord.extensions.components.publicButton
7-
import com.kotlindiscord.kord.extensions.components.types.emoji
8-
import com.kotlindiscord.kord.extensions.extensions.Extension
9-
import com.kotlindiscord.kord.extensions.time.TimestampType
103
import dev.kord.common.Color
114
import dev.kord.common.entity.Snowflake
125
import dev.kord.rest.builder.message.embed
6+
import dev.kordex.core.commands.Arguments
7+
import dev.kordex.core.commands.converters.impl.int
8+
import dev.kordex.core.components.components
9+
import dev.kordex.core.components.publicButton
10+
import dev.kordex.core.components.types.emoji
11+
import dev.kordex.core.extensions.Extension
12+
import dev.kordex.core.time.TimestampType
1313
import dev.zt64.minkinator.util.*
1414
import kotlinx.coroutines.delay
1515
import kotlin.time.Duration.Companion.seconds

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/GuildInfoExtension.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.extensions.Extension
53
import dev.kord.common.Color
64
import dev.kord.rest.Image
75
import dev.kord.rest.builder.message.embed
6+
import dev.kordex.core.checks.anyGuild
7+
import dev.kordex.core.extensions.Extension
88
import dev.zt64.minkinator.util.*
99

1010
object GuildInfoExtension : Extension() {

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/KickExtension.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.checks.hasPermission
5-
import com.kotlindiscord.kord.extensions.commands.Arguments
6-
import com.kotlindiscord.kord.extensions.commands.converters.impl.member
7-
import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalString
8-
import com.kotlindiscord.kord.extensions.extensions.Extension
93
import dev.kord.common.Color
104
import dev.kord.common.entity.Permission
115
import dev.kord.rest.builder.message.embed
126
import dev.kord.rest.request.RestRequestException
7+
import dev.kordex.core.checks.anyGuild
8+
import dev.kordex.core.checks.hasPermission
9+
import dev.kordex.core.commands.Arguments
10+
import dev.kordex.core.commands.converters.impl.member
11+
import dev.kordex.core.commands.converters.impl.optionalString
12+
import dev.kordex.core.extensions.Extension
1313
import dev.zt64.minkinator.util.*
1414

1515
object KickExtension : Extension() {

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/MarkovExtension.kt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.DiscordRelayedException
4-
import com.kotlindiscord.kord.extensions.checks.anyGuild
5-
import com.kotlindiscord.kord.extensions.checks.isNotBot
6-
import com.kotlindiscord.kord.extensions.commands.Arguments
7-
import com.kotlindiscord.kord.extensions.commands.converters.impl.*
8-
import com.kotlindiscord.kord.extensions.components.components
9-
import com.kotlindiscord.kord.extensions.components.ephemeralButton
10-
import com.kotlindiscord.kord.extensions.extensions.Extension
11-
import com.kotlindiscord.kord.extensions.extensions.event
12-
import com.kotlindiscord.kord.extensions.utils.botHasPermissions
133
import dev.kord.common.Color
144
import dev.kord.common.entity.ButtonStyle
155
import dev.kord.common.entity.Permission
@@ -27,6 +17,16 @@ import dev.kord.rest.builder.message.EmbedBuilder
2717
import dev.kord.rest.builder.message.allowedMentions
2818
import dev.kord.rest.builder.message.create.UserMessageCreateBuilder
2919
import dev.kord.rest.builder.message.embed
20+
import dev.kordex.core.DiscordRelayedException
21+
import dev.kordex.core.checks.anyGuild
22+
import dev.kordex.core.checks.isNotBot
23+
import dev.kordex.core.commands.Arguments
24+
import dev.kordex.core.commands.converters.impl.*
25+
import dev.kordex.core.components.components
26+
import dev.kordex.core.components.ephemeralButton
27+
import dev.kordex.core.extensions.Extension
28+
import dev.kordex.core.extensions.event
29+
import dev.kordex.core.utils.botHasPermissions
3030
import dev.zt64.minkinator.data.*
3131
import dev.zt64.minkinator.util.*
3232
import kotlinx.coroutines.flow.*

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/MemberLogExtension.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.checks.hasPermission
5-
import com.kotlindiscord.kord.extensions.components.components
6-
import com.kotlindiscord.kord.extensions.components.ephemeralButton
7-
import com.kotlindiscord.kord.extensions.extensions.Extension
8-
import com.kotlindiscord.kord.extensions.extensions.event
93
import dev.kord.common.Color
104
import dev.kord.common.entity.ButtonStyle
115
import dev.kord.common.entity.Permission
@@ -14,6 +8,12 @@ import dev.kord.core.event.guild.MemberLeaveEvent
148
import dev.kord.gateway.Intent
159
import dev.kord.gateway.PrivilegedIntent
1610
import dev.kord.rest.builder.message.embed
11+
import dev.kordex.core.checks.anyGuild
12+
import dev.kordex.core.checks.hasPermission
13+
import dev.kordex.core.components.components
14+
import dev.kordex.core.components.ephemeralButton
15+
import dev.kordex.core.extensions.Extension
16+
import dev.kordex.core.extensions.event
1717
import dev.zt64.minkinator.util.ephemeralSlashCommand
1818
import dev.zt64.minkinator.util.ephemeralSubCommand
1919
import dev.zt64.minkinator.util.success

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/NameNormalizerExtension.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.checks.anyGuild
4-
import com.kotlindiscord.kord.extensions.checks.hasPermission
5-
import com.kotlindiscord.kord.extensions.commands.Arguments
6-
import com.kotlindiscord.kord.extensions.commands.converters.impl.member
7-
import com.kotlindiscord.kord.extensions.extensions.Extension
8-
import com.kotlindiscord.kord.extensions.extensions.event
9-
import com.kotlindiscord.kord.extensions.types.EphemeralInteractionContext
10-
import com.kotlindiscord.kord.extensions.utils.hasPermission
11-
import com.kotlindiscord.kord.extensions.utils.selfMember
123
import dev.kord.common.entity.Permission
134
import dev.kord.core.behavior.edit
145
import dev.kord.core.entity.Member
156
import dev.kord.core.event.guild.MemberJoinEvent
167
import dev.kord.core.event.guild.MemberUpdateEvent
178
import dev.kord.gateway.Intent
189
import dev.kord.gateway.PrivilegedIntent
10+
import dev.kordex.core.checks.anyGuild
11+
import dev.kordex.core.checks.hasPermission
12+
import dev.kordex.core.commands.Arguments
13+
import dev.kordex.core.commands.converters.impl.member
14+
import dev.kordex.core.extensions.Extension
15+
import dev.kordex.core.extensions.event
16+
import dev.kordex.core.types.EphemeralInteractionContext
17+
import dev.kordex.core.utils.hasPermission
18+
import dev.kordex.core.utils.selfMember
1919
import dev.zt64.minkinator.util.ephemeralSlashCommand
2020
import dev.zt64.minkinator.util.ephemeralUserCommand
2121
import java.text.Normalizer

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/PingExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
43
import dev.kord.common.Color
54
import dev.kord.rest.builder.message.embed
5+
import dev.kordex.core.extensions.Extension
66
import dev.zt64.minkinator.util.publicSlashCommand
77
import dev.zt64.minkinator.util.success
88

‎bot/src/main/kotlin/dev/zt64/minkinator/extension/PollExtension.kt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package dev.zt64.minkinator.extension
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.defaultingDuration
5-
import com.kotlindiscord.kord.extensions.commands.converters.impl.string
6-
import com.kotlindiscord.kord.extensions.components.components
7-
import com.kotlindiscord.kord.extensions.components.ephemeralStringSelectMenu
8-
import com.kotlindiscord.kord.extensions.extensions.Extension
9-
import com.kotlindiscord.kord.extensions.time.TimestampType
10-
import com.kotlindiscord.kord.extensions.utils.toDuration
113
import dev.kord.common.Color
124
import dev.kord.common.entity.Snowflake
135
import dev.kord.core.behavior.interaction.followup.edit
146
import dev.kord.core.behavior.reply
157
import dev.kord.rest.builder.message.embed
8+
import dev.kordex.core.commands.Arguments
9+
import dev.kordex.core.commands.converters.impl.defaultingDuration
10+
import dev.kordex.core.commands.converters.impl.string
11+
import dev.kordex.core.components.components
12+
import dev.kordex.core.components.ephemeralStringSelectMenu
13+
import dev.kordex.core.extensions.Extension
14+
import dev.kordex.core.time.TimestampType
15+
import dev.kordex.core.utils.toDuration
1616
import dev.zt64.minkinator.util.*
1717
import kotlinx.coroutines.delay
1818
import kotlinx.coroutines.sync.withLock

0 commit comments

Comments
 (0)