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
94557a2a
Commit
94557a2a
authored
Apr 10, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce nesting depth, also fix #173
parent
c64156bd
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
189 additions
and
239 deletions
+189
-239
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
...ain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
+3
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/Packet.kt
...onMain/kotlin/net/mamoe/mirai/qqandroid/network/Packet.kt
+0
-6
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
...rai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
+1
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt
...mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt
+2
-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
+183
-229
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt
View file @
94557a2a
...
@@ -63,7 +63,9 @@ internal class GroupImpl(
...
@@ -63,7 +63,9 @@ internal class GroupImpl(
groupInfo
:
GroupInfo
,
groupInfo
:
GroupInfo
,
members
:
Sequence
<
MemberInfo
>
members
:
Sequence
<
MemberInfo
>
)
:
Group
()
{
)
:
Group
()
{
companion
object
;
companion
object
val
lastRecalledMessageRandoms
:
LockFreeLinkedList
<
Int
>
=
LockFreeLinkedList
()
override
val
bot
:
QQAndroidBot
by
bot
.
unsafeWeakRef
()
override
val
bot
:
QQAndroidBot
by
bot
.
unsafeWeakRef
()
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/Packet.kt
View file @
94557a2a
...
@@ -25,12 +25,6 @@ interface Packet {
...
@@ -25,12 +25,6 @@ interface Packet {
}
}
*/
*/
internal
object
NoPacket
:
Packet
{
override
fun
toString
():
String
{
return
"NoPacket"
}
}
/**
/**
* PacketFactory 可以一次解析多个包出来. 它们将会被分别广播.
* PacketFactory 可以一次解析多个包出来. 它们将会被分别广播.
*/
*/
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
View file @
94557a2a
...
@@ -42,7 +42,7 @@ internal class MsgInfo(
...
@@ -42,7 +42,7 @@ internal class MsgInfo(
@JceId
(
3
)
val
shMsgSeq
:
Short
,
@JceId
(
3
)
val
shMsgSeq
:
Short
,
@JceId
(
4
)
val
strMsg
:
String
?,
@JceId
(
4
)
val
strMsg
:
String
?,
@JceId
(
5
)
val
uRealMsgTime
:
Int
?,
@JceId
(
5
)
val
uRealMsgTime
:
Int
?,
@JceId
(
6
)
val
vMsg
:
ByteArray
?
,
@JceId
(
6
)
val
vMsg
:
ByteArray
,
@JceId
(
7
)
val
uAppShareID
:
Long
?,
@JceId
(
7
)
val
uAppShareID
:
Long
?,
@JceId
(
8
)
val
vMsgCookies
:
ByteArray
?
=
EMPTY_BYTE_ARRAY
,
@JceId
(
8
)
val
vMsgCookies
:
ByteArray
?
=
EMPTY_BYTE_ARRAY
,
@JceId
(
9
)
val
vAppShareCookie
:
ByteArray
?
=
EMPTY_BYTE_ARRAY
,
@JceId
(
9
)
val
vAppShareCookie
:
ByteArray
?
=
EMPTY_BYTE_ARRAY
,
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/OnlinePush.kt
View file @
94557a2a
...
@@ -29,13 +29,13 @@ internal class MsgOnlinePush {
...
@@ -29,13 +29,13 @@ internal class MsgOnlinePush {
@Serializable
@Serializable
internal
class
OnlinePushTrans
:
ProtoBuf
{
internal
class
OnlinePushTrans
:
ProtoBuf
{
@Serializable
@Serializable
internal
class
ExtGroupKeyInfo
(
internal
class
ExtGroupKeyInfo
(
@ProtoId
(
1
)
val
curMaxSeq
:
Int
=
0
,
@ProtoId
(
1
)
val
curMaxSeq
:
Int
=
0
,
@ProtoId
(
2
)
val
curTime
:
Long
=
0L
@ProtoId
(
2
)
val
curTime
:
Long
=
0L
)
:
ProtoBuf
)
:
ProtoBuf
@Serializable
@Serializable
internal
class
PbMsgInfo
(
internal
class
PbMsgInfo
(
@ProtoId
(
1
)
val
fromUin
:
Long
=
0L
,
@ProtoId
(
1
)
val
fromUin
:
Long
=
0L
,
@ProtoId
(
2
)
val
toUin
:
Long
=
0L
,
@ProtoId
(
2
)
val
toUin
:
Long
=
0L
,
@ProtoId
(
3
)
val
msgType
:
Int
=
0
,
@ProtoId
(
3
)
val
msgType
:
Int
=
0
,
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View file @
94557a2a
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