Skip to content

Commit

Permalink
Renamed bot to Trouper
Browse files Browse the repository at this point in the history
  • Loading branch information
Laxystem committed Dec 14, 2023
1 parent a348529 commit 1ec2da8
Show file tree
Hide file tree
Showing 16 changed files with 40 additions and 32 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
13 changes: 8 additions & 5 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
13 changes: 8 additions & 5 deletions .github/workflows/root.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ hs_err_pid*

# Generated files
.idea/**/contentModel.xml
.idea/.name

# Sensitive or high-churn files
.idea/**/dataSources/
Expand Down
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dependencies {
}

application {
mainClass = "quest.laxla.supertrouper.AppKt"
mainClass = "quest.laxla.trouper.AppKt"
}

val jvm: String by project
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ pluginManagement {
}
}

rootProject.name = "supertrouper"
rootProject.name = "Trouper"
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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() {
Expand All @@ -25,7 +25,6 @@ class AboutExtension : TrouperExtension() {
}
}


suspend fun AbstractMessageCreateBuilder.about() {
val self = kord.getSelf()
val avatar = (self.avatar ?: self.defaultAvatar).cdnUrl.toUrl()
Expand All @@ -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."
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package quest.laxla.supertrouper
package quest.laxla.trouper

import dev.kord.common.entity.Overwrite
import dev.kord.common.entity.OverwriteType
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package quest.laxla.supertrouper
package quest.laxla.trouper

import com.kotlindiscord.kord.extensions.extensions.Extension

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package quest.laxla.supertrouper
package quest.laxla.trouper

import dev.kord.core.entity.Application
import kotlin.contracts.ExperimentalContracts
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1ec2da8

Please sign in to comment.