Skip to content

Revert changes optionType changes #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
astatio wants to merge 1 commit into from
Closed

Revert changes optionType changes #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/kotlin/dev/minn/jda/ktx/interactions/commands/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import net.dv8tion.jda.api.interactions.commands.OptionType
import java.io.File

inline fun <reified T> optionType() = when(T::class.java) {
Float::class.java, Double::class.java -> OptionType.NUMBER
Int::class.java, Long::class.java, Short::class.java, Byte::class.java -> OptionType.INTEGER
java.lang.Float::class.java, java.lang.Double::class.java -> OptionType.NUMBER
Integer::class.java, java.lang.Long::class.java, java.lang.Short::class.java, java.lang.Byte::class.java -> OptionType.INTEGER
String::class.java -> OptionType.STRING
User::class.java, Member::class.java -> OptionType.USER
Role::class.java -> OptionType.ROLE
Boolean::class.java -> OptionType.BOOLEAN
java.lang.Boolean::class.java -> OptionType.BOOLEAN
File::class.java, Message.Attachment::class.java -> OptionType.ATTACHMENT
else -> when {
Channel::class.java.isAssignableFrom(T::class.java) -> OptionType.CHANNEL
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/dev/minn/jda/ktx/interactions/components/utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ inline fun <reified T> CommandInteractionPayload.getOption(name: String): T? = w
User::class.java -> getOption(name, OptionMapping::getAsUser) as? T
Member::class.java -> getOption(name, OptionMapping::getAsMember) as? T
Role::class.java -> getOption(name, OptionMapping::getAsRole) as? T
Int::class.java -> getOption(name, OptionMapping::getAsInt) as? T
Long::class.java -> getOption(name, OptionMapping::getAsLong) as? T
Integer::class.java, Int::class.java -> getOption(name, OptionMapping::getAsInt) as? T
Long::class.java, java.lang.Long::class.java -> getOption(name, OptionMapping::getAsLong) as? T
Double::class.java -> getOption(name, OptionMapping::getAsDouble) as? T
Boolean::class.java -> getOption(name, OptionMapping::getAsBoolean) as? T
Boolean::class.java, java.lang.Boolean::class.java -> getOption(name, OptionMapping::getAsBoolean) as? T
String::class.java -> getOption(name, OptionMapping::getAsString) as? T
Message.Attachment::class.java -> getOption(name, OptionMapping::getAsAttachment) as? T
IMentionable::class.java -> getOption(name, OptionMapping::getAsMentionable) as? T
Expand Down
Loading