shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00
Code Issues Projects Releases Wiki Activity

kick supported.

Browse Source
This commit is contained in:
Mrs4s 2020-07-22 03:34:57 +08:00
parent 569bcdc7b1
commit 39aac304f5
6 changed files with 767 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/builders.go
View File

@ -771,27 +771,26 @@ func (c *QQClient) buildGroupMuteAllPacket(groupCode int64, mute bool) (uint16,
return c.buildGroupOperationPacket(body)
}
/*
func (c *QQClient) buildMultiMsgDownRequestPacket() (uint16, []byte){
// OidbSvc.0x8a0_0
func (c *QQClient) buildGroupKickPacket(groupCode, memberUin int64, kickMsg string) (uint16, []byte) {
seq := c.nextSeq()
req := &multimsg.ReqBody{
Subcmd: 2,
TermType: 5,
PlatformType: 9,
NetType: 3,
BuildVer: "8.2.0.1296",
MultimsgApplydownReq: []*multimsg.MultiMsgApplyDownReq{
body := &oidb.D8A0ReqBody{
OptUint64GroupCode: groupCode,
MsgKickList: []*oidb.D8A0KickMemberInfo{
{
MsgResid: []byte("xxx"),
MsgType: 3,
SrcUin: 000,
OptUint32Operate: 5,
OptUint64MemberUin: memberUin,
OptUint32Flag: 1,
},
},
BuType: 2,
ReqChannelType: 2,
KickMsg: []byte(kickMsg),
}
b, _ := proto.Marshal(body)
req := &oidb.OIDBSSOPkg{
Command: 2208,
Bodybuffer: b,
}
payload, _ := proto.Marshal(req)
packet := packets.BuildUniPacket(c.Uin, seq, "MultiMsg.ApplyDown", 1, c.OutGoingPacketSessionId, EmptyBytes, c.sigInfo.d2Key, payload)
packet := packets.BuildUniPacket(c.Uin, seq, "OidbSvc.0x8a0_0", 1, c.OutGoingPacketSessionId, EmptyBytes, c.sigInfo.d2Key, payload)
return seq, packet
}
*/

6
client/client.go
View File

@ -432,7 +432,7 @@ func (c *QQClient) SolveFriendRequest(req *NewFriendRequest, accept bool) {
}
func (g *GroupInfo) SelfPermission() MemberPermission {
return g.FindMember(g.bot.Uin).Permission
return g.FindMember(g.client.Uin).Permission
}
func (g *GroupInfo) AdministratorOrOwner() bool {
@ -465,6 +465,10 @@ func (c *QQClient) groupMuteAll(groupCode int64, mute bool) {
_, _ = c.sendAndWait(c.buildGroupMuteAllPacket(groupCode, mute))
}
func (c *QQClient) kickGroupMember(groupCode, memberUin int64, msg string) {
_, _ = c.sendAndWait(c.buildGroupKickPacket(groupCode, memberUin, msg))
}
func (g *GroupInfo) removeMember(uin int64) {
if g.memLock == nil {
g.memLock = new(sync.Mutex)

2
client/decoders.go
View File

@ -329,7 +329,7 @@ func decodeGroupListResponse(c *QQClient, _ uint16, payload []byte) (interface{}
OwnerUin: g.GroupOwnerUin,
MemberCount: uint16(g.MemberNum),
MaxMemberCount: uint16(g.MaxGroupMemberNum),
bot: c,
client: c,
})
}
return l, nil

18
client/entities.go
View File

@ -52,7 +52,7 @@ type (
MaxMemberCount uint16
Members []*GroupMemberInfo
bot *QQClient
client *QQClient
memLock *sync.Mutex
}
@ -177,14 +177,14 @@ const (
func (g *GroupInfo) UpdateName(newName string) {
if g.AdministratorOrOwner() && newName != "" && strings.Count(newName, "") <= 20 {
g.bot.updateGroupName(g.Code, newName)
g.client.updateGroupName(g.Code, newName)
g.Name = newName
}
}
func (g *GroupInfo) MuteAll(mute bool) {
if g.AdministratorOrOwner() {
g.bot.groupMuteAll(g.Code, mute)
g.client.groupMuteAll(g.Code, mute)
}
}
@ -197,20 +197,26 @@ func (m *GroupMemberInfo) DisplayName() string {
func (m *GroupMemberInfo) EditCard(card string) {
if m.Manageable() && strings.Count(card, "") <= 20 {
m.Group.bot.editMemberCard(m.Group.Code, m.Uin, card)
m.Group.client.editMemberCard(m.Group.Code, m.Uin, card)
m.CardName = card
}
}
func (m *GroupMemberInfo) EditSpecialTitle(title string) {
if m.Group.SelfPermission() == Owner && strings.Count(title, "") <= 6 {
m.Group.bot.editMemberSpecialTitle(m.Group.Code, m.Uin, title)
m.Group.client.editMemberSpecialTitle(m.Group.Code, m.Uin, title)
m.SpecialTitle = title
}
}
func (m *GroupMemberInfo) Kick(msg string) {
if m.Uin != m.Group.client.Uin && m.Manageable() {
m.Group.client.kickGroupMember(m.Group.Code, m.Uin, msg)
}
}
func (m *GroupMemberInfo) Manageable() bool {
if m.Uin == m.Group.bot.Uin {
if m.Uin == m.Group.client.Uin {
return true
}
self := m.Group.SelfPermission()

892
client/pb/oidb/oidb.pb.go
View File

File diff suppressed because it is too large Load Diff

201
client/pb/oidb/oidb.proto
View File

@ -3,121 +3,144 @@ syntax = "proto3";
option go_package = ".;oidb";
message OIDBSSOPkg {
int32 command = 1;
int32 serviceType = 2;
int32 result = 3;
bytes bodybuffer = 4;
string errorMsg = 5;
string clientVersion = 6;
int32 command = 1;
int32 serviceType = 2;
int32 result = 3;
bytes bodybuffer = 4;
string errorMsg = 5;
string clientVersion = 6;
}
message D8A0RspBody {
int64 optUint64GroupCode = 1;
repeated D8A0KickResult msgKickResult = 2;
}
message D8A0KickResult {
int32 optUint32Result = 1;
int64 optUint64MemberUin = 2;
}
message D8A0KickMemberInfo {
int32 optUint32Operate = 1;
int64 optUint64MemberUin = 2;
int32 optUint32Flag = 3;
bytes optBytesMsg = 4;
}
message D8A0ReqBody {
int64 optUint64GroupCode = 1;
repeated D8A0KickMemberInfo msgKickList = 2;
repeated int64 kickList = 3;
int32 kickFlag = 4;
bytes kickMsg = 5;
}
message D8FCReqBody {
int64 groupCode = 1;
int32 showFlag = 2;
repeated D8FCMemberInfo memLevelInfo = 3;
repeated D8FCLevelName levelName = 4;
int32 updateTime = 5;
int32 officeMode = 6;
int32 groupOpenAppid = 7;
D8FCClientInfo msgClientInfo = 8;
bytes authKey = 9;
int64 groupCode = 1;
int32 showFlag = 2;
repeated D8FCMemberInfo memLevelInfo = 3;
repeated D8FCLevelName levelName = 4;
int32 updateTime = 5;
int32 officeMode = 6;
int32 groupOpenAppid = 7;
D8FCClientInfo msgClientInfo = 8;
bytes authKey = 9;
}
message D89AReqBody {
int64 groupCode = 1;
D89AGroupinfo stGroupInfo = 2;
int64 originalOperatorUin = 3;
int32 reqGroupOpenAppid = 4;
int64 groupCode = 1;
D89AGroupinfo stGroupInfo = 2;
int64 originalOperatorUin = 3;
int32 reqGroupOpenAppid = 4;
}
message D89AGroupinfo {
int32 groupExtAdmNum = 1;
int32 flag = 2;
bytes ingGroupName = 3;
bytes ingGroupMemo = 4;
bytes ingGroupFingerMemo = 5;
bytes ingGroupAioSkinUrl = 6;
bytes ingGroupBoardSkinUrl = 7;
bytes ingGroupCoverSkinUrl = 8;
int32 groupGrade = 9;
int32 activeMemberNum = 10;
int32 certificationType = 11;
bytes ingCertificationText = 12;
bytes ingGroupRichFingerMemo = 13;
D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14;
int32 groupFace = 15;
int32 addOption = 16;
int32 shutupTime = 17;
int32 groupTypeFlag = 18;
bytes stringGroupTag = 19;
D89AGroupGeoInfo msgGroupGeoInfo = 20;
int32 groupClassExt = 21;
bytes ingGroupClassText = 22;
int32 appPrivilegeFlag = 23;
int32 appPrivilegeMask = 24;
D89AGroupExInfoOnly stGroupExInfo = 25;
int32 groupSecLevel = 26;
int32 groupSecLevelInfo = 27;
int64 subscriptionUin = 28;
int32 allowMemberInvite = 29;
bytes ingGroupQuestion = 30;
bytes ingGroupAnswer = 31;
int32 groupFlagext3 = 32;
int32 groupFlagext3Mask = 33;
int32 groupOpenAppid = 34;
int32 noFingerOpenFlag = 35;
int32 noCodeFingerOpenFlag = 36;
int64 rootId = 37;
int32 msgLimitFrequency = 38;
int32 groupExtAdmNum = 1;
int32 flag = 2;
bytes ingGroupName = 3;
bytes ingGroupMemo = 4;
bytes ingGroupFingerMemo = 5;
bytes ingGroupAioSkinUrl = 6;
bytes ingGroupBoardSkinUrl = 7;
bytes ingGroupCoverSkinUrl = 8;
int32 groupGrade = 9;
int32 activeMemberNum = 10;
int32 certificationType = 11;
bytes ingCertificationText = 12;
bytes ingGroupRichFingerMemo = 13;
D89AGroupNewGuidelinesInfo stGroupNewguidelines = 14;
int32 groupFace = 15;
int32 addOption = 16;
int32 shutupTime = 17;
int32 groupTypeFlag = 18;
bytes stringGroupTag = 19;
D89AGroupGeoInfo msgGroupGeoInfo = 20;
int32 groupClassExt = 21;
bytes ingGroupClassText = 22;
int32 appPrivilegeFlag = 23;
int32 appPrivilegeMask = 24;
D89AGroupExInfoOnly stGroupExInfo = 25;
int32 groupSecLevel = 26;
int32 groupSecLevelInfo = 27;
int64 subscriptionUin = 28;
int32 allowMemberInvite = 29;
bytes ingGroupQuestion = 30;
bytes ingGroupAnswer = 31;
int32 groupFlagext3 = 32;
int32 groupFlagext3Mask = 33;
int32 groupOpenAppid = 34;
int32 noFingerOpenFlag = 35;
int32 noCodeFingerOpenFlag = 36;
int64 rootId = 37;
int32 msgLimitFrequency = 38;
}
message D89AGroupNewGuidelinesInfo {
bool boolEnabled = 1;
bytes ingContent = 2;
bool boolEnabled = 1;
bytes ingContent = 2;
}
message D89AGroupExInfoOnly {
int32 tribeId = 1;
int32 moneyForAddGroup = 2;
int32 tribeId = 1;
int32 moneyForAddGroup = 2;
}
message D89AGroupGeoInfo {
int32 cityId = 1;
int64 longtitude = 2;
int64 latitude = 3;
bytes ingGeoContent = 4;
int64 poiId = 5;
int32 cityId = 1;
int64 longtitude = 2;
int64 latitude = 3;
bytes ingGeoContent = 4;
int64 poiId = 5;
}
message D8FCMemberInfo {
int64 uin = 1;
int32 point = 2;
int32 activeDay = 3;
int32 level = 4;
bytes specialTitle = 5;
int32 specialTitleExpireTime = 6;
bytes uinName = 7;
bytes memberCardName = 8;
bytes phone = 9;
bytes email = 10;
bytes remark = 11;
int32 gender = 12;
bytes job = 13;
int32 tribeLevel = 14;
int32 tribePoint = 15;
repeated D8FCCardNameElem richCardName = 16;
bytes commRichCardName = 17;
int64 uin = 1;
int32 point = 2;
int32 activeDay = 3;
int32 level = 4;
bytes specialTitle = 5;
int32 specialTitleExpireTime = 6;
bytes uinName = 7;
bytes memberCardName = 8;
bytes phone = 9;
bytes email = 10;
bytes remark = 11;
int32 gender = 12;
bytes job = 13;
int32 tribeLevel = 14;
int32 tribePoint = 15;
repeated D8FCCardNameElem richCardName = 16;
bytes commRichCardName = 17;
}
message D8FCCardNameElem {
int32 enumCardType = 1;
bytes value = 2;
int32 enumCardType = 1;
bytes value = 2;
}
message D8FCLevelName {
int32 level = 1;
string name = 2;
int32 level = 1;
string name = 2;
}
message D8FCClientInfo {
int32 implat = 1;
string ingClientver = 2;
int32 implat = 1;
string ingClientver = 2;
}