Skip to content

Commit

Permalink
Update to Kordex 1.7.1-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
NoComment1105 committed Dec 22, 2023
1 parent 7b439e6 commit 96a0f33
Show file tree
Hide file tree
Showing 21 changed files with 42 additions and 62 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ grgit = "5.2.1"
blossom = "2.1.0"

# Libraries
kord-extensions = "1.5.9-20230809.104126-1"
kord-extensions = "1.7.1-20231217.132026-9"
logging = "5.1.1"
logback = "1.4.14"
github-api = "1.317"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ import com.kotlindiscord.kord.extensions.modules.unsafe.extensions.unsafeSubComm
import com.kotlindiscord.kord.extensions.modules.unsafe.types.InitialSlashCommandResponse
import com.kotlindiscord.kord.extensions.modules.unsafe.types.ackEphemeral
import com.kotlindiscord.kord.extensions.modules.unsafe.types.respondEphemeral
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.botHasPermissions
import dev.kord.common.entity.Permission
import dev.kord.core.behavior.channel.createMessage
import dev.kord.core.behavior.getChannelOfOrNull
import dev.kord.core.behavior.interaction.modal
import dev.kord.core.entity.channel.TextChannel
import dev.kord.rest.builder.message.EmbedBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.LoggingConfigCollection
import org.hyacinthbots.lilybot.database.collections.ModerationConfigCollection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import com.kotlindiscord.kord.extensions.modules.unsafe.extensions.unsafeSubComm
import com.kotlindiscord.kord.extensions.modules.unsafe.types.InitialSlashCommandResponse
import com.kotlindiscord.kord.extensions.modules.unsafe.types.ackEphemeral
import com.kotlindiscord.kord.extensions.modules.unsafe.types.respondEphemeral
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.delete
import com.kotlindiscord.kord.extensions.utils.respond
import dev.kord.common.entity.ArchiveDuration
Expand All @@ -44,7 +43,7 @@ import dev.kord.core.entity.channel.thread.TextChannelThread
import dev.kord.core.entity.channel.thread.ThreadChannel
import dev.kord.core.event.channel.thread.ThreadChannelCreateEvent
import dev.kord.core.supplier.EntitySupplyStrategy
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.coroutines.delay
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.AutoThreadingCollection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import dev.kord.core.behavior.getChannelOfOrNull
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.event.guild.MemberJoinEvent
import dev.kord.core.event.guild.MemberLeaveEvent
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.LoggingConfigCollection
import org.hyacinthbots.lilybot.extensions.config.ConfigOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import dev.kord.core.entity.Message
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.event.message.MessageBulkDeleteEvent
import dev.kord.rest.builder.message.create.UserMessageCreateBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import io.ktor.client.request.forms.ChannelProvider
import io.ktor.util.cio.toByteReadChannel
import kotlinx.datetime.Clock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import dev.kord.core.behavior.channel.asChannelOfOrNull
import dev.kord.core.behavior.channel.createMessage
import dev.kord.core.entity.Message
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.extensions.config.ConfigOptions
import org.hyacinthbots.lilybot.utils.attachmentsAndProxiedMessageInfo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalChanne
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.types.EphemeralInteractionContext
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.entity.Permission
import dev.kord.common.entity.Permissions
import dev.kord.core.behavior.channel.asChannelOfOrNull
Expand Down Expand Up @@ -342,8 +341,8 @@ class LockingCommands : Extension() {
if (targetChannel == null) {
respond {
content = "I can't fetch the targeted channel properly."
return null
}
return null
}

return targetChannel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,13 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.optionalUser
import com.kotlindiscord.kord.extensions.commands.converters.impl.snowflake
import com.kotlindiscord.kord.extensions.commands.converters.impl.user
import com.kotlindiscord.kord.extensions.components.components
import com.kotlindiscord.kord.extensions.components.ephemeralSelectMenu
import com.kotlindiscord.kord.extensions.components.ephemeralStringSelectMenu
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralMessageCommand
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.modules.extra.pluralkit.api.PluralKit
import com.kotlindiscord.kord.extensions.time.TimestampType
import com.kotlindiscord.kord.extensions.time.toDiscord
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.dm
import com.kotlindiscord.kord.extensions.utils.isNullOrBot
import com.kotlindiscord.kord.extensions.utils.timeout
Expand All @@ -49,7 +48,7 @@ import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.entity.interaction.followup.EphemeralFollowupMessage
import dev.kord.core.supplier.EntitySupplyStrategy
import dev.kord.rest.builder.message.EmbedBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import dev.kord.rest.request.KtorRequestException
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.flowOf
Expand Down Expand Up @@ -134,7 +133,7 @@ class ModerationCommands : Extension() {
menuMessage = respond {
content = "How would you like to moderate this message?"
components {
ephemeralSelectMenu {
ephemeralStringSelectMenu {
placeholder = "Select action..."
maximumChoices = 1 // Prevent selecting multiple options at once

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ import com.kotlindiscord.kord.extensions.components.linkButton
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralMessageCommand
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.types.edit
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.getJumpUrl
import dev.kord.common.entity.ButtonStyle
import dev.kord.common.entity.Snowflake
Expand All @@ -22,7 +20,7 @@ import dev.kord.core.behavior.getChannelOfOrNull
import dev.kord.core.entity.Message
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.rest.builder.message.create.FollowupMessageCreateBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.ModerationConfigCollection
import org.hyacinthbots.lilybot.extensions.config.ConfigOptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import com.kotlindiscord.kord.extensions.commands.application.slash.ephemeralSub
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.event
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.delete
import com.kotlindiscord.kord.extensions.utils.permissionsForMember
import com.kotlindiscord.kord.extensions.utils.respond
Expand All @@ -22,7 +21,7 @@ import dev.kord.core.behavior.channel.createMessage
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.event.message.MessageCreateEvent
import dev.kord.core.exception.EntityNotFoundException
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.coroutines.delay
import org.hyacinthbots.lilybot.database.collections.GalleryChannelCollection
import org.hyacinthbots.lilybot.extensions.config.ConfigOptions
Expand Down
40 changes: 19 additions & 21 deletions src/main/kotlin/org/hyacinthbots/lilybot/extensions/util/Github.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ import com.kotlindiscord.kord.extensions.commands.converters.impl.string
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.sentry.BreadcrumbType
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.types.respondEphemeral
import dev.kord.common.entity.Permission
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.GithubCollection
import org.hyacinthbots.lilybot.github
Expand Down Expand Up @@ -75,7 +73,7 @@ class Github : Extension() {
category = "extensions.util.Github.issue.InputCheck"
message = "Input missing /"
}
respondEphemeral {
respond {
embed {
title = "Make sure your repository input is formatted like this:"
description = "Format: `User/Repo` or `Org/Repo` \nFor example: `HyacinthBots/LilyBot`"
Expand All @@ -96,7 +94,7 @@ class Github : Extension() {
try {
github.getRepository(repository)?.getIssue(arguments.issue)
} catch (e: GHFileNotFoundException) {
respondEphemeral {
respond {
embed {
title = "Unable to find issue number! Make sure this issue exists"
}
Expand All @@ -115,7 +113,7 @@ class Github : Extension() {
try {
iterator!!.hasNext()
} catch (e: GHException) {
respondEphemeral {
respond {
embed {
title = "Unable to access repository, make sure this repository exists!"
}
Expand All @@ -131,7 +129,7 @@ class Github : Extension() {
message = "Unable to find issue"
}

respondEphemeral {
respond {
embed {
title = "Invalid issue number. Make sure this issue exists!"
}
Expand Down Expand Up @@ -177,7 +175,7 @@ class Github : Extension() {
title = "Error!"
description = "Error occurred initializing Pull Request. How did this happen?"
color = DISCORD_RED
return@action
return@respond
}
} else {
title = issue.title
Expand Down Expand Up @@ -303,7 +301,7 @@ class Github : Extension() {
category = "extensions.util.Github.repository.InputCheck"
message = "Input missing /"
}
respondEphemeral {
respond {
embed {
title = "Make sure your input is formatted like this:"
description = "Format: `User/Repo` or `Org/Repo`\nFor example: `HyacinthBots/LilyBot`"
Expand Down Expand Up @@ -332,7 +330,7 @@ class Github : Extension() {
category = "extensions.util.Github.repository.getRepository"
message = "Repository not found"
}
respondEphemeral {
respond {
embed {
title = "Invalid repository name. Make sure this repository exists"
}
Expand Down Expand Up @@ -413,7 +411,7 @@ class Github : Extension() {
category = "extensions.util.Github.user.getUser"
message = "Unable to find user"
}
respondEphemeral {
respond {
embed {
title = "Invalid Username. Make sure this user exists!"
}
Expand All @@ -425,11 +423,11 @@ class Github : Extension() {
val isOrg: Boolean = ghUser?.type.equals("Organization")

if (!isOrg) {
sentry.breadcrumb(BreadcrumbType.Info) {
category = "extensions.util.Github.user.isOrg"
message = "User is not Organisation"
data["isNotOrg"] = ghUser?.login
}
// sentry.breadcrumb(BreadcrumbType.Info) {
// category = "extensions.util.Github.user.isOrg"
// message = "User is not Organisation"
// data["isNotOrg"] = ghUser?.login
// }
respond {
embed {
title = "GitHub profile for " + ghUser?.login
Expand Down Expand Up @@ -481,11 +479,11 @@ class Github : Extension() {
}
}
} else {
sentry.breadcrumb(BreadcrumbType.Info) {
category = "extensions.util.Github.user.isOrg"
message = "User is Organisation"
data["isOrg"] = ghUser?.login
}
// sentry.breadcrumb(BreadcrumbType.Info) {
// category = "extensions.util.Github.user.isOrg"
// message = "User is Organisation"
// data["isOrg"] = ghUser?.login
// }
val org: GHOrganization? = github.getOrganization(ghUser?.login)

respond {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.kotlindiscord.kord.extensions.components.ephemeralButton
import com.kotlindiscord.kord.extensions.components.forms.ModalForm
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.Color
import dev.kord.common.entity.ButtonStyle
import dev.kord.common.entity.Permission
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.time.TimestampType
import com.kotlindiscord.kord.extensions.time.toDiscord
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.rest.builder.message.create.MessageCreateBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
import org.hyacinthbots.lilybot.database.collections.UptimeCollection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import com.kotlindiscord.kord.extensions.components.forms.ModalForm
import com.kotlindiscord.kord.extensions.components.linkButton
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.getJumpUrl
import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
import com.kotlindiscord.kord.extensions.utils.scheduling.Task
Expand All @@ -39,8 +38,7 @@ import dev.kord.core.behavior.interaction.followup.edit
import dev.kord.core.entity.Message
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.entity.interaction.followup.EphemeralFollowupMessage
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.modify.embed
import dev.kord.rest.builder.message.embed
import dev.kord.rest.request.KtorRequestException
import kotlinx.coroutines.flow.toList
import kotlinx.datetime.Clock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import com.kotlindiscord.kord.extensions.extensions.event
import com.kotlindiscord.kord.extensions.pagination.EphemeralResponsePaginator
import com.kotlindiscord.kord.extensions.pagination.pages.Page
import com.kotlindiscord.kord.extensions.pagination.pages.Pages
import com.kotlindiscord.kord.extensions.types.respond
import dev.kord.common.Locale
import dev.kord.common.asJavaLocale
import dev.kord.common.entity.ChannelType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import com.kotlindiscord.kord.extensions.components.ephemeralButton
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.dm
import com.kotlindiscord.kord.extensions.utils.getTopRole
import com.kotlindiscord.kord.extensions.utils.hasPermission
Expand All @@ -25,8 +24,7 @@ import dev.kord.core.behavior.edit
import dev.kord.core.behavior.getChannelOfOrNull
import dev.kord.core.entity.Message
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.modify.embed
import dev.kord.rest.builder.message.embed
import dev.kord.rest.request.KtorRequestException
import kotlinx.datetime.Clock
import org.hyacinthbots.lilybot.database.collections.UtilityConfigCollection
Expand Down Expand Up @@ -118,8 +116,8 @@ class PublicUtilities : Extension() {
requesterAsMember.edit { nickname = arguments.newNick }
respond {
content = "You have permission to change your own nickname, so I've just made the change."
return@action
}
return@action
}

// Declare the embed outside the action to allow us to reference it inside the action
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import com.kotlindiscord.kord.extensions.pagination.pages.Page
import com.kotlindiscord.kord.extensions.pagination.pages.Pages
import com.kotlindiscord.kord.extensions.time.TimestampType
import com.kotlindiscord.kord.extensions.time.toDiscord
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.botHasPermissions
import com.kotlindiscord.kord.extensions.utils.dm
import com.kotlindiscord.kord.extensions.utils.scheduling.Scheduler
Expand All @@ -37,7 +36,7 @@ import dev.kord.core.entity.Guild
import dev.kord.core.entity.channel.GuildMessageChannel
import dev.kord.core.event.interaction.ChatInputCommandInteractionCreateEvent
import dev.kord.rest.builder.message.create.MessageCreateBuilder
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import dev.kord.rest.request.KtorRequestException
import kotlinx.datetime.Clock
import kotlinx.datetime.DateTimePeriod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import com.kotlindiscord.kord.extensions.components.linkButton
import com.kotlindiscord.kord.extensions.extensions.Extension
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
import com.kotlindiscord.kord.extensions.extensions.event
import com.kotlindiscord.kord.extensions.types.respond
import com.kotlindiscord.kord.extensions.utils.getJumpUrl
import com.kotlindiscord.kord.extensions.utils.getTopRole
import dev.kord.common.entity.ButtonStyle
Expand All @@ -35,7 +34,7 @@ import dev.kord.core.behavior.interaction.respondEphemeral
import dev.kord.core.entity.Message
import dev.kord.core.entity.Role
import dev.kord.core.event.interaction.GuildButtonInteractionCreateEvent
import dev.kord.rest.builder.message.create.embed
import dev.kord.rest.builder.message.embed
import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.flow.toList
Expand Down Expand Up @@ -486,6 +485,7 @@ class RoleMenu : Extension() {
event.interaction.respondEphemeral {
content = "Use the menu below to select roles."
components {
// TODO Update to ephemeralRoleSelectMenu
ephemeralSelectMenu {
placeholder = "Select roles..."
maximumChoices = roles.size
Expand Down Expand Up @@ -582,6 +582,7 @@ class RoleMenu : Extension() {
respond {
content = "Use the menu below to subscribe to roles."
components {
// TODO Update to ephemeralRoleSelectMenu
ephemeralSelectMenu {
placeholder = "Select roles to subscribe to..."
minimumChoices = 0
Expand Down

0 comments on commit 96a0f33

Please sign in to comment.