github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-09 18:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename InternalAPI as MiraiInternalAPI

Browse Source
This commit is contained in:
Him188 2019-11-16 18:46:34 +08:00
parent c3603832b0
commit ae86e67f9e
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
View File

@ -11,7 +11,7 @@ import net.mamoe.mirai.Bot
import net.mamoe.mirai.message.Image import net.mamoe.mirai.message.Image
import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter import net.mamoe.mirai.network.protocol.tim.handler.DataPacketSocketAdapter
import net.mamoe.mirai.network.protocol.tim.packet.SessionKey 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 import java.io.InputStream
/** /**
@ -19,7 +19,7 @@ import java.io.InputStream
* *
* @author Him188moe * @author Him188moe
*/ */
@UseExperimental(InternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
actual class BotSession actual constructor( actual class BotSession actual constructor(
bot: Bot, bot: Bot,
sessionKey: SessionKey, sessionKey: SessionKey,

4
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
View File

@ -1,12 +1,12 @@
package net.mamoe.mirai.network.protocol.tim.packet.event package net.mamoe.mirai.network.protocol.tim.packet.event
import net.mamoe.mirai.contact.Contact 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>() { actual abstract class MessagePacket<TSubject : Contact> : MessagePacketBase<TSubject>() {
// suspend inline fun uploadImage(image: Bitmap): Image = subject.uploadImage(image) // suspend inline fun uploadImage(image: Bitmap): Image = subject.uploadImage(image)
//suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image) //suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image)

6
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
View File

@ -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.SessionKey
import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImagePacket import net.mamoe.mirai.network.protocol.tim.packet.action.FriendImagePacket
import net.mamoe.mirai.network.protocol.tim.packet.action.ImageLink 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.getGTK
import net.mamoe.mirai.utils.internal.PositiveNumbers import net.mamoe.mirai.utils.internal.PositiveNumbers
import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail import net.mamoe.mirai.utils.internal.coerceAtLeastOrFail
@ -45,7 +45,7 @@ internal inline fun TIMBotNetworkHandler.BotSession(
* *
* @author Him188moe * @author Him188moe
*/ */
@UseExperimental(InternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
expect class BotSession( expect class BotSession(
bot: Bot, bot: Bot,
sessionKey: SessionKey, sessionKey: SessionKey,
@ -56,7 +56,7 @@ expect class BotSession(
/** /**
* [BotSession] 平台通用基础 * [BotSession] 平台通用基础
*/ */
@InternalAPI @MiraiInternalAPI
abstract class BotSessionBase( abstract class BotSessionBase(
val bot: Bot, val bot: Bot,
val sessionKey: SessionKey, val sessionKey: SessionKey,

4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
View File

@ -28,10 +28,10 @@ import kotlin.jvm.JvmName
/** /**
* 平台相关扩展 * 平台相关扩展
*/ */
@UseExperimental(InternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
expect abstract class MessagePacket<TSubject : Contact>() : MessagePacketBase<TSubject> expect abstract class MessagePacket<TSubject : Contact>() : MessagePacketBase<TSubject>
@InternalAPI @MiraiInternalAPI
abstract class MessagePacketBase<TSubject : Contact> : EventPacket, BotEvent() { abstract class MessagePacketBase<TSubject : Contact> : EventPacket, BotEvent() {
internal lateinit var botVar: Bot internal lateinit var botVar: Bot

5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
View File

@ -83,8 +83,9 @@ fun LoginResult.requireSuccess() {
* *
* @return 成功时 [Unit], 失败时 `null` * @return 成功时 [Unit], 失败时 `null`
*/ */
fun LoginResult.requireSuccessOrNull(): Unit? = fun LoginResult.requireSuccessOrNull(): Unit? {
if (this == SUCCESS) Unit else null return if (this == SUCCESS) Unit else null
}
/** /**

4
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
View File

@ -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.handler.DataPacketSocketAdapter
import net.mamoe.mirai.network.protocol.tim.packet.SessionKey import net.mamoe.mirai.network.protocol.tim.packet.SessionKey
import net.mamoe.mirai.utils.ExternalImage 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 net.mamoe.mirai.utils.toExternalImage
import java.awt.image.BufferedImage import java.awt.image.BufferedImage
import java.io.File import java.io.File
@ -21,7 +21,7 @@ import javax.imageio.ImageIO
/** /**
* JVM 平台相关扩展. 详情查看 [BotSessionBase] * JVM 平台相关扩展. 详情查看 [BotSessionBase]
*/ */
@UseExperimental(InternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
@Suppress("unused") @Suppress("unused")
actual class BotSession actual constructor( actual class BotSession actual constructor(
bot: Bot, bot: Bot,

4
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
View File

@ -10,7 +10,7 @@ import kotlinx.io.streams.inputStream
import net.mamoe.mirai.contact.Contact import net.mamoe.mirai.contact.Contact
import net.mamoe.mirai.message.* import net.mamoe.mirai.message.*
import net.mamoe.mirai.utils.ExternalImage 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 net.mamoe.mirai.utils.toExternalImage
import java.awt.image.BufferedImage import java.awt.image.BufferedImage
import java.io.File import java.io.File
@ -22,7 +22,7 @@ import javax.imageio.ImageIO
/** /**
* JVM 平台相关扩展 * JVM 平台相关扩展
*/ */
@UseExperimental(InternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
actual abstract class MessagePacket<TSubject : Contact> : MessagePacketBase<TSubject>() { actual abstract class MessagePacket<TSubject : Contact> : MessagePacketBase<TSubject>() {
suspend inline fun uploadImage(image: BufferedImage): Image = subject.uploadImage(image) suspend inline fun uploadImage(image: BufferedImage): Image = subject.uploadImage(image)
suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image) suspend inline fun uploadImage(image: URL): Image = subject.uploadImage(image)