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
40fcea32
Commit
40fcea32
authored
Jun 05, 2020
by
Him188
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
d689c6c9
f99981ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
...irai/qqandroid/network/protocol/packet/chat/NewContact.kt
+6
-2
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/NewContact.kt
View file @
40fcea32
...
...
@@ -145,7 +145,7 @@ internal class NewContact {
readBytes
().
loadAs
(
Structmsg
.
RspSystemMsgNew
.
serializer
()).
run
{
val
struct
=
groupmsgs
?.
firstOrNull
()
return
struct
?.
msg
?.
run
<
Structmsg
.
SystemMsg
,
Packet
>
{
return
struct
?.
msg
?.
run
{
//this.soutv("SystemMsg")
when
(
subType
)
{
1
->
{
//管理员邀请
...
...
@@ -179,6 +179,10 @@ internal class NewContact {
BotJoinGroupEvent
.
Invite
(
invitor
)
}
3
->
{
// 已被请他管理员处理
null
}
5
->
{
val
group
=
bot
.
getGroupOrNull
(
groupCode
)
?:
return
null
val
operator
=
group
[
actionUin
]
...
...
@@ -190,7 +194,7 @@ internal class NewContact {
additional
=
"并尽量描述此时机器人是否正被邀请加入群, 或者是有有新群员加入此群"
)
}
}
as
Packet
// 没有 as Packet 垃圾 kotlin 会把类型推断为Any
}
}
}
...
...
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