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
876da071
Commit
876da071
authored
Feb 22, 2020
by
ryoii
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tool man fixes bugs which he doesnt know at all
parent
989547d0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
19 deletions
+16
-19
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
...moe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
+16
-19
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidBotNetworkHandler.kt
View file @
876da071
...
...
@@ -374,12 +374,12 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
// with generic type, less mistakes
private
suspend
fun
<
P
:
Packet
?
>
generifiedParsePacket
(
input
:
Input
)
{
KnownPacketFactories
.
parseIncomingPacket
(
bot
,
input
)
{
packetFactory
:
PacketFactory
<
P
>,
packet
:
P
,
commandName
:
String
,
sequenceId
:
Int
->
handlePacket
(
packetFactory
,
packet
,
commandName
,
sequenceId
)
if
(
packet
is
MultiPacket
<
*
>)
{
packet
.
forEach
{
handlePacket
(
null
,
it
,
commandName
,
sequenceId
)
}
}
handlePacket
(
packetFactory
,
packet
,
commandName
,
sequenceId
)
}
}
...
...
@@ -388,19 +388,31 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
*/
suspend
fun
<
P
:
Packet
?
>
handlePacket
(
packetFactory
:
PacketFactory
<
P
>?,
packet
:
P
,
commandName
:
String
,
sequenceId
:
Int
)
{
// highest priority: pass to listeners (attached by sendAndExpect).
if
(
packet
!=
null
&&
(
bot
.
logger
.
isEnabled
||
logger
.
isEnabled
))
{
val
logMessage
=
"Received: ${packet.toString().replace("
\
n
", """
\
n
""").replace("
\
r
", "")}"
if
(
packet
is
Event
)
{
bot
.
logger
.
verbose
(
logMessage
)
}
else
logger
.
verbose
(
logMessage
)
}
packetListeners
.
forEach
{
listener
->
if
(
listener
.
filter
(
commandName
,
sequenceId
)
&&
packetListeners
.
remove
(
listener
))
{
listener
.
complete
(
packet
)
}
}
// check top-level cancelling
packetFactory
?.
run
{
when
(
this
)
{
is
OutgoingPacketFactory
<
P
>
->
bot
.
handle
(
packet
)
is
IncomingPacketFactory
<
P
>
->
bot
.
handle
(
packet
,
sequenceId
)
?.
sendWithoutExpect
()
}
}
if
(
packet
!=
null
&&
PacketReceivedEvent
(
packet
).
broadcast
().
isCancelled
)
{
return
}
// broadcast
if
(
packet
is
Event
)
{
if
(
packet
is
BroadcastControllable
)
{
if
(
packet
.
shouldBroadcast
)
packet
.
broadcast
()
...
...
@@ -410,21 +422,6 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
if
(
packet
is
CancellableEvent
&&
packet
.
isCancelled
)
return
}
if
(
packet
!=
null
&&
(
bot
.
logger
.
isEnabled
||
logger
.
isEnabled
))
{
val
logMessage
=
"Received: ${packet.toString().replace("
\
n
", """
\
n
""").replace("
\
r
", "")}"
if
(
packet
is
Event
)
{
bot
.
logger
.
verbose
(
logMessage
)
}
else
logger
.
verbose
(
logMessage
)
}
packetFactory
?.
run
{
when
(
this
)
{
is
OutgoingPacketFactory
<
P
>
->
bot
.
handle
(
packet
)
is
IncomingPacketFactory
<
P
>
->
bot
.
handle
(
packet
,
sequenceId
)
?.
sendWithoutExpect
()
}
}
}
/**
...
...
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