Skip to content

Commit

Permalink
Merge branch 'develop' into package-restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
NoComment1105 committed Aug 25, 2024
2 parents 39f509c + dc16c08 commit 9f49672
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: chmod +x gradlew

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Build Project
run: ./gradlew build --stacktrace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: chmod +x gradlew

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Build Project
run: ./gradlew build --stacktrace
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: chmod +x gradlew

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
uses: gradle/actions/setup-gradle@v4

- name: Build Project
run: ./gradlew build --stacktrace
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ grgit = "5.2.2"
blossom = "2.1.0"

# Libraries
kord-extensions = "2.1.0-20240820.102632-1"
kord-extensions = "2.2.0-20240824.203242-3"
logging = "7.0.0"
logback = "1.5.6"
github-api = "1.323"
logback = "1.5.7"
github-api = "1.324"
kmongo = "5.1.0"
docgenerator = "0.2.1-SNAPSHOT"
docgenerator = "0.2.2-SNAPSHOT"

[libraries]
kord-extensions-core = { module = "dev.kordex:kord-extensions", version.ref = "kord-extensions" }
Expand Down
142 changes: 75 additions & 67 deletions src/main/kotlin/org/hyacinthbots/lilybot/LilyBot.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ package org.hyacinthbots.lilybot
import dev.kord.common.entity.Permission
import dev.kord.gateway.Intent
import dev.kord.gateway.PrivilegedIntent
import dev.kord.rest.builder.message.actionRow
import dev.kord.rest.builder.message.embed
import dev.kordex.core.ExtensibleBot
import dev.kordex.core.checks.hasPermission
import dev.kordex.core.time.TimestampType
Expand Down Expand Up @@ -85,73 +87,79 @@ suspend fun main() {

about {
ephemeral = false
name = "Info about LilyBot"

logoUrl = "https://github.com/HyacinthBots/LilyBot/blob/main/docs/lily-logo-transparent.png?raw=true"

description = "Lily is a FOSS multi-purpose bot for Discord created by the HyacinthBots organization. " +
"Use `/help` for support or `/invite` to get an invite link."

button {
name = "extensions.about.buttons.invite"
url = "https://discord.com/api/oauth2/authorize?client_id=876278900836139008" +
"&permissions=1151990787078&scope=bot%20applications.commands"
}

button {
name = "Privacy Policy"
url = "$HYACINTH_GITHUB/LilyBot/blob/main/docs/privacy-policy.md"
}

button {
name = "Terms of Service"
url = "$HYACINTH_GITHUB/.github/blob/main/terms-of-service.md"
}

field {
name = "How can I support the continued development of Lily?"

value = "Lily is developed primarily by NoComment#6411 and tempest#4510 " +
"in our free time. Neither of us have resources to invest in hosting, " +
"so financial donations via [Buy Me a Coffee]" +
"(https://buymeacoffee.com/Hyacinthbots) help keep Lily afloat. Currently, we run" +
"lily on a Hetzner cloud server, which we can afford in our current situation. " +
"We will also have domain costs for our website.\n\n" +
"Contributions of code & documentation are also incredibly appreciated, " +
"and you can read our [contributing guide]" +
"($HYACINTH_GITHUB/LilyBot/blob/main/CONTRIBUTING.md) " +
"or [development guide]" +
"($HYACINTH_GITHUB/LilyBot/blob/main/docs/development-guide.md) " +
"to get started."
}

field {
name = "Version"
// To avoid IntelliJ shouting about build errors, use https://plugins.jetbrains.com/plugin/9407-pebble
value =
"${BuildInfo.LILY_VERSION} (${BuildInfo.BUILD_ID})"
inline = true
}

field {
name = "Up Since"
value = "${
UptimeCollection().get()?.onTime?.toLocalDateTime(TimeZone.UTC)
?.time.toString().split(".")[0]
} ${UptimeCollection().get()?.onTime?.toLocalDateTime(TimeZone.UTC)?.date} UTC\n " +
"(${UptimeCollection().get()?.onTime?.toDiscord(TimestampType.RelativeTime) ?: "??"})"
inline = true
}

field {
name = "Useful links"
value =
"Website: Coming Soon™️\n" +
"GitHub: ${HYACINTH_GITHUB}\n" +
"Buy Me a Coffee: https://buymeacoffee.com/HyacinthBots\n" +
"Twitter: https://twitter.com/HyacinthBots\n" +
"Email: `[email protected]`\n" +
"Discord: https://discord.gg/hy2329fcTZ"
general {
message { locale ->
embed {
title = "Info about LilyBot"

thumbnail {
url =
"https://github.com/HyacinthBots/LilyBot/blob/main/docs/lily-logo-transparent.png?raw=true"
}

description =
"Lily is a FOSS multi-purpose bot for Discord created by the HyacinthBots organization. " +
"Use `/help` for support or `/invite` to get an invite link."
field {
name = "How can I support the continued development of Lily?"

value = "Lily is developed primarily by NoComment#6411 in their free time. Hyacinth " +
"doesn't have the resources to invest in hosting, so financial donations via " +
"[Buy Me a Coffee](https://buymeacoffee.com/Hyacinthbots) help keep Lily afloat. " +
"Currently, we run lily on a Hetzner cloud server, which we can afford in our " +
"current situation. We also have domain costs for our website.\n\nContributions of " +
"code & documentation are also incredibly appreciated, and you can read our " +
"[contributing guide]($HYACINTH_GITHUB/LilyBot/blob/main/CONTRIBUTING.md) or " +
"[development guide]($HYACINTH_GITHUB/LilyBot/blob/main/docs/development-guide.md) " +
"to get started."
}

field {
name = "Version"
// To avoid IntelliJ shouting about build errors, use https://plugins.jetbrains.com/plugin/9407-pebble
value = "${BuildInfo.LILY_VERSION} (${BuildInfo.BUILD_ID})"
inline = true
}

field {
name = "Up Since"
value = "${
UptimeCollection().get()?.onTime?.toLocalDateTime(TimeZone.UTC)
?.time.toString().split(".")[0]
} ${UptimeCollection().get()?.onTime?.toLocalDateTime(TimeZone.UTC)?.date} UTC\n " +
"(${UptimeCollection().get()?.onTime?.toDiscord(TimestampType.RelativeTime) ?: "??"})"
inline = true
}

field {
name = "Useful links"
value =
"Website: Coming Soon™️\n" +
"GitHub: ${HYACINTH_GITHUB}\n" +
"Buy Me a Coffee: https://buymeacoffee.com/HyacinthBots\n" +
"Twitter: https://twitter.com/HyacinthBots\n" +
"Email: `[email protected]`\n" +
"Discord: https://discord.gg/hy2329fcTZ"
}
}

actionRow {
linkButton(
"https://discord.com/api/oauth2/authorize?client_id=876278900836139008&" +
"permissions=1151990787078&scope=bot%20applications.commands"
) {
label = "extensions.about.buttons.invite"
}

linkButton("$HYACINTH_GITHUB/LilyBot/blob/main/docs/privacy-policy.md") {
label = "Privacy Policy"
}

linkButton("$HYACINTH_GITHUB/.github/blob/main/terms-of-service.md") {
label = "Terms of Service"
}
}
}
}
}

Expand Down

0 comments on commit 9f49672

Please sign in to comment.