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

Revert "hotfix 1"

Browse Source 
This reverts commit 1f3ebc42
This commit is contained in:
Wieland Schöbl
2021-06-02 23:21:50 +02:00
parent 7ff789afd3
commit 4e2186026c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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