From ae86e67f9e48dce2af4f7a80f7897ce932c481a9 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Sat, 16 Nov 2019 18:46:34 +0800
Subject: [PATCH] Rename InternalAPI as MiraiInternalAPI
---
.../kotlin/net/mamoe/mirai/network/BotSession.kt | 4 ++--
.../network/protocol/tim/packet/event/MessagePacket.kt | 4 ++--
.../commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt | 6 +++---
.../network/protocol/tim/packet/event/Message.kt | 4 ++--
.../network/protocol/tim/packet/login/LoginResult.kt | 5 +++--
.../jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt | 4 ++--
.../network/protocol/tim/packet/event/MessagePacket.kt | 4 ++--
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
index a924d4fd0..6435d38d3 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
@@ -11,7 +11,7 @@ import net.mamoe.mirai.Bot
import net.mamoe.mirai.message.Image
import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter
import net.mamoe.mirai.network.protocol.tim.packet.SessionKey
-import net.mamoe.mirai.utils.InternalAPI
+import net.mamoe.mirai.utils.MiraiInternalAPI
import java.io.InputStream
/**
@@ -19,7 +19,7 @@ import java.io.InputStream
*
* @author Him188moe
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
actual class BotSession actual constructor(
bot: Bot,
sessionKey: SessionKey,
diff --git a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
index 63e652369..c4a3da9bb 100644
--- a/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
+++ b/mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
@@ -1,12 +1,12 @@
package net.mamoe.mirai.network.protocol.tim.packet.event
import net.mamoe.mirai.contact.Contact
-import net.mamoe.mirai.utils.InternalAPI
+import net.mamoe.mirai.utils.MiraiInternalAPI
/**
* 平台相关扩展
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
actual abstract class MessagePacket<TSubject : Contact> : MessagePacketBase<TSubject>() {
// suspend inline fun uploadImage(image: Bitmap): Image = subject.uploadImage(image)
//suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image)
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
index 9b8cd4929..fcdf07fce 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
@@ -22,7 +22,7 @@ import net.mamoe.mirai.network.protocol.tim.packet.Packet
import net.mamoe.mirai.network.protocol.tim.packet.SessionKey
import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImagePacket
import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink
-import net.mamoe.mirai.utils.InternalAPI
+import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.getGTK
import net.mamoe.mirai.utils.internal.PositiveNumbers
import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
@@ -45,7 +45,7 @@ internal inline fun TIMBotNetworkHandler.BotSession(
*
* @author Him188moe
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
expect class BotSession(
bot: Bot,
sessionKey: SessionKey,
@@ -56,7 +56,7 @@ expect class BotSession(
/**
* [BotSession] 平台通用基础
*/
-@InternalAPI
+@MiraiInternalAPI
abstract class BotSessionBase(
val bot: Bot,
val sessionKey: SessionKey,
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
index 9ce563460..2ee101cbf 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
@@ -28,10 +28,10 @@ import kotlin.jvm.JvmName
/**
* 平台相关扩展
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
expect abstract class MessagePacket<TSubject : Contact>() : MessagePacketBase<TSubject>
-@InternalAPI
+@MiraiInternalAPI
abstract class MessagePacketBase<TSubject : Contact> : EventPacket, BotEvent() {
internal lateinit var botVar: Bot
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
index e434a2ba2..d66d1fb3d 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
@@ -83,8 +83,9 @@ fun LoginResult.requireSuccess() {
*
* @return 成功时 [Unit], 失败时 `null`
*/
-fun LoginResult.requireSuccessOrNull(): Unit? =
- if (this == SUCCESS) Unit else null
+fun LoginResult.requireSuccessOrNull(): Unit? {
+ return if (this == SUCCESS) Unit else null
+}
/**
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
index c95c3453f..7277f4955 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
@@ -10,7 +10,7 @@ import net.mamoe.mirai.message.Image
import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter
import net.mamoe.mirai.network.protocol.tim.packet.SessionKey
import net.mamoe.mirai.utils.ExternalImage
-import net.mamoe.mirai.utils.InternalAPI
+import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.toExternalImage
import java.awt.image.BufferedImage
import java.io.File
@@ -21,7 +21,7 @@ import javax.imageio.ImageIO
/**
* JVM 平台相关扩展. 详情查看 [BotSessionBase]
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
@Suppress("unused")
actual class BotSession actual constructor(
bot: Bot,
diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
index e1072e61e..1cc722b50 100644
--- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
+++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
@@ -10,7 +10,7 @@ import kotlinx.io.streams.inputStream
import net.mamoe.mirai.contact.Contact
import net.mamoe.mirai.message.*
import net.mamoe.mirai.utils.ExternalImage
-import net.mamoe.mirai.utils.InternalAPI
+import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.toExternalImage
import java.awt.image.BufferedImage
import java.io.File
@@ -22,7 +22,7 @@ import javax.imageio.ImageIO
/**
* JVM 平台相关扩展
*/
-@UseExperimental(InternalAPI::class)
+@UseExperimental(MiraiInternalAPI::class)
actual abstract class MessagePacket<TSubject : Contact> : MessagePacketBase<TSubject>() {
suspend inline fun uploadImage(image: BufferedImage): Image = subject.uploadImage(image)
suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image)