diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/friend.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/friend.kt index c9ef3bfe9..312fdfb47 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/friend.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/friend.kt @@ -9,7 +9,7 @@ @file:JvmMultifileClass @file:JvmName("BotEventsKt") -@file:Suppress("FunctionName", "unused") +@file:Suppress("FunctionName", "unused", "DEPRECATION_ERROR") package net.mamoe.mirai.event.events diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt index e61cca788..871663d8e 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/At.kt @@ -18,7 +18,6 @@ import net.mamoe.mirai.LowLevelAPI import net.mamoe.mirai.contact.Member import net.mamoe.mirai.contact.nameCardOrNick import net.mamoe.mirai.message.code.CodableMessage -import net.mamoe.mirai.utils.SinceMirai import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmName import kotlin.jvm.JvmStatic @@ -41,7 +40,7 @@ private constructor( * "@群员名片" */ val display: String -) : MessageContent, @SinceMirai("1.1.0") CodableMessage { +) : MessageContent, CodableMessage { /** * 构造一个 [At] 实例. 这是唯一的公开的构造方式. diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/AtAll.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/AtAll.kt index 2af842885..bf3413637 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/AtAll.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/AtAll.kt @@ -13,7 +13,6 @@ package net.mamoe.mirai.message.data import net.mamoe.mirai.message.code.CodableMessage -import net.mamoe.mirai.utils.SinceMirai import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmName @@ -31,7 +30,7 @@ private const val displayA = "@全体成员" */ object AtAll : Message.Key, - MessageContent, @SinceMirai("1.1.0") CodableMessage { + MessageContent, CodableMessage { const val display = displayA override val typeName: String get() = "AtAll" diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt index b3416cadd..efcdac4ef 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt @@ -18,7 +18,6 @@ import net.mamoe.mirai.message.data.PokeMessage.Types import net.mamoe.mirai.message.data.VipFace.Companion import net.mamoe.mirai.message.data.VipFace.Kind import net.mamoe.mirai.utils.PlannedRemoval -import net.mamoe.mirai.utils.SinceMirai import kotlin.jvm.* /** @@ -55,7 +54,7 @@ data class PokeMessage internal constructor( val type: Int, val id: Int -) : HummerMessage(), @SinceMirai("1.1.0") CodableMessage { +) : HummerMessage(), CodableMessage { @Suppress("DEPRECATION_ERROR", "DEPRECATION", "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") companion object Types : Message.Key { override val typeName: String @@ -168,7 +167,7 @@ data class VipFace internal constructor( */ val kind: Kind, val count: Int -) : HummerMessage(), @SinceMirai("1.1.0") CodableMessage { +) : HummerMessage(), CodableMessage { data class Kind( val id: Int, val name: String @@ -250,7 +249,7 @@ data class VipFace internal constructor( * * @see Image 查看图片相关信息 */ -sealed class FlashImage : MessageContent, HummerMessage(), @SinceMirai("1.1.0") CodableMessage { +sealed class FlashImage : MessageContent, HummerMessage(), CodableMessage { companion object Key : Message.Key { /** * 将普通图片转换为闪照. diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt index 7bdf86ba6..3ac3cbde4 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Image.kt @@ -61,7 +61,7 @@ import kotlin.jvm.JvmSynthetic * @see FlashImage 闪照 * @see Image.flash 转换普通图片为闪照 */ -expect interface Image : Message, MessageContent, @SinceMirai("1.1.0") CodableMessage { +expect interface Image : Message, MessageContent, CodableMessage { companion object Key : Message.Key { override val typeName: String } diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/data/Image.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/data/Image.kt index 603907365..d5088db0a 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/data/Image.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/message/data/Image.kt @@ -52,7 +52,7 @@ import java.net.URL * @see FlashImage 闪照 * @see Image.flash 转换普通图片为闪照 */ -actual interface Image : Message, MessageContent, @SinceMirai("1.1.0") CodableMessage { +actual interface Image : Message, MessageContent, CodableMessage { actual companion object Key : Message.Key { actual override val typeName: String get() = "Image" }