From 1ec2da8907720fcae3dd2301e1179f773aaa9330 Mon Sep 17 00:00:00 2001 From: LaylaMeower Date: Thu, 14 Dec 2023 16:29:15 +0200 Subject: [PATCH] Renamed bot to Trouper --- .github/workflows/ci.yml | 13 ++++++++----- .github/workflows/develop.yml | 13 ++++++++----- .github/workflows/root.yml | 13 ++++++++----- .gitignore | 1 + .idea/.name | 1 - build.gradle.kts | 2 +- settings.gradle.kts | 2 +- .../{supertrouper => trouper}/AboutExtension.kt | 7 +++---- .../quest/laxla/{supertrouper => trouper}/App.kt | 4 ++-- .../MaintenanceExtension.kt | 2 +- .../laxla/{supertrouper => trouper}/Overwrites.kt | 2 +- .../{supertrouper => trouper}/TargetedArguments.kt | 2 +- .../{supertrouper => trouper}/TrouperExtension.kt | 2 +- .../quest/laxla/{supertrouper => trouper}/Utils.kt | 2 +- .../messaging/PrivateMassagingExtension.kt | 4 ++-- .../messaging/PrivateMessaging.kt | 2 +- 16 files changed, 40 insertions(+), 32 deletions(-) delete mode 100644 .idea/.name rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/AboutExtension.kt (94%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/App.kt (89%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/MaintenanceExtension.kt (94%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/Overwrites.kt (98%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/TargetedArguments.kt (95%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/TrouperExtension.kt (91%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/Utils.kt (96%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/messaging/PrivateMassagingExtension.kt (98%) rename src/main/kotlin/quest/laxla/{supertrouper => trouper}/messaging/PrivateMessaging.kt (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d521601..d13c2bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,13 +13,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.17 + java-version: 17 + distribution: temurin - name: Gradle (Build) uses: gradle/gradle-build-action@v2 @@ -28,15 +29,17 @@ jobs: arguments: build - name: Upload artifacts (Main JAR) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Main JAR path: build/libs/*-all.jar + if-no-files-found: error - name: Upload artifacts (JARs) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: JARs path: build/libs/*.jar + if-no-files-found: warn diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 409f750..33828cf 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -10,13 +10,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.17 + java-version: 17 + distribution: temurin - name: Gradle (Build) uses: gradle/gradle-build-action@v2 @@ -25,15 +26,17 @@ jobs: arguments: build - name: Upload artifacts (Main JAR) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Main JAR path: build/libs/*-all.jar + if-no-files-found: error - name: Upload artifacts (JARs) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: JARs path: build/libs/*.jar + if-no-files-found: warn diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml index da08301..2a005ff 100644 --- a/.github/workflows/root.yml +++ b/.github/workflows/root.yml @@ -10,13 +10,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 1.17 + java-version: 17 + distribution: temurin - name: Gradle (Build) uses: gradle/gradle-build-action@v2 @@ -26,15 +27,17 @@ jobs: dependency-graph: generate-and-submit - name: Upload artifacts (Main JAR) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: Main JAR path: build/libs/*-all.jar + if-no-files-found: error - name: Upload artifacts (JARs) - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: JARs path: build/libs/*.jar + if-no-files-found: warn diff --git a/.gitignore b/.gitignore index e798797..cfd0ada 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ hs_err_pid* # Generated files .idea/**/contentModel.xml +.idea/.name # Sensitive or high-churn files .idea/**/dataSources/ diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 24bc394..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Super Trouper diff --git a/build.gradle.kts b/build.gradle.kts index ff6f6d0..5afb90e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { } application { - mainClass = "quest.laxla.supertrouper.AppKt" + mainClass = "quest.laxla.trouper.AppKt" } val jvm: String by project diff --git a/settings.gradle.kts b/settings.gradle.kts index 929c86d..522a0be 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -10,4 +10,4 @@ pluginManagement { } } -rootProject.name = "supertrouper" +rootProject.name = "Trouper" diff --git a/src/main/kotlin/quest/laxla/supertrouper/AboutExtension.kt b/src/main/kotlin/quest/laxla/trouper/AboutExtension.kt similarity index 94% rename from src/main/kotlin/quest/laxla/supertrouper/AboutExtension.kt rename to src/main/kotlin/quest/laxla/trouper/AboutExtension.kt index d44b39d..9b85282 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/AboutExtension.kt +++ b/src/main/kotlin/quest/laxla/trouper/AboutExtension.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import com.kotlindiscord.kord.extensions.components.components import com.kotlindiscord.kord.extensions.components.disabledButton @@ -9,7 +9,7 @@ import dev.kord.core.entity.effectiveName import dev.kord.rest.builder.message.allowedMentions import dev.kord.rest.builder.message.create.AbstractMessageCreateBuilder import dev.kord.rest.builder.message.embed -import quest.laxla.supertrouper.messaging.PrivateMessagesCategoryName +import quest.laxla.trouper.messaging.PrivateMessagesCategoryName class AboutExtension : TrouperExtension() { override suspend fun setup() { @@ -25,7 +25,6 @@ class AboutExtension : TrouperExtension() { } } - suspend fun AbstractMessageCreateBuilder.about() { val self = kord.getSelf() val avatar = (self.avatar ?: self.defaultAvatar).cdnUrl.toUrl() @@ -41,7 +40,7 @@ class AboutExtension : TrouperExtension() { //language=Markdown value = "> This instance is hosted on someone's personal computer, " + "and *may* contain **malicious code** and/or **steal your data**. " + - "This is not considered to be an official version of Super Trouper. " + + "This is not considered to be an official version of Trouper. " + "Do *not* rely on the lack of this message to determine if an instance is official." } diff --git a/src/main/kotlin/quest/laxla/supertrouper/App.kt b/src/main/kotlin/quest/laxla/trouper/App.kt similarity index 89% rename from src/main/kotlin/quest/laxla/supertrouper/App.kt rename to src/main/kotlin/quest/laxla/trouper/App.kt index fa21331..6a31b4b 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/App.kt +++ b/src/main/kotlin/quest/laxla/trouper/App.kt @@ -1,11 +1,11 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import com.kotlindiscord.kord.extensions.ExtensibleBot import com.kotlindiscord.kord.extensions.utils.env import com.kotlindiscord.kord.extensions.utils.envOrNull import dev.kord.gateway.PrivilegedIntent import kotlinx.coroutines.runBlocking -import quest.laxla.supertrouper.messaging.PrivateMassagingExtension +import quest.laxla.trouper.messaging.PrivateMassagingExtension private val token = env("TOKEN") val officialServer = env("OFFICIAL_SERVER") diff --git a/src/main/kotlin/quest/laxla/supertrouper/MaintenanceExtension.kt b/src/main/kotlin/quest/laxla/trouper/MaintenanceExtension.kt similarity index 94% rename from src/main/kotlin/quest/laxla/supertrouper/MaintenanceExtension.kt rename to src/main/kotlin/quest/laxla/trouper/MaintenanceExtension.kt index 5290458..017b72b 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/MaintenanceExtension.kt +++ b/src/main/kotlin/quest/laxla/trouper/MaintenanceExtension.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import com.kotlindiscord.kord.extensions.checks.isBotAdmin import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand diff --git a/src/main/kotlin/quest/laxla/supertrouper/Overwrites.kt b/src/main/kotlin/quest/laxla/trouper/Overwrites.kt similarity index 98% rename from src/main/kotlin/quest/laxla/supertrouper/Overwrites.kt rename to src/main/kotlin/quest/laxla/trouper/Overwrites.kt index 9ffff57..c5aff62 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/Overwrites.kt +++ b/src/main/kotlin/quest/laxla/trouper/Overwrites.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import dev.kord.common.entity.Overwrite import dev.kord.common.entity.OverwriteType diff --git a/src/main/kotlin/quest/laxla/supertrouper/TargetedArguments.kt b/src/main/kotlin/quest/laxla/trouper/TargetedArguments.kt similarity index 95% rename from src/main/kotlin/quest/laxla/supertrouper/TargetedArguments.kt rename to src/main/kotlin/quest/laxla/trouper/TargetedArguments.kt index 55325df..09a1a99 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/TargetedArguments.kt +++ b/src/main/kotlin/quest/laxla/trouper/TargetedArguments.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import com.kotlindiscord.kord.extensions.commands.Arguments import com.kotlindiscord.kord.extensions.commands.application.slash.SlashCommandContext diff --git a/src/main/kotlin/quest/laxla/supertrouper/TrouperExtension.kt b/src/main/kotlin/quest/laxla/trouper/TrouperExtension.kt similarity index 91% rename from src/main/kotlin/quest/laxla/supertrouper/TrouperExtension.kt rename to src/main/kotlin/quest/laxla/trouper/TrouperExtension.kt index 7c06e3e..1435c21 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/TrouperExtension.kt +++ b/src/main/kotlin/quest/laxla/trouper/TrouperExtension.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import com.kotlindiscord.kord.extensions.extensions.Extension diff --git a/src/main/kotlin/quest/laxla/supertrouper/Utils.kt b/src/main/kotlin/quest/laxla/trouper/Utils.kt similarity index 96% rename from src/main/kotlin/quest/laxla/supertrouper/Utils.kt rename to src/main/kotlin/quest/laxla/trouper/Utils.kt index a898daa..ccbca93 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/Utils.kt +++ b/src/main/kotlin/quest/laxla/trouper/Utils.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper +package quest.laxla.trouper import dev.kord.core.entity.Application import kotlin.contracts.ExperimentalContracts diff --git a/src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMassagingExtension.kt b/src/main/kotlin/quest/laxla/trouper/messaging/PrivateMassagingExtension.kt similarity index 98% rename from src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMassagingExtension.kt rename to src/main/kotlin/quest/laxla/trouper/messaging/PrivateMassagingExtension.kt index d920067..dac888b 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMassagingExtension.kt +++ b/src/main/kotlin/quest/laxla/trouper/messaging/PrivateMassagingExtension.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper.messaging +package quest.laxla.trouper.messaging import com.kotlindiscord.kord.extensions.checks.anyGuild import com.kotlindiscord.kord.extensions.checks.isNotBot @@ -27,7 +27,7 @@ import dev.kord.rest.builder.channel.addRoleOverwrite import dev.kord.rest.builder.message.actionRow import dev.kord.rest.builder.message.embed import kotlinx.coroutines.flow.count -import quest.laxla.supertrouper.* +import quest.laxla.trouper.* @PrivilegedIntent class PrivateMassagingExtension : TrouperExtension() { diff --git a/src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMessaging.kt b/src/main/kotlin/quest/laxla/trouper/messaging/PrivateMessaging.kt similarity index 98% rename from src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMessaging.kt rename to src/main/kotlin/quest/laxla/trouper/messaging/PrivateMessaging.kt index 65438a5..48d659d 100644 --- a/src/main/kotlin/quest/laxla/supertrouper/messaging/PrivateMessaging.kt +++ b/src/main/kotlin/quest/laxla/trouper/messaging/PrivateMessaging.kt @@ -1,4 +1,4 @@ -package quest.laxla.supertrouper.messaging +package quest.laxla.trouper.messaging import com.kotlindiscord.kord.extensions.utils.envOrNull import dev.kord.common.entity.ALL