Theaninova/Orbot
1
0
Fork 0
mirror of https://github.com/HMCore/Orbot.git synced 2025-12-10 12:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotfix 1

Browse Source
This commit is contained in:
UnrealValentin
2021-06-02 22:58:54 +02:00
parent 5511d1c5ac
commit 1f3ebc42e6
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/org/hmcore/Admin.kt
View File

@@ -76,7 +76,7 @@ object Admin {
embed {
title = "Now watching for new Hytale Blogposts every ${updateMs / 1000}s"
description = """
${Channels.getServerNames().joinToString("\n")}
${Channels.getServerNames()?.joinToString("\n")}
**_Service Channels_**
${Channels.getServiceChannelServers().joinToString("\n")}

10
src/main/kotlin/org/hmcore/Channels.kt
View File

@@ -123,13 +123,9 @@ object Channels {
fun refreshServiceChannelsFromDisk() =
Json.decodeFromString<List<ServiceChannel>>(SERVICE_CHANNELS_FILE.readText()).toMutableList()
fun getServerNames(server: Long? = null) = Main.jdas.flatMap { jda ->
channels.filter { server == null || (jda.getTextChannelById(it.id)?.guild?.idLong == server) }.map {
val channel = jda.getTextChannelById(it.id)
if (channel == null) {
Admin.warning("Channel ${it.id} is no longer active!")
return@map "**${it.id}** *(inactive)*"
}
fun getServerNames(server: Long? = null): List<String>? = Main.jdas.flatMap { jda ->
channels.filter { server == null || (jda.getTextChannelById(it.id)?.guild?.idLong == server) }.mapNotNull {
val channel = jda.getTextChannelById(it.id) ?: return@mapNotNull null
val role = when (it.mentionedRole) {
null -> ""

2
src/main/kotlin/org/hmcore/OwnerCli.kt
View File

@@ -202,7 +202,7 @@ class OwnerCli : ListenerAdapter() {
.setTitle("Server overview")
.setColor(Color.GREEN)
.setDescription("""
${Channels.getServerNames(event.message.guild.idLong).joinToString("\n")}
${Channels.getServerNames(event.message.guild.idLong)?.joinToString("\n")}
**_Service Channels_**
${Channels.getServiceChannelServers(event.message.guild.idLong).joinToString("\n")}