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
1dd4caa0
Commit
1dd4caa0
authored
Feb 29, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support recall events, close #88
parent
024bd230
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
225 additions
and
130 deletions
+225
-130
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
...mmonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
+10
-0
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
+6
-8
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
+209
-122
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt
View file @
1dd4caa0
...
@@ -19,6 +19,8 @@ import net.mamoe.mirai.data.AddFriendResult
...
@@ -19,6 +19,8 @@ import net.mamoe.mirai.data.AddFriendResult
import
net.mamoe.mirai.data.FriendInfo
import
net.mamoe.mirai.data.FriendInfo
import
net.mamoe.mirai.data.GroupInfo
import
net.mamoe.mirai.data.GroupInfo
import
net.mamoe.mirai.data.MemberInfo
import
net.mamoe.mirai.data.MemberInfo
import
net.mamoe.mirai.event.broadcast
import
net.mamoe.mirai.event.events.MessageRecallEvent
import
net.mamoe.mirai.message.data.*
import
net.mamoe.mirai.message.data.*
import
net.mamoe.mirai.qqandroid.message.CustomFaceFromServer
import
net.mamoe.mirai.qqandroid.message.CustomFaceFromServer
import
net.mamoe.mirai.qqandroid.message.NotOnlineImageFromServer
import
net.mamoe.mirai.qqandroid.message.NotOnlineImageFromServer
...
@@ -140,6 +142,14 @@ internal abstract class QQAndroidBotBase constructor(
...
@@ -140,6 +142,14 @@ internal abstract class QQAndroidBotBase constructor(
source
.
time
source
.
time
).
sendAndExpect
()
).
sendAndExpect
()
}
else
{
}
else
{
MessageRecallEvent
.
GroupRecall
(
bot
,
source
.
qqId
,
source
.
id
,
source
.
time
.
toInt
(),
null
,
getGroup
(
source
.
groupId
)
).
broadcast
()
PbMessageSvc
.
PbMsgWithDraw
.
Group
(
PbMessageSvc
.
PbMsgWithDraw
.
Group
(
bot
.
client
,
bot
.
client
,
source
.
groupId
,
source
.
groupId
,
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt
View file @
1dd4caa0
...
@@ -16,7 +16,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
...
@@ -16,7 +16,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import
net.mamoe.mirai.contact.Group
import
net.mamoe.mirai.contact.Group
import
net.mamoe.mirai.contact.MemberPermission
import
net.mamoe.mirai.contact.MemberPermission
import
net.mamoe.mirai.data.MemberInfo
import
net.mamoe.mirai.data.MemberInfo
import
net.mamoe.mirai.data.MultiPacket
import
net.mamoe.mirai.data.MultiPacket
ByIterable
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.event.events.BotJoinGroupEvent
import
net.mamoe.mirai.event.events.BotJoinGroupEvent
import
net.mamoe.mirai.event.events.BotOfflineEvent
import
net.mamoe.mirai.event.events.BotOfflineEvent
...
@@ -107,19 +107,17 @@ internal class MessageSvc {
...
@@ -107,19 +107,17 @@ internal class MessageSvc {
@UseExperimental
(
MiraiInternalAPI
::
class
)
@UseExperimental
(
MiraiInternalAPI
::
class
)
open
class
GetMsgSuccess
(
delegate
:
List
<
Packet
>)
:
Response
(
MsgSvc
.
SyncFlag
.
STOP
,
delegate
)
{
open
class
GetMsgSuccess
(
delegate
:
List
<
Packet
>)
:
Response
(
MsgSvc
.
SyncFlag
.
STOP
,
delegate
)
{
override
fun
toString
():
String
{
override
fun
toString
():
String
=
"MessageSvc.PbGetMsg.GetMsgSuccess(messages=<Iterable>))"
return
"MessageSvc.PbGetMsg.GetMsgSuccess(messages=List(size=${this.size}))"
}
}
}
/**
/**
* 不要直接 expect 这个 class. 它可能还没同步完成
* 不要直接 expect 这个 class. 它可能还没同步完成
*/
*/
@MiraiInternalAPI
@MiraiInternalAPI
open
class
Response
(
internal
val
syncFlagFromServer
:
MsgSvc
.
SyncFlag
,
delegate
:
List
<
Packet
>)
:
MultiPacket
<
Packet
>(
delegate
)
{
open
class
Response
(
internal
val
syncFlagFromServer
:
MsgSvc
.
SyncFlag
,
delegate
:
List
<
Packet
>)
:
override
fun
toString
():
String
{
MultiPacketByIterable
<
Packet
>(
delegate
)
{
return
"MessageSvc.PbGetMsg.Response($syncFlagFromServer=$syncFlagFromServer, messages=List(size=${this.size}))"
override
fun
toString
():
String
=
}
"MessageSvc.PbGetMsg.Response($syncFlagFromServer=$syncFlagFromServer, messages=<Iterable>))"
}
}
object
EmptyResponse
:
GetMsgSuccess
(
emptyList
())
object
EmptyResponse
:
GetMsgSuccess
(
emptyList
())
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @
1dd4caa0
This diff is collapsed.
Click to expand it.
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