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
454205a6
Commit
454205a6
authored
Apr 23, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `ContactMessage.time`
parent
200a140f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
38 additions
and
11 deletions
+38
-11
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
...ndroid/network/protocol/packet/chat/receive/MessageSvc.kt
+4
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
...ndroid/network/protocol/packet/chat/receive/OnlinePush.kt
+2
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/ContactMessage.kt
...mmonMain/kotlin/net.mamoe.mirai/message/ContactMessage.kt
+6
-0
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt
...ommonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt
+9
-3
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/GroupMessage.kt
...commonMain/kotlin/net.mamoe.mirai/message/GroupMessage.kt
+9
-1
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/TempMessage.kt
.../commonMain/kotlin/net.mamoe.mirai/message/TempMessage.kt
+8
-4
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
View file @
454205a6
...
...
@@ -241,7 +241,8 @@ internal class MessageSvc {
if
(
friend
.
lastMessageSequence
.
compareAndSet
(
instant
,
msg
.
msgHead
.
msgSeq
))
{
return
@
mapNotNull
FriendMessage
(
friend
,
msg
.
toMessageChain
(
bot
,
groupIdOrZero
=
0
,
onlineSource
=
true
)
msg
.
toMessageChain
(
bot
,
groupIdOrZero
=
0
,
onlineSource
=
true
),
msg
.
msgHead
.
msgTime
)
}
}
else
return
@
mapNotNull
null
...
...
@@ -266,7 +267,8 @@ internal class MessageSvc {
msg
.
toMessageChain
(
bot
,
groupIdOrZero
=
0
,
onlineSource
=
true
,
isTemp
=
true
)
isTemp
=
true
),
msg
.
msgHead
.
msgTime
)
}
}
else
return
@
mapNotNull
null
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @
454205a6
...
...
@@ -108,7 +108,8 @@ internal class OnlinePush {
bot
.
logger
.
warning
(
"判断群员权限失败: ${pbPushMsg.msg.msgHead._miraiContentToString()}. 请完整截图或复制此日志发送给 mirai 维护者以帮助解决问题."
)
MemberPermission
.
MEMBER
}
}
},
time
=
pbPushMsg
.
msg
.
msgHead
.
msgTime
)
}
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/ContactMessage.kt
View file @
454205a6
...
...
@@ -102,6 +102,12 @@ abstract class MessagePacketBase<out TSender : User, out TSubject : Contact> : P
*/
abstract
val
message
:
MessageChain
/**
* 消息发送时间 (由服务器提供)
*/
@SinceMirai
(
"0.39.0"
)
abstract
val
time
:
Int
/**
* 消息源
*/
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/FriendMessage.kt
View file @
454205a6
...
...
@@ -20,19 +20,25 @@ import net.mamoe.mirai.message.data.MessageSource
import
net.mamoe.mirai.message.data.OnlineMessageSource
import
net.mamoe.mirai.message.data.source
import
net.mamoe.mirai.utils.PlannedRemoval
import
net.mamoe.mirai.utils.currentTimeSeconds
import
net.mamoe.mirai.utils.getValue
import
net.mamoe.mirai.utils.unsafeWeakRef
/**
* 好友消息
*/
class
FriendMessage
(
class
FriendMessage
constructor
(
sender
:
Friend
,
override
val
message
:
MessageChain
override
val
message
:
MessageChain
,
override
val
time
:
Int
)
:
ContactMessage
(),
BroadcastControllable
{
@PlannedRemoval
(
"1.0.0"
)
@Deprecated
(
""
,
level
=
DeprecationLevel
.
HIDDEN
)
constructor
(
sender
:
QQ
,
message
:
MessageChain
)
:
this
(
sender
as
Friend
,
message
)
constructor
(
sender
:
QQ
,
message
:
MessageChain
)
:
this
(
sender
as
Friend
,
message
,
currentTimeSeconds
.
toInt
())
@PlannedRemoval
(
"1.0.0"
)
@Deprecated
(
""
,
level
=
DeprecationLevel
.
HIDDEN
)
constructor
(
sender
:
Friend
,
message
:
MessageChain
)
:
this
(
sender
,
message
,
currentTimeSeconds
.
toInt
())
init
{
val
source
=
message
.
getOrNull
(
MessageSource
)
?:
error
(
"Cannot find MessageSource from message"
)
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/GroupMessage.kt
View file @
454205a6
...
...
@@ -15,6 +15,8 @@ import net.mamoe.mirai.contact.Member
import
net.mamoe.mirai.contact.MemberPermission
import
net.mamoe.mirai.event.Event
import
net.mamoe.mirai.message.data.*
import
net.mamoe.mirai.utils.PlannedRemoval
import
net.mamoe.mirai.utils.currentTimeSeconds
import
net.mamoe.mirai.utils.getValue
import
net.mamoe.mirai.utils.unsafeWeakRef
...
...
@@ -26,8 +28,14 @@ class GroupMessage(
*/
val
permission
:
MemberPermission
,
sender
:
Member
,
override
val
message
:
MessageChain
override
val
message
:
MessageChain
,
override
val
time
:
Int
)
:
ContactMessage
(),
Event
{
@PlannedRemoval
(
"1.0.0"
)
@Deprecated
(
""
,
level
=
DeprecationLevel
.
HIDDEN
)
constructor
(
senderName
:
String
,
permission
:
MemberPermission
,
sender
:
Member
,
message
:
MessageChain
)
:
this
(
senderName
,
permission
,
sender
,
message
,
currentTimeSeconds
.
toInt
())
init
{
val
source
=
message
.
getOrNull
(
MessageSource
)
?:
error
(
"Cannot find MessageSource from message"
)
check
(
source
is
OnlineMessageSource
.
Incoming
.
FromGroup
)
{
"source provided to a GroupMessage must be an instance of OnlineMessageSource.Incoming.FromGroup"
}
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/TempMessage.kt
View file @
454205a6
...
...
@@ -9,9 +9,7 @@ import net.mamoe.mirai.message.data.MessageChain
import
net.mamoe.mirai.message.data.MessageSource
import
net.mamoe.mirai.message.data.OnlineMessageSource
import
net.mamoe.mirai.message.data.source
import
net.mamoe.mirai.utils.SinceMirai
import
net.mamoe.mirai.utils.getValue
import
net.mamoe.mirai.utils.unsafeWeakRef
import
net.mamoe.mirai.utils.*
/**
* 临时会话消息
...
...
@@ -19,8 +17,14 @@ import net.mamoe.mirai.utils.unsafeWeakRef
@SinceMirai
(
"0.35.0"
)
class
TempMessage
(
sender
:
Member
,
override
val
message
:
MessageChain
override
val
message
:
MessageChain
,
override
val
time
:
Int
)
:
ContactMessage
(),
BroadcastControllable
{
@PlannedRemoval
(
"1.0.0"
)
@Deprecated
(
""
,
level
=
DeprecationLevel
.
HIDDEN
)
constructor
(
sender
:
Member
,
message
:
MessageChain
)
:
this
(
sender
,
message
,
currentTimeSeconds
.
toInt
())
init
{
val
source
=
message
.
getOrNull
(
MessageSource
)
?:
error
(
"Cannot find MessageSource from message"
)
check
(
source
is
OnlineMessageSource
.
Incoming
.
FromTemp
)
{
"source provided to a TempMessage must be an instance of OnlineMessageSource.Incoming.FromTemp"
}
...
...
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