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
f765804f
Commit
f765804f
authored
May 09, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make `MessageMetadata.contentToString` final
parent
b0089d58
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
13 deletions
+7
-13
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
...Main/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
+0
-2
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt
...commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt
+7
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
...Main/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
+0
-5
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/QuoteReply.kt
...monMain/kotlin/net.mamoe.mirai/message/data/QuoteReply.kt
+0
-1
mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/ConstrainSingleTest.kt
...otlin/net/mamoe/mirai/message.data/ConstrainSingleTest.kt
+0
-4
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/CustomMessage.kt
View file @
f765804f
...
...
@@ -190,8 +190,6 @@ abstract class CustomMessageMetadata : CustomMessage(), MessageMetadata {
final
override
fun
toString
():
String
=
"[mirai:custom:${getFactory().typeName}:${String(customToString())}]"
final
override
fun
contentToString
():
String
=
""
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/Message.kt
View file @
f765804f
...
...
@@ -297,7 +297,13 @@ interface SingleMessage : Message {
*
* @see ConstrainSingle 约束一个 [MessageChain] 中只存在这一种类型的元素
*/
interface
MessageMetadata
:
SingleMessage
interface
MessageMetadata
:
SingleMessage
{
/**
* 返回空字符串
*/
@Suppress
(
"WRONG_MODIFIER_CONTAINING_DECLARATION"
)
final
override
fun
contentToString
():
String
=
""
}
/**
* 约束一个 [MessageChain] 中只存在这一种类型的元素. 新元素将会替换旧元素, 保持原顺序.
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
View file @
f765804f
...
...
@@ -132,11 +132,6 @@ sealed class MessageSource : Message, MessageMetadata, ConstrainSingle<MessageSo
* 返回 `"[mirai:source:$id,$internalId]"`
*/
final
override
fun
toString
():
String
=
"[mirai:source:$id,$internalId]"
/**
* 返回空字符串, 因 [MessageMetadata] 的约束.
*/
final
override
fun
contentToString
():
String
=
""
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/QuoteReply.kt
View file @
f765804f
...
...
@@ -55,7 +55,6 @@ class QuoteReply(val source: MessageSource) : Message, MessageMetadata, Constrai
override
val
key
:
Message
.
Key
<
QuoteReply
>
get
()
=
Key
override
fun
toString
():
String
=
"[mirai:quote:${source.id},${source.internalId}]"
override
fun
contentToString
():
String
=
""
override
fun
equals
(
other
:
Any
?):
Boolean
=
other
is
QuoteReply
&&
other
.
source
==
this
.
source
override
fun
hashCode
():
Int
=
source
.
hashCode
()
}
...
...
mirai-core/src/commonTest/kotlin/net/mamoe/mirai/message.data/ConstrainSingleTest.kt
View file @
f765804f
...
...
@@ -26,10 +26,6 @@ internal class TestConstrainSingleMessage : ConstrainSingle<TestConstrainSingleM
override
fun
toString
():
String
=
"<TestConstrainSingleMessage#${super.hashCode()}>"
override
fun
contentToString
():
String
{
return
""
}
override
val
key
:
Message
.
Key
<
TestConstrainSingleMessage
>
get
()
=
Key
}
...
...
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