diff --git a/build.gradle.kts b/build.gradle.kts index f31be78..5a307b9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ import org.jetbrains.gradle.ext.ProjectSettings diff --git a/gradle.properties b/gradle.properties index b2ec467..6ff0886 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,5 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +# kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 22d4fe0..85958c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -15,11 +15,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - +# distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip -networkTimeout=10000 -validateDistributionUrl=true +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 3052411..10c8ca9 100755 --- a/gradlew +++ b/gradlew @@ -17,6 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +# ############################################################################## # @@ -57,7 +58,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -82,11 +83,13 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,29 +136,22 @@ location of your Java installation." fi else JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -200,15 +196,11 @@ if "$cygwin" || "$msys" ; then done fi - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -216,12 +208,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index 3934113..7a3ef44 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,19 +1,20 @@ /* - * Botendo - * Copyright (C) 2023 moonleay + * 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 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. + * 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 . * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . */ rootProject.name = "Botendo" diff --git a/src/main/kotlin/net/moonleay/botendo/Bot.kt b/src/main/kotlin/net/moonleay/botendo/Bot.kt index ca3bb19..72cb5be 100644 --- a/src/main/kotlin/net/moonleay/botendo/Bot.kt +++ b/src/main/kotlin/net/moonleay/botendo/Bot.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo diff --git a/src/main/kotlin/net/moonleay/botendo/Main.kt b/src/main/kotlin/net/moonleay/botendo/Main.kt index 0555150..b77abe3 100644 --- a/src/main/kotlin/net/moonleay/botendo/Main.kt +++ b/src/main/kotlin/net/moonleay/botendo/Main.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt b/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt index e0c10ef..40b55ec 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/Button.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt b/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt index 3ab406e..512dcbb 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/ButtonManager.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt index a03ee51..aa6f314 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/PauseButton.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons.music @@ -26,10 +27,12 @@ import dev.kord.core.entity.User import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed +import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.ButtonUtil import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.UserUtil class PauseButton : net.moonleay.botendo.buttons.Button("btn.music.pause") { override suspend fun onInteraction( diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt index c786818..291a663 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/QueueButton.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons.music @@ -26,11 +27,13 @@ import dev.kord.core.entity.User import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed +import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.ButtonUtil import net.moonleay.botendo.util.MessageUtil import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UserUtil class QueueButton : net.moonleay.botendo.buttons.Button("btn.music.queue") { override suspend fun onInteraction( diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt index 462f207..8de589f 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/RepeatButton.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons.music @@ -26,10 +27,12 @@ import dev.kord.core.entity.User import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed +import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.ButtonUtil import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.UserUtil class RepeatButton : net.moonleay.botendo.buttons.Button("btn.music.repeat") { override suspend fun onInteraction( diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt index 8f04ea1..32cc50e 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/SkipButton.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons.music @@ -27,12 +28,10 @@ import dev.kord.core.entity.User import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed +import dev.kord.rest.builder.message.modify.actionRow import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager -import net.moonleay.botendo.util.ButtonUtil -import net.moonleay.botendo.util.MessageUtil -import net.moonleay.botendo.util.TimeUtil -import net.moonleay.botendo.util.UrlUtil +import net.moonleay.botendo.util.* class SkipButton : net.moonleay.botendo.buttons.Button("btn.music.skip") { override suspend fun onInteraction( diff --git a/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt b/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt index eb1a213..d1cf8c0 100644 --- a/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt +++ b/src/main/kotlin/net/moonleay/botendo/buttons/music/StopButton.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.buttons.music @@ -27,6 +28,7 @@ import dev.kord.rest.builder.message.embed import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.UserUtil class StopButton : net.moonleay.botendo.buttons.Button("btn.music.stop") { override suspend fun onInteraction( diff --git a/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt b/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt index 23ca661..63fc538 100644 --- a/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/data/CredentialManager.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.data diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt index de60cde..1b24159 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/NowPlayingExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -23,14 +24,12 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.common.Color import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow +import dev.kord.rest.builder.message.create.actionRow import dev.kord.rest.builder.message.embed import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink import net.moonleay.botendo.extensions.music.components.MusicManager -import net.moonleay.botendo.util.ButtonUtil -import net.moonleay.botendo.util.MessageUtil -import net.moonleay.botendo.util.TimeUtil -import net.moonleay.botendo.util.UrlUtil +import net.moonleay.botendo.util.* class NowPlayingExtension : Extension() { override val name = "nowplaying" diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt index 7342c14..cbd414c 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/PlayExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt index f63078a..0d7029c 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/QueueExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -22,13 +23,16 @@ import com.kotlindiscord.kord.extensions.extensions.Extension import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.common.Color import dev.kord.rest.builder.component.ActionRowBuilder +import dev.kord.rest.builder.message.EmbedBuilder.Limits.title import dev.kord.rest.builder.message.actionRow +import dev.kord.rest.builder.message.create.actionRow import dev.kord.rest.builder.message.embed import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.ButtonUtil import net.moonleay.botendo.util.MessageUtil import net.moonleay.botendo.util.TimeUtil +import net.moonleay.botendo.util.UserUtil class QueueExtension : Extension() { override val name = "queue" diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/SeekExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/SeekExtension.kt index f5bfb34..2b33d20 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/SeekExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/SeekExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -27,10 +28,7 @@ import dev.kord.rest.builder.message.embed import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.extensions.music.components.SeekArguments -import net.moonleay.botendo.util.ButtonUtil -import net.moonleay.botendo.util.MessageUtil -import net.moonleay.botendo.util.TimeUtil -import net.moonleay.botendo.util.UrlUtil +import net.moonleay.botendo.util.* class SeekExtension : Extension() { override val name = "seek" diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt index e11cdc6..12115e0 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/SkipExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -23,13 +24,11 @@ import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand import dev.kord.common.Color import dev.kord.rest.builder.component.ActionRowBuilder import dev.kord.rest.builder.message.actionRow +import dev.kord.rest.builder.message.create.actionRow import dev.kord.rest.builder.message.embed import dev.schlaubi.lavakord.audio.Link import net.moonleay.botendo.extensions.music.components.MusicManager -import net.moonleay.botendo.util.ButtonUtil -import net.moonleay.botendo.util.MessageUtil -import net.moonleay.botendo.util.TimeUtil -import net.moonleay.botendo.util.UrlUtil +import net.moonleay.botendo.util.* class SkipExtension : Extension() { override val name = "skip" diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt index 5c0722a..6a6b117 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/StopExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -26,6 +27,7 @@ import dev.schlaubi.lavakord.audio.Link import dev.schlaubi.lavakord.kord.getLink import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.UserUtil class StopExtension : Extension() { override val name = "stop" diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt index f2d90d7..56fc44d 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/UpsertExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music @@ -27,6 +28,7 @@ import dev.schlaubi.lavakord.kord.getLink import net.moonleay.botendo.extensions.music.components.LinkArguments import net.moonleay.botendo.extensions.music.components.MusicManager import net.moonleay.botendo.util.MessageUtil +import net.moonleay.botendo.util.UserUtil class UpsertExtension : Extension() { diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt index 9c40950..e3471fc 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/GuildTrackScheduler.kt @@ -14,10 +14,12 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music.components +import dev.arbjerg.lavalink.protocol.v4.LoadResult import dev.arbjerg.lavalink.protocol.v4.Track import dev.schlaubi.lavakord.audio.* import dev.schlaubi.lavakord.audio.player.Player diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt index 406187f..8c0c065 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/LinkArguments.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music.components diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt index faaef75..3fc7b18 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/MusicManager.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music.components diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/SeekArguments.kt b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/SeekArguments.kt index 852ea7b..d5d0c61 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/music/components/SeekArguments.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/music/components/SeekArguments.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.music.components diff --git a/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt b/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt index a315e2a..57e0b04 100644 --- a/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt +++ b/src/main/kotlin/net/moonleay/botendo/extensions/util/InfoExtension.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.extensions.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt index c598096..c3b5ce6 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/ButtonUtil.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/Logger.kt b/src/main/kotlin/net/moonleay/botendo/util/Logger.kt index 3e2ee34..dde0ed5 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/Logger.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/Logger.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt index 4fc4f44..839dc32 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/MessageUtil.kt @@ -14,11 +14,17 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util +import com.kotlindiscord.kord.extensions.commands.Arguments +import com.kotlindiscord.kord.extensions.commands.application.slash.PublicSlashCommandContext +import com.kotlindiscord.kord.extensions.components.forms.ModalForm +import dev.kord.common.Color import dev.kord.core.behavior.UserBehavior +import dev.kord.rest.builder.message.EmbedBuilder import java.time.LocalDateTime import java.time.format.DateTimeFormatter diff --git a/src/main/kotlin/net/moonleay/botendo/util/Status.kt b/src/main/kotlin/net/moonleay/botendo/util/Status.kt index 161e50c..cc39a5d 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/Status.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/Status.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt index 534234d..4cbc381 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/TimeUtil.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt index 33a1275..a922c1a 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/UrlUtil.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/kotlin/net/moonleay/botendo/util/UserUtil.kt b/src/main/kotlin/net/moonleay/botendo/util/UserUtil.kt index 8b14825..3925ad6 100644 --- a/src/main/kotlin/net/moonleay/botendo/util/UserUtil.kt +++ b/src/main/kotlin/net/moonleay/botendo/util/UserUtil.kt @@ -14,6 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * */ package net.moonleay.botendo.util diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties index 3cf67d8..6378344 100644 --- a/src/main/resources/simplelogger.properties +++ b/src/main/resources/simplelogger.properties @@ -15,3 +15,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # +#