Fix merge related syntax errors

kordlib · Jun 7, 2021 · c2bf627 · c2bf627
1 parent 9016ae3
commit c2bf627
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/core/src/main/kotlin/entity/Message.kt b/core/src/main/kotlin/entity/Message.kt
@@ -1,5 +1,6 @@
 package dev.kord.core.entity
 
+import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.DiscordComponent
 import dev.kord.common.entity.MessageType
 import dev.kord.common.entity.Snowflake

diff --git a/core/src/samples/kotlin/PingBot.kt b/core/src/samples/kotlin/PingBot.kt
@@ -1,15 +1,57 @@
+import dev.kord.common.annotation.KordPreview
 import dev.kord.common.entity.ButtonStyle
 import dev.kord.core.Kord
 import dev.kord.core.behavior.channel.createMessage
+import dev.kord.core.behavior.interaction.respondPublic
+import dev.kord.core.builder.components.emoji
+import dev.kord.core.cache.data.ApplicationComponentInteractionData
+import dev.kord.core.entity.ReactionEmoji
+import dev.kord.core.entity.interaction.ComponentInteraction
+import dev.kord.core.event.interaction.InteractionCreateEvent
 import dev.kord.core.event.message.MessageCreateEvent
 import dev.kord.core.on
 
+@KordPreview
 suspend fun main(args: Array<String>) {
     val kord = Kord(args.firstOrNull() ?: error("token required"))
 
     kord.on<MessageCreateEvent> {
         if (message.author?.isBot == true) return@on
         if (message.content == "!ping") message.channel.createMessage("pong")
+        if (message.content == "!buttons") {
+            message.channel.createMessage {
+                content = "Ich mag ~~Züge~~ Buttons"
+
+                components {
+                    actionRow {
+                        interactionButton(ButtonStyle.Primary, "eliteblog") {
+                            emoji(ReactionEmoji.Unicode("\uD83D\uDE38"))
+                            disabled = true
+                        }
+//                        interactionButton(
+//                            "eliteblog2"
+//                        ) {
+//                            emoji(ReactionEmoji.Unicode("\uD83D\uDE38"))
+//                        }
+                    }
+//                    actionRow {
+//                        linkButton("DuckDuckGo but gud", "https://google.com")
+//                    }
+                }
+            }
+
+        }
+    }
+
+    kord.on<InteractionCreateEvent> {
+        val interaction1 = interaction
+        if (interaction1 is ComponentInteraction) {
+            if ((interaction1.data.data as ApplicationComponentInteractionData).customId.value == "eliteblog2") {
+                interaction.respondPublic {
+                    content = "Discord sucks!"
+                }
+            }
+        }
     }
 
     kord.login { playing("!ping to pong") }

diff --git a/rest/src/main/kotlin/builder/interaction/FollowupMessageBuilders.kt b/rest/src/main/kotlin/builder/interaction/FollowupMessageBuilders.kt
@@ -221,7 +221,7 @@ class EphemeralFollowupMessageCreateBuilder(var content: String) :
             FollowupMessageCreateRequest(
                 content = Optional.Value(content),
                 tts = _tts,
-                allowedMentions = _allowedMentions.map { it.build() }
+                allowedMentions = _allowedMentions.map { it.build() },
                 components = Optional.missingOnEmpty(components.map(MessageComponentBuilder::build))
             ),
         )

diff --git a/rest/src/main/kotlin/builder/message/EmbedBuilder.kt b/rest/src/main/kotlin/builder/message/EmbedBuilder.kt
@@ -151,7 +151,7 @@ class EmbedBuilder : RequestBuilder<EmbedRequest> {
         Optional.Value("embed"),
         _description,
         _url,
-        _timestamp,
+        _timestamp.map { it.toString() },
         _color,
         _footer.map { it.toRequest() },
         _image.map { EmbedImageRequest(it) },