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
ff8e6e8b
Commit
ff8e6e8b
authored
Feb 21, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add sequenceId to MessageSource
parent
776e5915
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt
...net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt
+2
-0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
...Main/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
+5
-0
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceFromMsg.kt
View file @
ff8e6e8b
...
@@ -22,6 +22,7 @@ internal inline class MessageSourceFromServer(
...
@@ -22,6 +22,7 @@ internal inline class MessageSourceFromServer(
val
delegate
:
ImMsgBody
.
SourceMsg
val
delegate
:
ImMsgBody
.
SourceMsg
)
:
MessageSource
{
)
:
MessageSource
{
override
val
time
:
Long
get
()
=
delegate
.
time
.
toLong
()
and
0
xFFFFFFFF
override
val
time
:
Long
get
()
=
delegate
.
time
.
toLong
()
and
0
xFFFFFFFF
override
val
sequenceId
:
Int
get
()
=
delegate
.
origSeqs
?.
firstOrNull
()
?:
error
(
"cannot find sequenceId from ImMsgBody.SourceMsg"
)
override
val
messageUid
:
Long
get
()
=
delegate
.
pbReserve
.
loadAs
(
SourceMsg
.
ResvAttr
.
serializer
()).
origUids
!!
override
val
messageUid
:
Long
get
()
=
delegate
.
pbReserve
.
loadAs
(
SourceMsg
.
ResvAttr
.
serializer
()).
origUids
!!
override
val
sourceMessage
:
MessageChain
get
()
=
delegate
.
toMessageChain
()
override
val
sourceMessage
:
MessageChain
get
()
=
delegate
.
toMessageChain
()
override
val
senderId
:
Long
get
()
=
delegate
.
senderUin
override
val
senderId
:
Long
get
()
=
delegate
.
senderUin
...
@@ -34,6 +35,7 @@ internal inline class MessageSourceFromMsg(
...
@@ -34,6 +35,7 @@ internal inline class MessageSourceFromMsg(
val
delegate
:
MsgComm
.
Msg
val
delegate
:
MsgComm
.
Msg
)
:
MessageSource
{
)
:
MessageSource
{
override
val
time
:
Long
get
()
=
delegate
.
msgHead
.
msgTime
.
toLong
()
and
0
xFFFFFFFF
override
val
time
:
Long
get
()
=
delegate
.
msgHead
.
msgTime
.
toLong
()
and
0
xFFFFFFFF
override
val
sequenceId
:
Int
get
()
=
delegate
.
msgHead
.
msgSeq
override
val
messageUid
:
Long
get
()
=
delegate
.
msgBody
.
richText
.
attr
!!
.
random
.
toLong
()
override
val
messageUid
:
Long
get
()
=
delegate
.
msgBody
.
richText
.
attr
!!
.
random
.
toLong
()
override
val
sourceMessage
:
MessageChain
get
()
=
delegate
.
toMessageChain
()
override
val
sourceMessage
:
MessageChain
get
()
=
delegate
.
toMessageChain
()
override
val
senderId
:
Long
get
()
=
delegate
.
msgHead
.
fromUin
override
val
senderId
:
Long
get
()
=
delegate
.
msgHead
.
fromUin
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageSource.kt
View file @
ff8e6e8b
...
@@ -26,6 +26,11 @@ import kotlin.jvm.JvmName
...
@@ -26,6 +26,11 @@ import kotlin.jvm.JvmName
interface
MessageSource
:
Message
{
interface
MessageSource
:
Message
{
companion
object
Key
:
Message
.
Key
<
MessageSource
>
companion
object
Key
:
Message
.
Key
<
MessageSource
>
/**
* 序列号
*/
val
sequenceId
:
Int
/**
/**
* 实际上是个随机数, 但服务器确实是用它当做 uid
* 实际上是个随机数, 但服务器确实是用它当做 uid
*/
*/
...
...
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