From 09cbc55ef6ebe4c82b317786301f2107172288fd Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 20 Mar 2021 16:43:50 +0800 Subject: [PATCH] RemoteFile.FileInfo.resolveToFile: use FileSupport than Group --- .../android/api/binary-compatibility-validator-android.api | 4 ++-- .../api/binary-compatibility-validator.api | 4 ++-- mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api index acf8761a3..fc89c32c9 100644 --- a/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api +++ b/binary-compatibility-validator/android/api/binary-compatibility-validator-android.api @@ -6061,8 +6061,8 @@ public final class net/mamoe/mirai/utils/RemoteFile$FileInfo { public final fun getSha1 ()[B public final fun getUploadTime ()J public final fun getUploaderId ()J - public final fun resolveToFile (Lnet/mamoe/mirai/contact/Group;)Lnet/mamoe/mirai/utils/RemoteFile; - public final fun resolveToFile (Lnet/mamoe/mirai/contact/Group;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun resolveToFile (Lnet/mamoe/mirai/contact/FileSupported;)Lnet/mamoe/mirai/utils/RemoteFile; + public final fun resolveToFile (Lnet/mamoe/mirai/contact/FileSupported;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } public abstract interface class net/mamoe/mirai/utils/RemoteFile$ProgressionCallback { diff --git a/binary-compatibility-validator/api/binary-compatibility-validator.api b/binary-compatibility-validator/api/binary-compatibility-validator.api index 34066d0eb..0160f6608 100644 --- a/binary-compatibility-validator/api/binary-compatibility-validator.api +++ b/binary-compatibility-validator/api/binary-compatibility-validator.api @@ -6090,8 +6090,8 @@ public final class net/mamoe/mirai/utils/RemoteFile$FileInfo { public final fun getSha1 ()[B public final fun getUploadTime ()J public final fun getUploaderId ()J - public final fun resolveToFile (Lnet/mamoe/mirai/contact/Group;)Lnet/mamoe/mirai/utils/RemoteFile; - public final fun resolveToFile (Lnet/mamoe/mirai/contact/Group;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; + public final fun resolveToFile (Lnet/mamoe/mirai/contact/FileSupported;)Lnet/mamoe/mirai/utils/RemoteFile; + public final fun resolveToFile (Lnet/mamoe/mirai/contact/FileSupported;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; } public abstract interface class net/mamoe/mirai/utils/RemoteFile$ProgressionCallback { diff --git a/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt b/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt index 92fc0d311..d30276f5b 100644 --- a/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt +++ b/mirai-core-api/src/commonMain/kotlin/utils/RemoteFile.kt @@ -179,8 +179,8 @@ public interface RemoteFile { /** * 根据 [FileInfo.id] 或 [FileInfo.path] 获取到对应的 [RemoteFile]. */ - public suspend fun resolveToFile(group: Group): RemoteFile = - group.filesRoot.resolveById(id) ?: group.filesRoot.resolve(path) + public suspend fun resolveToFile(contact: FileSupported): RemoteFile = + contact.filesRoot.resolveById(id) ?: contact.filesRoot.resolve(path) } /**