From 7753f11e605a739747d1df6daedc2562fee3b42a Mon Sep 17 00:00:00 2001 From: limited_dev Date: Sun, 23 Apr 2023 23:53:11 +0200 Subject: [PATCH] chore: changed Ext to Extension, added Potatoes Signed-off-by: limited_dev --- src/main/kotlin/de/limited_dev/botendo/Bot.kt | 25 +++++++---- ...owPlayingExt.kt => NowPlayingExtension.kt} | 2 +- .../music/{PlayExt.kt => PlayExtension.kt} | 3 +- .../music/{QueueExt.kt => QueueExtension.kt} | 2 +- .../music/{SkipExt.kt => SkipExtension.kt} | 2 +- .../music/{StopExt.kt => StopExtension.kt} | 2 +- .../music/components/MusicManager.kt | 6 +-- .../util/{InfoExt.kt => InfoExtension.kt} | 2 +- .../extensions/util/PotatoExtension.kt | 41 +++++++++++++++++++ 9 files changed, 68 insertions(+), 17 deletions(-) rename src/main/kotlin/de/limited_dev/botendo/extensions/music/{NowPlayingExt.kt => NowPlayingExtension.kt} (98%) rename src/main/kotlin/de/limited_dev/botendo/extensions/music/{PlayExt.kt => PlayExtension.kt} (99%) rename src/main/kotlin/de/limited_dev/botendo/extensions/music/{QueueExt.kt => QueueExtension.kt} (98%) rename src/main/kotlin/de/limited_dev/botendo/extensions/music/{SkipExt.kt => SkipExtension.kt} (99%) rename src/main/kotlin/de/limited_dev/botendo/extensions/music/{StopExt.kt => StopExtension.kt} (99%) rename src/main/kotlin/de/limited_dev/botendo/extensions/util/{InfoExt.kt => InfoExtension.kt} (97%) create mode 100644 src/main/kotlin/de/limited_dev/botendo/extensions/util/PotatoExtension.kt diff --git a/src/main/kotlin/de/limited_dev/botendo/Bot.kt b/src/main/kotlin/de/limited_dev/botendo/Bot.kt index c179ad8..96b4ce0 100644 --- a/src/main/kotlin/de/limited_dev/botendo/Bot.kt +++ b/src/main/kotlin/de/limited_dev/botendo/Bot.kt @@ -21,16 +21,19 @@ package de.limited_dev.botendo import com.kotlindiscord.kord.extensions.ExtensibleBot import de.limited_dev.botendo.extensions.music.* -import de.limited_dev.botendo.extensions.util.InfoExt +import de.limited_dev.botendo.extensions.util.InfoExtension +import de.limited_dev.botendo.extensions.util.PotatoExtension import de.limited_dev.botendo.util.CredentialManager import de.limited_dev.botendo.util.Logger +import dev.kord.core.event.interaction.ButtonInteractionCreateEvent +import dev.kord.core.on import dev.schlaubi.lavakord.LavaKord import dev.schlaubi.lavakord.kord.lavakord object Bot { //The kord object gets set at app launch - lateinit var lava: LavaKord private lateinit var bot: ExtensibleBot + lateinit var lava: LavaKord suspend fun start() { Logger.out("Starting Bot...") @@ -51,12 +54,13 @@ object Bot { } extensions { - add(::InfoExt) - add(::PlayExt) - add(::StopExt) - add(::SkipExt) - add(::NowPlayingExt) - add(::QueueExt) + add(::InfoExtension) + add(::PlayExtension) + add(::StopExtension) + add(::SkipExtension) + add(::NowPlayingExtension) + add(::QueueExtension) + add(::PotatoExtension) } } @@ -66,6 +70,11 @@ object Bot { //Add the LavaLink node from config lava.addNode(CredentialManager.linkip, CredentialManager.linkpw) + //Register Button presses + bot.kordRef.on { + + } + //Start the bot bot.start() } diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt similarity index 98% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt index d9cb197..c44cacb 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/NowPlayingExtension.kt @@ -28,7 +28,7 @@ import de.limited_dev.botendo.util.UrlUtil import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink -class NowPlayingExt : Extension() { +class NowPlayingExtension : Extension() { override val name = "nowplaying" override suspend fun setup() { publicSlashCommand { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt similarity index 99% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt index fb2060d..851ff60 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/PlayExtension.kt @@ -30,7 +30,8 @@ import de.limited_dev.botendo.util.MessageUtil import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink -class PlayExt : Extension() { + +class PlayExtension : Extension() { override val name = "play" diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt similarity index 98% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt index 9448c0e..606db73 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/QueueExtension.kt @@ -27,7 +27,7 @@ import de.limited_dev.botendo.util.MessageUtil import de.limited_dev.botendo.util.TimeUtil import dev.schlaubi.lavakord.audio.Link -class QueueExt : Extension() { +class QueueExtension : Extension() { override val name = "queue" override suspend fun setup() { publicSlashCommand { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt similarity index 99% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt index 1fbbdc9..ddcf6ab 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/SkipExtension.kt @@ -28,7 +28,7 @@ import de.limited_dev.botendo.util.TimeUtil import de.limited_dev.botendo.util.UrlUtil import dev.schlaubi.lavakord.audio.Link -class SkipExt : Extension() { +class SkipExtension : Extension() { override val name = "skip" override suspend fun setup() { publicSlashCommand { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt similarity index 99% rename from src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt index 6c12501..ecfc52d 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/StopExtension.kt @@ -28,7 +28,7 @@ import de.limited_dev.botendo.util.MessageUtil import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink -class StopExt : Extension() { +class StopExtension : Extension() { override val name = "stop" override suspend fun setup() { publicSlashCommand { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt index bf7b133..5e2a8b6 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/music/components/MusicManager.kt @@ -22,7 +22,7 @@ package de.limited_dev.botendo.extensions.music.components import com.kotlindiscord.kord.extensions.commands.application.slash.PublicSlashCommandContext import com.kotlindiscord.kord.extensions.components.forms.ModalForm import com.kotlindiscord.kord.extensions.types.respond -import de.limited_dev.botendo.extensions.music.PlayExt +import de.limited_dev.botendo.extensions.music.PlayExtension import de.limited_dev.botendo.util.MessageUtil import de.limited_dev.botendo.util.TimeUtil import de.limited_dev.botendo.util.UrlUtil @@ -44,7 +44,7 @@ object MusicManager { suspend fun addToQueue( - ctx: PublicSlashCommandContext, + ctx: PublicSlashCommandContext, link: Link, search: String ) { @@ -52,7 +52,7 @@ object MusicManager { } suspend fun addToQueue( - ctx: PublicSlashCommandContext, + ctx: PublicSlashCommandContext, link: Link, search: String, silent: Boolean diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExt.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt similarity index 97% rename from src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExt.kt rename to src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt index 00909b9..47feb40 100644 --- a/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExt.kt +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/util/InfoExtension.kt @@ -24,7 +24,7 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import de.limited_dev.botendo.build.BuildConstants import de.limited_dev.botendo.util.MessageUtil -class InfoExt : Extension() { +class InfoExtension : Extension() { override val name = "info" override suspend fun setup() { publicSlashCommand { diff --git a/src/main/kotlin/de/limited_dev/botendo/extensions/util/PotatoExtension.kt b/src/main/kotlin/de/limited_dev/botendo/extensions/util/PotatoExtension.kt new file mode 100644 index 0000000..dcfd92b --- /dev/null +++ b/src/main/kotlin/de/limited_dev/botendo/extensions/util/PotatoExtension.kt @@ -0,0 +1,41 @@ +/* + * Botendo + * Copyright (C) 2023 limited_dev + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package de.limited_dev.botendo.extensions.util + +import com.kotlindiscord.kord.extensions.extensions.Extension +import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand +import de.limited_dev.botendo.util.MessageUtil + +class PotatoExtension : Extension() { + override val name = "potato" + override suspend fun setup() { + publicSlashCommand { + name = "potato" + description = "Potato" + this.action { + MessageUtil.sendEmbedForPublicSlashCommandWithImage( + this, "Potato", + "Potato", + "https://static.tumblr.com/c06d8e0928395746a63b9c5d3cb1ce66/sl9iajp/gxFmqk38z/tumblr_static_potato-equality.jpg" + ) + } + } + } +}