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
0a928407
Commit
0a928407
authored
May 29, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove `@Serializable` from core module
parent
36fd7ccd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
8 deletions
+5
-8
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
...Main/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
+3
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
...ain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
+2
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt
...Main/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt
+0
-4
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
View file @
0a928407
...
...
@@ -12,8 +12,9 @@
package
net.mamoe.mirai.message.data
import
kotlinx.io.core.*
import
kotlinx.serialization.*
import
kotlinx.serialization.builtins.ByteArraySerializer
import
kotlinx.serialization.KSerializer
import
kotlinx.serialization.Serializable
import
kotlinx.serialization.UnstableDefault
import
kotlinx.serialization.json.Json
import
kotlinx.serialization.json.JsonConfiguration
import
kotlinx.serialization.protobuf.ProtoBuf
...
...
@@ -35,7 +36,6 @@ import kotlin.jvm.JvmOverloads
*
* @see CustomMessageMetadata 自定义消息元数据
*/
@Serializable
(
with
=
CustomMessage
.
MessageSerializer
::
class
)
@MiraiExperimentalAPI
sealed
class
CustomMessage
:
SingleMessage
{
/**
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/ForwardMessage.kt
View file @
0a928407
...
...
@@ -22,6 +22,7 @@ import net.mamoe.mirai.utils.MiraiExperimentalAPI
import
net.mamoe.mirai.utils.currentTimeSeconds
import
kotlin.jvm.JvmOverloads
import
kotlin.jvm.JvmSynthetic
import
kotlin.jvm.Transient
/**
...
...
@@ -87,7 +88,7 @@ class ForwardMessage @JvmOverloads constructor(
* 消息列表
*/
val
nodeList
:
Collection
<
INode
>,
val
displayStrategy
:
DisplayStrategy
=
DisplayStrategy
.
Default
@Transient
val
displayStrategy
:
DisplayStrategy
=
DisplayStrategy
.
Default
)
:
MessageContent
{
init
{
require
(
nodeList
.
isNotEmpty
())
{
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/HummerMessage.kt
View file @
0a928407
...
...
@@ -13,7 +13,6 @@
package
net.mamoe.mirai.message.data
import
kotlinx.serialization.Serializable
import
net.mamoe.mirai.message.data.PokeMessage.Types
import
net.mamoe.mirai.message.data.VipFace.Companion
import
net.mamoe.mirai.utils.PlannedRemoval
...
...
@@ -235,7 +234,6 @@ data class VipFace internal constructor(
*
* @see Image 查看图片相关信息
*/
@Serializable
sealed
class
FlashImage
:
MessageContent
,
HummerMessage
()
{
companion
object
Key
:
Message
.
Key
<
FlashImage
>
{
/**
...
...
@@ -290,7 +288,6 @@ inline fun Image.flash(): FlashImage = FlashImage(this)
* @see FlashImage.invoke
*/
@PlannedRemoval
(
"1.3.0"
)
// internal
@Serializable
@Suppress
(
"DEPRECATION"
,
"DEPRECATION_ERROR"
)
@Deprecated
(
"use FlashImage instead"
,
...
...
@@ -329,7 +326,6 @@ constructor(override val image: Image) : FlashImage() {
* @see FlashImage.invoke
*/
@PlannedRemoval
(
"1.3.0"
)
// internal
@Serializable
@Suppress
(
"DEPRECATION"
,
"DEPRECATION_ERROR"
)
@Deprecated
(
"use FlashImage instead"
,
...
...
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