Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
ae86e67f
Commit
ae86e67f
authored
Nov 16, 2019
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename InternalAPI as MiraiInternalAPI
parent
c3603832
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
15 deletions
+16
-15
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
.../androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
+2
-2
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
.../mirai/network/protocol/tim/packet/event/MessagePacket.kt
+2
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
...c/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
+3
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
....mamoe.mirai/network/protocol/tim/packet/event/Message.kt
+2
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
...oe.mirai/network/protocol/tim/packet/login/LoginResult.kt
+3
-2
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
...c/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
+2
-2
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
.../mirai/network/protocol/tim/packet/event/MessagePacket.kt
+2
-2
No files found.
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/BotSession.kt
View file @
ae86e67f
...
...
@@ -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.
Mirai
InternalAPI
import
java.io.InputStream
/**
...
...
@@ -19,7 +19,7 @@ import java.io.InputStream
*
* @author Him188moe
*/
@UseExperimental
(
InternalAPI
::
class
)
@UseExperimental
(
Mirai
InternalAPI
::
class
)
actual
class
BotSession
actual
constructor
(
bot
:
Bot
,
sessionKey
:
SessionKey
,
...
...
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
View file @
ae86e67f
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.
Mirai
InternalAPI
/**
* 平台相关扩展
*/
@UseExperimental
(
InternalAPI
::
class
)
@UseExperimental
(
Mirai
InternalAPI
::
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)
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/BotSession.kt
View file @
ae86e67f
...
...
@@ -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.
Mirai
InternalAPI
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
(
Mirai
InternalAPI
::
class
)
expect
class
BotSession
(
bot
:
Bot
,
sessionKey
:
SessionKey
,
...
...
@@ -56,7 +56,7 @@ expect class BotSession(
/**
* [BotSession] 平台通用基础
*/
@InternalAPI
@
Mirai
InternalAPI
abstract
class
BotSessionBase
(
val
bot
:
Bot
,
val
sessionKey
:
SessionKey
,
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/Message.kt
View file @
ae86e67f
...
...
@@ -28,10 +28,10 @@ import kotlin.jvm.JvmName
/**
* 平台相关扩展
*/
@UseExperimental
(
InternalAPI
::
class
)
@UseExperimental
(
Mirai
InternalAPI
::
class
)
expect
abstract
class
MessagePacket
<
TSubject
:
Contact
>()
:
MessagePacketBase
<
TSubject
>
@InternalAPI
@
Mirai
InternalAPI
abstract
class
MessagePacketBase
<
TSubject
:
Contact
>
:
EventPacket
,
BotEvent
()
{
internal
lateinit
var
botVar
:
Bot
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/LoginResult.kt
View file @
ae86e67f
...
...
@@ -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
}
/**
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/BotSessionJvm.kt
View file @
ae86e67f
...
...
@@ -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.
Mirai
InternalAPI
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
(
Mirai
InternalAPI
::
class
)
@Suppress
(
"unused"
)
actual
class
BotSession
actual
constructor
(
bot
:
Bot
,
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/network/protocol/tim/packet/event/MessagePacket.kt
View file @
ae86e67f
...
...
@@ -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.
Mirai
InternalAPI
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
(
Mirai
InternalAPI
::
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment