From 067ab7c7654574afcbfb088223b7cd5ac4897e84 Mon Sep 17 00:00:00 2001 From: Him188 Date: Thu, 14 Jan 2021 12:28:00 +0800 Subject: [PATCH] Replace deprecation calls internally --- .../src/commonMain/kotlin/contact/AnonymousMemberImpl.kt | 1 - mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt | 6 +++--- mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt | 2 +- .../src/commonMain/kotlin/contact/NormalMemberImpl.kt | 4 ++-- mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt b/mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt index e8e3802f0..c2d6f71db 100644 --- a/mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/AnonymousMemberImpl.kt @@ -6,7 +6,6 @@ * * https://github.com/mamoe/mirai/blob/master/LICENSE */ -@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package net.mamoe.mirai.internal.contact diff --git a/mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt b/mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt index 91b2c6eff..30db216d3 100644 --- a/mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Mamoe Technologies and contributors. + * Copyright 2019-2021 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -29,7 +29,7 @@ import net.mamoe.mirai.internal.network.protocol.packet.list.FriendList import net.mamoe.mirai.internal.utils.C2CPkgMsgParsingCache import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.isContentNotEmpty +import net.mamoe.mirai.message.data.isContentEmpty import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract import kotlin.coroutines.CoroutineContext @@ -82,7 +82,7 @@ internal class FriendImpl( @Suppress("DuplicatedCode") override suspend fun sendMessage(message: Message): MessageReceipt { - require(message.isContentNotEmpty()) { "message is empty" } + require(!message.isContentEmpty()) { "message is empty" } return sendMessageImpl( message, friendReceiptConstructor = { MessageReceipt(it, this) }, diff --git a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt index 1af75e985..bfd9758c0 100644 --- a/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/GroupImpl.kt @@ -115,7 +115,7 @@ internal class GroupImpl( } override suspend fun sendMessage(message: Message): MessageReceipt { - require(message.isContentNotEmpty()) { "message is empty" } + require(!message.isContentEmpty()) { "message is empty" } check(!isBotMuted) { throw BotIsBeingMutedException(this) } return sendMessageImpl(message, false).also { diff --git a/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt b/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt index 5b65296d9..7734af435 100644 --- a/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/NormalMemberImpl.kt @@ -7,7 +7,7 @@ * https://github.com/mamoe/mirai/blob/master/LICENSE */ -@file:Suppress("EXPERIMENTAL_API_USAGE", "DEPRECATION_ERROR", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") +@file:Suppress("EXPERIMENTAL_API_USAGE") package net.mamoe.mirai.internal.contact @@ -51,7 +51,7 @@ internal class NormalMemberImpl constructor( @Suppress("UNCHECKED_CAST") @JvmSynthetic override suspend fun sendMessage(message: Message): MessageReceipt { - require(message.isContentNotEmpty()) { "message is empty" } + require(!message.isContentEmpty()) { "message is empty" } val asFriend = this.asFriendOrNull() val asStranger = this.asStrangerOrNull() diff --git a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt index 4811faf23..0a001e113 100644 --- a/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt +++ b/mirai-core/src/commonMain/kotlin/contact/StrangerImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019-2020 Mamoe Technologies and contributors. + * Copyright 2019-2021 Mamoe Technologies and contributors. * * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证. * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link. @@ -26,7 +26,7 @@ import net.mamoe.mirai.data.StrangerInfo import net.mamoe.mirai.internal.QQAndroidBot import net.mamoe.mirai.message.MessageReceipt import net.mamoe.mirai.message.data.Message -import net.mamoe.mirai.message.data.isContentNotEmpty +import net.mamoe.mirai.message.data.isContentEmpty import network.protocol.packet.list.StrangerList import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract @@ -77,7 +77,7 @@ internal class StrangerImpl( @Suppress("DuplicatedCode") override suspend fun sendMessage(message: Message): MessageReceipt { - require(message.isContentNotEmpty()) { "message is empty" } + require(!message.isContentEmpty()) { "message is empty" } return sendMessageImpl( message, strangerReceiptConstructor = { MessageReceipt(it, this) },