github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-06 08:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix RemoteFile.resolveById, fix #1177

Browse Source
This commit is contained in:
Him188 2021-04-09 07:47:51 +08:00
parent d4ee81c79a
commit ce95d8fdce
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mirai-core/src/commonMain/kotlin/utils/RemoteFileImpl.kt
View File

@ -9,10 +9,6 @@
package net.mamoe.mirai.internal.utils
import io.ktor.client.request.*
import io.ktor.http.*
import io.ktor.http.content.*
import io.ktor.utils.io.*
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.runBlocking
import net.mamoe.mirai.contact.Contact
@ -302,7 +298,22 @@ internal class RemoteFileImpl(
}
override suspend fun resolveById(id: String, deep: Boolean): RemoteFile? {
return getFilesFlow().filter { it.id == id }.firstOrNull()?.resolveToFile()
if (this.id == id) return this
val dirs = mutableListOf<Oidb0x6d8.GetFileListRspBody.Item>()
getFilesFlow().mapNotNull { item ->
when {
item.id == id -> item.resolveToFile()
deep && item.folderInfo != null -> {
dirs.add(item)
null
}
else -> null
}
}.firstOrNull()?.let { return it }
for (dir in dirs) {
dir.resolveToFile()?.resolveById(id, deep)?.let { return it }
}
return null
}
override fun resolveSibling(relative: String): RemoteFileImpl {