From fbf4dd6bb2f3ef1991a569e349d087605d565e09 Mon Sep 17 00:00:00 2001 From: Him188 Date: Sat, 2 May 2020 18:12:40 +0800 Subject: [PATCH] Adjust filenames --- .../mirai/qqandroid/QQAndroidBot.common.kt | 4 ---- .../commonMain/kotlin/net.mamoe.mirai/Bot.kt | 11 ----------- .../utils/{annotations.kt => Annotations.kt} | 0 .../utils/{channels.kt => Channels.kt} | 0 .../utils/{utils.kt => TimeUtils.kt} | 0 .../{chunked.kt => ChunkedFlowSession.kt} | 0 .../{tryNTimes.kt => retryCatching.common.kt} | 1 - .../net/mamoe/mirai/BotJavaFriendlyAPI.kt | 18 ------------------ ...dSuppressed.jvm.kt => retryCatching.jvm.kt} | 1 - 9 files changed, 35 deletions(-) rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/{annotations.kt => Annotations.kt} (100%) rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/{channels.kt => Channels.kt} (100%) rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/{utils.kt => TimeUtils.kt} (100%) rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/{chunked.kt => ChunkedFlowSession.kt} (100%) rename mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/{tryNTimes.kt => retryCatching.common.kt} (98%) rename mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/{addSuppressed.jvm.kt => retryCatching.jvm.kt} (96%) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt index bc5013516..4ca95833a 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt @@ -349,10 +349,6 @@ internal abstract class QQAndroidBotBase constructor( return sequence } - override suspend fun addFriend(id: Long, message: String?, remark: String?): AddFriendResult { - TODO("not implemented") - } - @Suppress("RemoveExplicitTypeArguments") // false positive override suspend fun recall(source: MessageSource) { check(source is MessageSourceInternal) diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt index f16073764..de91d282c 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt @@ -17,7 +17,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.launch import net.mamoe.mirai.contact.* -import net.mamoe.mirai.data.AddFriendResult import net.mamoe.mirai.event.events.BotInvitedJoinGroupRequestEvent import net.mamoe.mirai.event.events.MemberJoinRequestEvent import net.mamoe.mirai.event.events.NewFriendRequestEvent @@ -196,16 +195,6 @@ abstract class Bot : CoroutineScope, LowLevelBotAPIAccessor, BotJavaFriendlyAPI( originalMessage: MessageChain ): OfflineMessageSource - /** - * 添加一个好友 - * - * @param message 若需要验证请求时的验证消息. - * @param remark 好友备注 - */ - @JvmSynthetic - @MiraiExperimentalAPI("未支持") - abstract suspend fun addFriend(id: Long, message: String? = null, remark: String? = null): AddFriendResult - /** * 通过好友验证 diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/annotations.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Annotations.kt similarity index 100% rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/annotations.kt rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Annotations.kt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Channels.kt similarity index 100% rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/Channels.kt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/utils.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/TimeUtils.kt similarity index 100% rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/utils.kt rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/TimeUtils.kt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/chunked.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/ChunkedFlowSession.kt similarity index 100% rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/chunked.kt rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/ChunkedFlowSession.kt diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/tryNTimes.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/retryCatching.common.kt similarity index 98% rename from mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/tryNTimes.kt rename to mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/retryCatching.common.kt index 285f0d360..e1f294a3d 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/tryNTimes.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/internal/retryCatching.common.kt @@ -11,7 +11,6 @@ package net.mamoe.mirai.utils.internal import kotlin.reflect.KClass -@PublishedApi internal expect fun Throwable.addSuppressedMirai(e: Throwable) diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt index ef3295b71..487c3292e 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/BotJavaFriendlyAPI.kt @@ -2,7 +2,6 @@ package net.mamoe.mirai import kotlinx.coroutines.* import net.mamoe.mirai.contact.recall -import net.mamoe.mirai.data.AddFriendResult import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Image import net.mamoe.mirai.message.data.MessageChain @@ -119,23 +118,6 @@ actual abstract class BotJavaFriendlyAPI actual constructor() { runBlocking { join() } } - /** - * 添加一个好友 - * - * @param message 若需要验证请求时的验证消息. - * @param remark 好友备注 - */ - @OptIn(MiraiExperimentalAPI::class) - @JvmName("addFriend") - fun __addFriendBlockingForJava__( - id: Long, - message: String? = null, - remark: String? = null - ): AddFriendResult { - @OptIn(MiraiExperimentalAPI::class) - return runBlocking { addFriend(id, message, remark) } - } - /** * 异步调用 [__loginBlockingForJava__] */ diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/addSuppressed.jvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt similarity index 96% rename from mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/addSuppressed.jvm.kt rename to mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt index 1fd698979..94664c453 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/addSuppressed.jvm.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt @@ -2,7 +2,6 @@ package net.mamoe.mirai.utils.internal private var isAddSuppressedSupported: Boolean = true -@PublishedApi internal actual fun Throwable.addSuppressedMirai(e: Throwable) { if (this == e) { return