Skip to content

Commit

Permalink
Fix builder requirements
Browse files Browse the repository at this point in the history
- Fix error when sending a emoji button
  • Loading branch information
DRSchlaubi committed Jun 5, 2021
1 parent d173fcf commit aaf9838
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions common/src/main/kotlin/entity/DiscordEmoji.kt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ data class DiscordUpdatedEmojis(
*/
@Serializable
data class DiscordPartialEmoji(
val id: Snowflake?,
val name: String?,
val id: Snowflake? = null,
val name: String? = null,
val animated: OptionalBoolean = OptionalBoolean.Missing,
)
6 changes: 2 additions & 4 deletions rest/src/main/kotlin/builder/components/ActionRowBuilder.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ class ActionRowBuilder : MessageComponentBuilder {

@OptIn(ExperimentalContracts::class)
inline fun interactionButton(
label: String,
style: ButtonStyle,
customId: String,
builder: ButtonBuilder.() -> Unit = {}
builder: ButtonBuilder.InteractionButtonBuilder.() -> Unit = {}
) {
contract {
callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
Expand All @@ -29,14 +28,13 @@ class ActionRowBuilder : MessageComponentBuilder {
components.add(ButtonBuilder.InteractionButtonBuilder()
.apply {
this.style = style
this.label = label
this.customId = customId
}
.apply(builder))
}

@OptIn(ExperimentalContracts::class)
inline fun linkButton(label: String, url: String, builder: ButtonBuilder.() -> Unit = {}) {
inline fun linkButton(label: String, url: String, builder: ButtonBuilder.LinkButtonBuilder.() -> Unit = {}) {
contract {
callsInPlace(builder, InvocationKind.EXACTLY_ONCE)
}
Expand Down

0 comments on commit aaf9838

Please sign in to comment.