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
e43a5176
Commit
e43a5176
authored
Feb 05, 2020
by
jiahua.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
edit group name supported
parent
385f71e2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
109 additions
and
12 deletions
+109
-12
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
...ommonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
+6
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt
...oe/mirai/qqandroid/io/serialization/SerializationUtils.kt
+14
-2
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
...e/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
+19
-0
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
.../mirai/qqandroid/network/protocol/packet/PacketFactory.kt
+2
-1
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
...qqandroid/network/protocol/packet/chat/TroopManagement.kt
+62
-7
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/ByteArrayUtil.kt
...mmonMain/kotlin/net.mamoe.mirai/utils/io/ByteArrayUtil.kt
+6
-1
No files found.
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/ContactImpl.kt
View file @
e43a5176
...
@@ -82,9 +82,14 @@ internal class MemberImpl(
...
@@ -82,9 +82,14 @@ internal class MemberImpl(
"Permission Denied when trying to edit group card for $this"
"Permission Denied when trying to edit group card for $this"
}
}
if
(
group
.
botPermission
!=
MemberPermission
.
MEMBER
&&
new
!=
old
)
{
if
(
group
.
botPermission
!=
MemberPermission
.
MEMBER
&&
new
!=
old
)
{
launch
{
launch
{
bot
.
network
.
run
{
bot
.
network
.
run
{
TroopManagement
.
EditGroupNametag
(
bot
.
client
,
this
@MemberImpl
,
new
).
sendWithoutExpect
()
}
}
}
}
}
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/SerializationUtils.kt
View file @
e43a5176
...
@@ -90,7 +90,10 @@ fun <T : ProtoBuf> ByteArray.loadAs(deserializer: DeserializationStrategy<T>): T
...
@@ -90,7 +90,10 @@ fun <T : ProtoBuf> ByteArray.loadAs(deserializer: DeserializationStrategy<T>): T
/**
/**
* load
* load
*/
*/
fun
<
T
:
ProtoBuf
>
ByteReadPacket
.
readProtoBuf
(
serializer
:
DeserializationStrategy
<
T
>,
length
:
Int
=
this
.
remaining
.
toInt
()):
T
{
fun
<
T
:
ProtoBuf
>
ByteReadPacket
.
readProtoBuf
(
serializer
:
DeserializationStrategy
<
T
>,
length
:
Int
=
this
.
remaining
.
toInt
()
):
T
{
return
ProtoBufWithNullableSupport
.
load
(
serializer
,
this
.
readBytes
(
length
))
return
ProtoBufWithNullableSupport
.
load
(
serializer
,
this
.
readBytes
(
length
))
}
}
...
@@ -98,11 +101,20 @@ fun <T : ProtoBuf> ByteReadPacket.readProtoBuf(serializer: DeserializationStrate
...
@@ -98,11 +101,20 @@ fun <T : ProtoBuf> ByteReadPacket.readProtoBuf(serializer: DeserializationStrate
* 构造 [RequestPacket] 的 [RequestPacket.sBuffer]
* 构造 [RequestPacket] 的 [RequestPacket.sBuffer]
*/
*/
fun
<
T
:
JceStruct
>
jceRequestSBuffer
(
name
:
String
,
serializer
:
SerializationStrategy
<
T
>,
jceStruct
:
T
):
ByteArray
{
fun
<
T
:
JceStruct
>
jceRequestSBuffer
(
name
:
String
,
serializer
:
SerializationStrategy
<
T
>,
jceStruct
:
T
):
ByteArray
{
return
jceRequestSBuffer
(
name
,
serializer
,
jceStruct
,
JceCharset
.
GBK
)
}
fun
<
T
:
JceStruct
>
jceRequestSBuffer
(
name
:
String
,
serializer
:
SerializationStrategy
<
T
>,
jceStruct
:
T
,
charset
:
JceCharset
):
ByteArray
{
return
RequestDataVersion3
(
return
RequestDataVersion3
(
mapOf
(
mapOf
(
name
to
JCE_STRUCT_HEAD_OF_TAG_0
+
jceStruct
.
toByteArray
(
serializer
)
+
JCE_STRUCT_TAIL_OF_TAG_0
name
to
JCE_STRUCT_HEAD_OF_TAG_0
+
jceStruct
.
toByteArray
(
serializer
)
+
JCE_STRUCT_TAIL_OF_TAG_0
)
)
).
toByteArray
(
RequestDataVersion3
.
serializer
())
).
toByteArray
(
RequestDataVersion3
.
serializer
()
,
charset
)
}
}
private
val
JCE_STRUCT_HEAD_OF_TAG_0
=
byteArrayOf
(
0
x0A
)
private
val
JCE_STRUCT_HEAD_OF_TAG_0
=
byteArrayOf
(
0
x0A
)
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
View file @
e43a5176
...
@@ -4,6 +4,25 @@ import kotlinx.serialization.SerialId
...
@@ -4,6 +4,25 @@ import kotlinx.serialization.SerialId
import
kotlinx.serialization.Serializable
import
kotlinx.serialization.Serializable
import
net.mamoe.mirai.qqandroid.io.JceStruct
import
net.mamoe.mirai.qqandroid.io.JceStruct
@Serializable
internal
class
ModifyGroupCardReq
(
@SerialId
(
0
)
val
dwZero
:
Long
,
@SerialId
(
1
)
val
dwGroupCode
:
Long
,
@SerialId
(
2
)
val
dwNewSeq
:
Long
,
@SerialId
(
3
)
val
vecUinInfo
:
List
<
st
UinInfo
>
)
:
JceStruct
@Serializable
internal
class
st
UinInfo
(
@SerialId
(
0
)
val
dwuin
:
Long
,
@SerialId
(
1
)
val
dwFlag
:
Long
,
@SerialId
(
2
)
val
sName
:
String
=
""
,
@SerialId
(
3
)
val
gender
:
Byte
,
@SerialId
(
4
)
val
sPhone
:
String
=
""
,
@SerialId
(
5
)
val
sEmail
:
String
=
""
,
@SerialId
(
6
)
val
sRemark
:
String
=
""
)
:
JceStruct
@Serializable
@Serializable
internal
class
GetFriendListReq
(
internal
class
GetFriendListReq
(
@SerialId
(
0
)
val
reqtype
:
Int
?
=
null
,
@SerialId
(
0
)
val
reqtype
:
Int
?
=
null
,
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
View file @
e43a5176
...
@@ -128,7 +128,8 @@ internal object KnownPacketFactories {
...
@@ -128,7 +128,8 @@ internal object KnownPacketFactories {
TroopManagement
.
EditSpecialTitle
,
TroopManagement
.
EditSpecialTitle
,
TroopManagement
.
Mute
,
TroopManagement
.
Mute
,
TroopManagement
.
GroupOperation
,
TroopManagement
.
GroupOperation
,
TroopManagement
.
GetGroupOperationInfo
TroopManagement
.
GetGroupOperationInfo
,
TroopManagement
.
EditGroupNametag
)
)
object
IncomingFactories
:
List
<
IncomingPacketFactory
<
*
>>
by
mutableListOf
(
object
IncomingFactories
:
List
<
IncomingPacketFactory
<
*
>>
by
mutableListOf
(
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/TroopManagement.kt
View file @
e43a5176
package
net.mamoe.mirai.qqandroid.network.protocol.packet.chat
package
net.mamoe.mirai.qqandroid.network.protocol.packet.chat
import
kotlinx.io.c
ore.ByteReadPack
et
import
kotlinx.io.c
harsets.Chars
et
import
kotlinx.io.c
ore.buildPacket
import
kotlinx.io.c
harsets.encode
import
kotlinx.io.core.
readBytes
import
kotlinx.io.core.
*
import
kotlinx.
io.core.toByteArray
import
kotlinx.
serialization.toUtf8Bytes
import
net.mamoe.mirai.contact.Member
import
net.mamoe.mirai.contact.Member
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.data.Packet
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.QQAndroidBot
import
net.mamoe.mirai.qqandroid.io.serialization.loadAs
import
net.mamoe.mirai.qqandroid.io.serialization.*
import
net.mamoe.mirai.qqandroid.io.serialization.toByteArray
import
net.mamoe.mirai.qqandroid.io.serialization.writeProtoBuf
import
net.mamoe.mirai.qqandroid.network.QQAndroidClient
import
net.mamoe.mirai.qqandroid.network.QQAndroidClient
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.GetTroopListReqV2Simplify
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.ModifyGroupCardReq
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket
import
net.mamoe.mirai.qqandroid.network.protocol.data.jce.stUinInfo
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x88d
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x88d
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x89a
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x89a
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x8fc
import
net.mamoe.mirai.qqandroid.network.protocol.data.proto.Oidb0x8fc
...
@@ -20,6 +22,8 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
...
@@ -20,6 +22,8 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import
net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacketFactory
import
net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
import
net.mamoe.mirai.qqandroid.network.protocol.packet.buildOutgoingUniPacket
import
net.mamoe.mirai.utils.daysToSeconds
import
net.mamoe.mirai.utils.daysToSeconds
import
net.mamoe.mirai.utils.io.encodeToGBKString
import
net.mamoe.mirai.utils.io.encodeToString
internal
object
TroopManagement
{
internal
object
TroopManagement
{
...
@@ -316,6 +320,57 @@ internal object TroopManagement {
...
@@ -316,6 +320,57 @@ internal object TroopManagement {
}
}
}
}
internal
object
EditGroupNametag
:
OutgoingPacketFactory
<
EditGroupNametag
.
Response
>(
"friendlist.ModifyGroupCardReq"
)
{
object
Response
:
Packet
override
suspend
fun
ByteReadPacket
.
decode
(
bot
:
QQAndroidBot
):
EditGroupNametag
.
Response
{
return
Response
}
operator
fun
invoke
(
client
:
QQAndroidClient
,
member
:
Member
,
newName
:
String
):
OutgoingPacket
{
return
buildOutgoingUniPacket
(
client
)
{
writeJceStruct
(
RequestPacket
.
serializer
(),
RequestPacket
(
sFuncName
=
"ModifyGroupCardReq"
,
sServantName
=
"mqq.IMService.FriendListServiceServantObj"
,
iVersion
=
3
,
cPacketType
=
0
x00
,
iMessageType
=
0
x00000
,
iRequestId
=
client
.
nextRequestPacketRequestId
(),
sBuffer
=
jceRequestSBuffer
(
"MGCREQ"
,
ModifyGroupCardReq
.
serializer
(),
ModifyGroupCardReq
(
dwZero
=
0L
,
dwGroupCode
=
member
.
group
.
id
,
dwNewSeq
=
0L
,
vecUinInfo
=
listOf
(
stUinInfo
(
gender
=
0
,
dwuin
=
member
.
id
,
dwFlag
=
31
,
sName
=
newName
.
toUtf8Bytes
().
encodeToGBKString
(),
sPhone
=
""
,
sEmail
=
""
,
sRemark
=
""
)
)
),
JceCharset
.
GBK
)
)
)
}
}
}
/*
/*
internal object Recall: OutgoingPacketFactory<LoginPacket.LoginPacketResponse>("wtlogin.login"){
internal object Recall: OutgoingPacketFactory<LoginPacket.LoginPacketResponse>("wtlogin.login"){
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacket.LoginPacketResponse {
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacket.LoginPacketResponse {
...
...
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/ByteArrayUtil.kt
View file @
e43a5176
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
package
net.mamoe.mirai.utils.io
package
net.mamoe.mirai.utils.io
import
kotlinx.io.charsets.Charset
import
kotlinx.io.core.ByteReadPacket
import
kotlinx.io.core.ByteReadPacket
import
kotlinx.io.core.String
import
kotlinx.io.core.String
import
kotlinx.io.core.use
import
kotlinx.io.core.use
...
@@ -81,7 +82,11 @@ fun UByteArray.toUHexString(separator: String = " ", offset: Int = 0, length: In
...
@@ -81,7 +82,11 @@ fun UByteArray.toUHexString(separator: String = " ", offset: Int = 0, length: In
@Suppress
(
"NOTHING_TO_INLINE"
)
@Suppress
(
"NOTHING_TO_INLINE"
)
inline
fun
ByteArray
.
encodeToString
():
String
=
String
(
this
)
inline
fun
ByteArray
.
encodeToString
():
String
=
String
(
this
)
fun
ByteArray
.
toReadPacket
(
offset
:
Int
=
0
,
length
:
Int
=
this
.
size
-
offset
)
=
ByteReadPacket
(
this
,
offset
=
offset
,
length
=
length
)
fun
ByteArray
.
encodeToGBKString
():
String
=
String
(
this
,
0
,
this
.
size
,
Charset
.
forName
(
"GBK"
))
fun
ByteArray
.
toReadPacket
(
offset
:
Int
=
0
,
length
:
Int
=
this
.
size
-
offset
)
=
ByteReadPacket
(
this
,
offset
=
offset
,
length
=
length
)
@UseExperimental
(
ExperimentalContracts
::
class
)
@UseExperimental
(
ExperimentalContracts
::
class
)
inline
fun
<
R
>
ByteArray
.
read
(
t
:
ByteReadPacket
.()
->
R
):
R
{
inline
fun
<
R
>
ByteArray
.
read
(
t
:
ByteReadPacket
.()
->
R
):
R
{
...
...
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