Update alongside Kord

Kord-Extensions · Nov 23, 2023 · 356a371 · 356a371
1 parent dbcd957
commit 356a371
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt b/...main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/phishing/PhishingExtension.kt
@@ -27,7 +27,7 @@ import dev.kord.core.entity.Message
 import dev.kord.core.entity.channel.GuildMessageChannel
 import dev.kord.core.event.message.MessageCreateEvent
 import dev.kord.core.event.message.MessageUpdateEvent
-import dev.kord.rest.builder.message.create.embed
+import dev.kord.rest.builder.message.embed
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.client.*
 import io.ktor.client.plugins.*

diff --git a/.../src/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/pluralkit/PKExtension.kt b/.../src/main/kotlin/com/kotlindiscord/kord/extensions/modules/extra/pluralkit/PKExtension.kt
@@ -43,7 +43,7 @@ import dev.kord.core.entity.channel.TopGuildMessageChannel
 import dev.kord.core.event.message.MessageCreateEvent
 import dev.kord.core.event.message.MessageDeleteEvent
 import dev.kord.core.event.message.MessageUpdateEvent
-import dev.kord.rest.builder.message.create.embed
+import dev.kord.rest.builder.message.embed
 import dev.kord.rest.request.KtorRequestException
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.delay

diff --git a/...ns/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/MessageButtonPaginator.kt b/...ns/src/main/kotlin/com/kotlindiscord/kord/extensions/pagination/MessageButtonPaginator.kt
@@ -15,10 +15,8 @@ import dev.kord.core.behavior.channel.createMessage
 import dev.kord.core.behavior.edit
 import dev.kord.core.entity.Message
 import dev.kord.core.entity.ReactionEmoji
-import dev.kord.rest.builder.message.create.allowedMentions
-import dev.kord.rest.builder.message.create.embed
-import dev.kord.rest.builder.message.modify.allowedMentions
-import dev.kord.rest.builder.message.modify.embed
+import dev.kord.rest.builder.message.allowedMentions
+import dev.kord.rest.builder.message.embed
 import java.util.*
 
 /**

diff --git a/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Permissions.kt b/kord-extensions/src/main/kotlin/com/kotlindiscord/kord/extensions/utils/_Permissions.kt
@@ -13,6 +13,8 @@ import java.util.*
 
 @Suppress("DEPRECATION", "DEPRECATION_ERROR")
 public fun Permission.toTranslationKey(): String? = when (this) {
+	Permission.CreateEvents -> "permission.createEvents"
+	Permission.CreateGuildExpressions -> "permission.createGuildExpressions"
     Permission.AddReactions -> "permission.addReactions"
     Permission.Administrator -> "permission.administrator"
     Permission.All -> "permission.all"
@@ -21,46 +23,44 @@ public fun Permission.toTranslationKey(): String? = when (this) {
     Permission.ChangeNickname -> "permission.changeNickname"
     Permission.Connect -> "permission.connect"
     Permission.CreateInstantInvite -> "permission.createInstantInvite"
+    Permission.CreatePrivateThreads -> "permission.createPrivateThreads"
+    Permission.CreatePublicThreads -> "permission.createPublicThreads"
     Permission.DeafenMembers -> "permission.deafenMembers"
     Permission.EmbedLinks -> "permission.embedLinks"
     Permission.KickMembers -> "permission.kickMembers"
     Permission.ManageChannels -> "permission.manageChannels"
-    Permission.ManageGuildExpressions -> "permission.manageExpressions"
     Permission.ManageEvents -> "permission.manageEvents"
     Permission.ManageGuild -> "permission.manageGuild"
+    Permission.ManageGuildExpressions -> "permission.manageExpressions"
     Permission.ManageMessages -> "permission.manageMessages"
     Permission.ManageNicknames -> "permission.manageNicknames"
     Permission.ManageRoles -> "permission.manageRoles"
     Permission.ManageThreads -> "permission.manageThreads"
     Permission.ManageWebhooks -> "permission.manageWebhooks"
     Permission.MentionEveryone -> "permission.mentionEveryone"
+    Permission.ModerateMembers -> "permission.timeoutMembers"
     Permission.MoveMembers -> "permission.moveMembers"
     Permission.MuteMembers -> "permission.muteMembers"
     Permission.PrioritySpeaker -> "permission.prioritySpeaker"
     Permission.ReadMessageHistory -> "permission.readMessageHistory"
     Permission.RequestToSpeak -> "permission.requestToSpeak"
     Permission.SendMessages -> "permission.sendMessages"
+    Permission.SendMessagesInThreads -> "permission.sendMessagesInThreads"
     Permission.SendTTSMessages -> "permission.sendTTSMessages"
     Permission.SendVoiceMessages -> "permission.sendVoiceMessages"
     Permission.Speak -> "permission.speak"
     Permission.Stream -> "permission.stream"
-    Permission.ModerateMembers -> "permission.timeoutMembers"
     Permission.UseApplicationCommands -> "permission.useApplicationCommands"
+    Permission.UseEmbeddedActivities -> "permission.useEmbeddedActivities"
     Permission.UseExternalEmojis -> "permission.useExternalEmojis"
     Permission.UseExternalSounds -> "permission.useExternalSounds"
+    Permission.UseExternalStickers -> "permission.useExternalStickers"
+    Permission.UseSoundboard -> "permission.useSoundboard"
     Permission.UseVAD -> "permission.useVAD"
     Permission.ViewAuditLog -> "permission.viewAuditLog"
     Permission.ViewChannel -> "permission.viewChannel"
-    Permission.ViewGuildInsights -> "permission.viewGuildInsights"
-
-    Permission.CreatePublicThreads -> "permission.createPublicThreads"
-    Permission.CreatePrivateThreads -> "permission.createPrivateThreads"
-    Permission.SendMessagesInThreads -> "permission.sendMessagesInThreads"
-
-    Permission.UseExternalStickers -> "permission.useExternalStickers"
-    Permission.UseEmbeddedActivities -> "permission.useEmbeddedActivities"
     Permission.ViewCreatorMonetizationAnalytics -> "permission.viewCreatorMonetizationAnalytics"
-    Permission.UseSoundboard -> "permission.useSoundboard"
+    Permission.ViewGuildInsights -> "permission.viewGuildInsights"
 
     is Permission.Unknown -> null
 }

diff --git a/kord-extensions/src/main/resources/translations/kordex/strings.properties b/kord-extensions/src/main/resources/translations/kordex/strings.properties
@@ -180,6 +180,8 @@ permission.attachFiles=Attach Files
 permission.banMembers=Ban Members
 permission.changeNickname=Change Nickname
 permission.connect=Connect (Voice)
+permission.createEvents=Create Events
+permission.createGuildExpressions=Create Expressions
 permission.createInstantInvite=Create Invite
 permission.createPrivateThreads=Create Private Threads
 permission.createPublicThreads=Create Public Threads

diff --git a/kord-extensions/src/main/resources/translations/kordex/strings_en_GB.properties b/kord-extensions/src/main/resources/translations/kordex/strings_en_GB.properties
@@ -169,6 +169,8 @@ permission.attachFiles=Attach Files
 permission.banMembers=Ban Members
 permission.changeNickname=Change Nickname
 permission.connect=Connect (Voice)
+permission.createEvents=Create Events
+permission.createGuildExpressions=Create Expressions
 permission.createInstantInvite=Create Invite
 permission.createPrivateThreads=Create Private Threads
 permission.createPublicThreads=Create Public Threads