Forms support #531

HopeBaron · 2022-02-10T19:19:55Z

Adds Form support
changes the tree of Interactions to match the following diagram:

You can already receive modals via the gateway and send modals via REST

…s and text inputs sharing the same field name

common/src/main/kotlin/entity/DiscordComponent.kt

core/src/main/kotlin/behavior/GuildInteractionBehavior.kt

core/src/main/kotlin/behavior/GlobalInteractionBehavior.kt

core/src/main/kotlin/behavior/GuildInteractionBehavior.kt

rest/src/main/kotlin/builder/interaction/ModalBuilder.kt

rest/src/main/kotlin/json/request/InteractionsRequests.kt

rest/src/main/kotlin/service/InteractionService.kt

Co-authored-by: Lukellmann <[email protected]>

lukellmann · 2022-02-12T12:12:51Z

ActionRowComponent should probably get a new textInputs property

Edit: it was added in 4b96ef5

Co-authored-by: Lukellmann <[email protected]>

* return types * sealed InteractionResponseBehavior * ClosedRange<Int> instead of IntRange * rename file

core/src/main/kotlin/entity/interaction/OptionValue.kt

core/src/main/kotlin/entity/interaction/ActionInteraction.kt

core/src/main/kotlin/entity/interaction/OptionValue.kt

* move MessageInteraction into Message * interactions * clarify why ComponentInteractionBehavior is no ModalParentInteractionBehavior * typo * rename ApplicationCommandInteractionInteractionCreateEvent to ApplicationCommandInteractionCreateEvent * move ResolvedObjects * attachments in InteractionCommand * fix InteractionCommand.filterOptions() * Entity in mentionables again * move duplicate code to InteractionCommand * ActionRowComponent docs * rename acknowledge * maps for components

lukellmann · 2022-02-20T01:33:30Z

common/src/main/kotlin/entity/Interactions.kt

@@ -695,6 +699,7 @@ public sealed class InteractionResponseType(public val type: Int) {
    public object DeferredUpdateMessage : InteractionResponseType(6)
    public object UpdateMessage : InteractionResponseType(7)
    public object ApplicationCommandAutoCompleteResult : InteractionResponseType(8)
+    public object Modal : InteractionResponseType(9)


missing 9 -> Modal in deserialize of InteractionResponseType.Serializer (but usually it should only be serialized)

lukellmann · 2022-02-20T01:44:05Z

core/src/main/kotlin/behavior/interaction/GuildInteractionBehavior.kt

+
+    override suspend fun getChannel(): GuildMessageChannel = supplier.getChannelOf(channelId)
+
+    override suspend fun getChannelOrNull(): MessageChannel? = supplier.getChannelOfOrNull(channelId)


Suggested change

override suspend fun getChannelOrNull(): MessageChannel? = supplier.getChannelOfOrNull(channelId)

override suspend fun getChannelOrNull(): GuildMessageChannel? = supplier.getChannelOfOrNull(channelId)

lukellmann · 2022-02-20T01:49:15Z

core/src/main/kotlin/behavior/interaction/response/EphemeralInteractionResponseBehavior.kt

+ * The behavior of an ephemeral [Discord ActionInteraction Response](https://discord.com/developers/docs/interactions/slash-commands#interaction-response)
+ * This response is visible to *only* to the user who made the interaction.
+ */
+public sealed interface EphemeralInteractionResponseBehavior : InteractionResponseBehavior


this link leads nowhere

lukellmann · 2022-02-20T01:52:38Z

core/src/main/kotlin/behavior/interaction/response/PublicInteractionResponseBehavior.kt

+/**
+ * The behavior of a public [Discord ActionInteraction Response](https://discord.com/developers/docs/interactions/slash-commands#interaction-response)
+ * This response is visible to all users in the channel.
+ */
+
+public sealed interface PublicInteractionResponseBehavior : InteractionResponseBehavior


this link leads nowhere

lukellmann · 2022-02-20T18:32:37Z

common/src/main/kotlin/entity/Interactions.kt

-public fun CommandArgument<*>.int(): Long {
-    return value as? Long ?: error("$value wasn't an int.")
-}
-
-
-public fun CommandArgument<*>.string(): String {
-    return value.toString()
-}


these two are used in tests

MrPowerGamerBR and others added 12 commits February 9, 2022 14:01

Initial modals implementation

4016de0

You can already receive modals via the gateway and send modals via REST

Change the "DiscordComponent" model to multiple classes due to button…

08a7cac

…s and text inputs sharing the same field name

Canonical order

2b1f43a

Use two ***DiscordComponents classes for everything

89e1e30

Rename the classes because it looks better this way

7c39464

Revert core changes

3856eee

Implement text input component classes in the core module

8d03e60

Fix TextInput component type deserialization

8223e43

improve the interaction tree

50a837e

More changes to the tree

ec873d5

remove unresolved references

9eccb31

add core events

769c8d6

lukellmann requested changes Feb 10, 2022

View reviewed changes

lukellmann mentioned this pull request Feb 11, 2022

Generic interaction create events #520

Closed

HopeBaron mentioned this pull request Feb 11, 2022

Add support for modals #528

Closed

Apply suggestions from code review

660f477

Co-authored-by: Lukellmann <[email protected]>

lukellmann mentioned this pull request Feb 11, 2022

Add modal interaction callback type #527

Closed

HopeBaron and others added 5 commits February 12, 2022 10:43

change compontents top level to ActionRowBuilder

eadce4d

Co-authored-by: Lukellmann <[email protected]>

refactor files

fa8a415

refactor interaction files

a5a8272

refactor response files

f810972

refactor followup messages

992fac9

HopeBaron and others added 7 commits February 12, 2022 14:21

add TextInputComponent list retrival property

4b96ef5

fix withStrategy return type

edd6ff0

Apply suggestions from code review

5e60f60

Co-authored-by: Lukellmann <[email protected]>

rename discord modal component to DiscordTextInputComponent

81eab28

fix interaction response type

afab86b

Forms support adjustments (#534)

8f705e7

* return types * sealed InteractionResponseBehavior * ClosedRange<Int> instead of IntRange * rename file

GuildAutoCompleteInteraction is GuildInteraction (#535)

8ae546f

lukellmann mentioned this pull request Feb 12, 2022

Allow getting ephemeral followups #533

Merged

lukellmann and others added 3 commits February 15, 2022 18:49

required is true by default for text inputs (#537)

5d9be2c

Merge branch '0.8.x' into feature/forms

39d7608

rewrite a safer OptionValue implementation

71159e9

lukellmann requested changes Feb 18, 2022

View reviewed changes

lukellmann reviewed Feb 18, 2022

View reviewed changes

core/src/main/kotlin/entity/interaction/OptionValue.kt Outdated Show resolved Hide resolved

lukellmann mentioned this pull request Feb 18, 2022

Fix interactions for forms feature #538

Merged

HopeBaron and others added 3 commits February 18, 2022 10:52

Apply code review suggestions

a63e10f

Yeet out IntOptionValue

0fb59bc

lukellmann requested changes Feb 20, 2022

View reviewed changes

cleanup and consider feedback in codereview

a5bb146

lukellmann reviewed Feb 20, 2022

View reviewed changes

reintroduce CommandArgument convience methods

5f13f84

lukellmann approved these changes Feb 20, 2022

View reviewed changes

HopeBaron merged commit b4d77e0 into 0.8.x Feb 20, 2022

HopeBaron deleted the feature/forms branch March 8, 2022 08:09

mrsrmn mentioned this pull request Mar 8, 2022

Update Kord advaith1/libs#93

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Forms support #531

Forms support #531

HopeBaron commented Feb 10, 2022

lukellmann commented Feb 12, 2022 •

edited

Loading

lukellmann Feb 20, 2022 •

edited

Loading

lukellmann Feb 20, 2022

lukellmann Feb 20, 2022

lukellmann Feb 20, 2022

lukellmann Feb 20, 2022


		override suspend fun getChannel(): GuildMessageChannel = supplier.getChannelOf(channelId)

		override suspend fun getChannelOrNull(): MessageChannel? = supplier.getChannelOfOrNull(channelId)

Forms support #531

Forms support #531

Conversation

HopeBaron commented Feb 10, 2022

lukellmann commented Feb 12, 2022 • edited Loading

lukellmann Feb 20, 2022 • edited Loading

Choose a reason for hiding this comment

lukellmann Feb 20, 2022

Choose a reason for hiding this comment

lukellmann Feb 20, 2022

Choose a reason for hiding this comment

lukellmann Feb 20, 2022

Choose a reason for hiding this comment

lukellmann Feb 20, 2022

Choose a reason for hiding this comment

lukellmann commented Feb 12, 2022 •

edited

Loading

lukellmann Feb 20, 2022 •

edited

Loading