QQ/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-09-28 12:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 1.4.0-beta8

Browse Source
This commit is contained in:
手瓜一十雪 2024-05-24 11:18:32 +08:00
parent 5f03496046
commit a8800e3899
5 changed files with 23 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core

@ -1 +1 @@
Subproject commit 48c585b7e0d05f591b9ae45b84e805ca611fe313
Subproject commit 7e16402b8dcffe497c44e65e398e49ca3e7622ff

40
src/onebot11/main.ts
View File

@ -98,8 +98,8 @@ export class NapCatOnebot11 {
// }
// };
try {
const sysMsg = SysData.fromBinary(Buffer.from(protobufData));
//console.log(buf2hex(Buffer.from(protobufData)));
const sysMsg = SysData.fromBinary(Buffer.from(protobufData));
const peeruin = sysMsg.header[0].peerNumber;
const peeruid = sysMsg.header[0].peerString;
const MsgType = sysMsg.body[0].msgType;
@ -129,16 +129,17 @@ export class NapCatOnebot11 {
postOB11Event(pokeEvent);
}
}
if (MsgType == 34 && subType0 == 0) {
const role = (await getGroupMember(peeruin, selfInfo.uin))?.role;
const isPrivilege = role === 3 || role === 4;
if (!isPrivilege) {
const leaveUin = uid2UinMap[sysMsg.other[0].event[0].peerString];
log('[群聊] 群组 ', peeruin, ' 成员' + leaveUin + '退出');
const groupDecreaseEvent = new OB11GroupDecreaseEvent(peeruin, parseInt(leaveUin), 0, 'leave');// 不知道怎么出去的
postOB11Event(groupDecreaseEvent, true);
}
}
// 未区分增加与减少
// if (MsgType == 34 && subType0 == 0) {
// const role = (await getGroupMember(peeruin, selfInfo.uin))?.role;
// const isPrivilege = role === 3 || role === 4;
// if (!isPrivilege) {
// const leaveUin = uid2UinMap[sysMsg.other[0].event[0].peerString];
// log('[群聊] 群组 ', peeruin, ' 成员' + leaveUin + '退出');
// const groupDecreaseEvent = new OB11GroupDecreaseEvent(peeruin, parseInt(leaveUin), 0, 'leave');// 不知道怎么出去的
// postOB11Event(groupDecreaseEvent, true);
// }
// }
} catch (e) {
log('解析SysMsg异常', e);
// console.log(e);
@ -200,14 +201,15 @@ export class NapCatOnebot11 {
};
groupListener.onMemberInfoChange = async (groupCode: string, changeType: number, members: Map<string, GroupMember>) => {
// 如果自身是非管理员也许要从这里获取Delete 成员变动 待测试与验证
// const role = (await getGroupMember(groupCode, selfInfo.uin))?.role;
// const isPrivilege = role === 3 || role === 4;
// for (const member of members.values()) {
// if (member?.isDelete && !isPrivilege) {
// const groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(groupCode), parseInt(member.uin), 0, 'leave');// 不知道怎么出去的
// postOB11Event(groupDecreaseEvent, true);
// }
// }
const role = (await getGroupMember(groupCode, selfInfo.uin))?.role;
const isPrivilege = role === 3 || role === 4;
for (const member of members.values()) {
if (member?.isDelete && !isPrivilege) {
console.log('[群聊] 群组 ', groupCode, ' 成员' + member.uin + '退出');
const groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(groupCode), parseInt(member.uin), 0, 'leave');// 不知道怎么出去的
postOB11Event(groupDecreaseEvent, true);
}
}
};
groupListener.onJoinGroupNotify = (...notify) => {
// console.log('ob11 onJoinGroupNotify', notify);

0
src/proto/SysMessage.MsgType.34.proto Normal file
View File

8
src/proto/SysMessage.proto
View File

@ -3,7 +3,6 @@ package SysMessage;
message Data {
repeated Header header = 1;
repeated Body body = 2;
repeated Other other = 3;
}
message Header {
uint32 PeerNumber = 1;
@ -19,11 +18,4 @@ message Body {
uint32 Time = 6;
uint64 MsgID = 12;
uint32 Other = 13;
}
message Event {
uint32 PeerNumber = 1;
string PeerString = 3;
}
message Other{
repeated Event event = 2;
}

138
src/proto/SysMessage.ts
View File

@ -22,10 +22,6 @@ export interface Data {
* @generated from protobuf field: repeated SysMessage.Body body = 2;
*/
body: Body[];
/**
* @generated from protobuf field: repeated SysMessage.Other other = 3;
*/
other: Other[];
}
/**
* @generated from protobuf message SysMessage.Header
@ -81,42 +77,18 @@ export interface Body {
*/
other: number;
}
/**
* @generated from protobuf message SysMessage.Event
*/
export interface Event {
/**
* @generated from protobuf field: uint32 PeerNumber = 1 [json_name = "PeerNumber"];
*/
peerNumber: number;
/**
* @generated from protobuf field: string PeerString = 3 [json_name = "PeerString"];
*/
peerString: string;
}
/**
* @generated from protobuf message SysMessage.Other
*/
export interface Other {
/**
* @generated from protobuf field: repeated SysMessage.Event event = 2;
*/
event: Event[];
}
// @generated message type with reflection information, may provide speed optimized methods
class Data$Type extends MessageType<Data> {
constructor() {
super("SysMessage.Data", [
{ no: 1, name: "header", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Header },
{ no: 2, name: "body", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Body },
{ no: 3, name: "other", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Other }
{ no: 2, name: "body", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Body }
]);
}
create(value?: PartialMessage<Data>): Data {
const message = globalThis.Object.create((this.messagePrototype!));
message.header = [];
message.body = [];
message.other = [];
if (value !== undefined)
reflectionMergePartial<Data>(this, message, value);
return message;
@ -132,9 +104,6 @@ class Data$Type extends MessageType<Data> {
case /* repeated SysMessage.Body body */ 2:
message.body.push(Body.internalBinaryRead(reader, reader.uint32(), options));
break;
case /* repeated SysMessage.Other other */ 3:
message.other.push(Other.internalBinaryRead(reader, reader.uint32(), options));
break;
default:
let u = options.readUnknownField;
if (u === "throw")
@ -153,9 +122,6 @@ class Data$Type extends MessageType<Data> {
/* repeated SysMessage.Body body = 2; */
for (let i = 0; i < message.body.length; i++)
Body.internalBinaryWrite(message.body[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
/* repeated SysMessage.Other other = 3; */
for (let i = 0; i < message.other.length; i++)
Other.internalBinaryWrite(message.other[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@ -331,105 +297,3 @@ class Body$Type extends MessageType<Body> {
* @generated MessageType for protobuf message SysMessage.Body
*/
export const Body = new Body$Type();
// @generated message type with reflection information, may provide speed optimized methods
class Event$Type extends MessageType<Event> {
constructor() {
super("SysMessage.Event", [
{ no: 1, name: "PeerNumber", kind: "scalar", jsonName: "PeerNumber", T: 13 /*ScalarType.UINT32*/ },
{ no: 3, name: "PeerString", kind: "scalar", jsonName: "PeerString", T: 9 /*ScalarType.STRING*/ }
]);
}
create(value?: PartialMessage<Event>): Event {
const message = globalThis.Object.create((this.messagePrototype!));
message.peerNumber = 0;
message.peerString = "";
if (value !== undefined)
reflectionMergePartial<Event>(this, message, value);
return message;
}
internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Event): Event {
let message = target ?? this.create(), end = reader.pos + length;
while (reader.pos < end) {
let [fieldNo, wireType] = reader.tag();
switch (fieldNo) {
case /* uint32 PeerNumber = 1 [json_name = "PeerNumber"];*/ 1:
message.peerNumber = reader.uint32();
break;
case /* string PeerString = 3 [json_name = "PeerString"];*/ 3:
message.peerString = reader.string();
break;
default:
let u = options.readUnknownField;
if (u === "throw")
throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
let d = reader.skip(wireType);
if (u !== false)
(u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
}
}
return message;
}
internalBinaryWrite(message: Event, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
/* uint32 PeerNumber = 1 [json_name = "PeerNumber"]; */
if (message.peerNumber !== 0)
writer.tag(1, WireType.Varint).uint32(message.peerNumber);
/* string PeerString = 3 [json_name = "PeerString"]; */
if (message.peerString !== "")
writer.tag(3, WireType.LengthDelimited).string(message.peerString);
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
return writer;
}
}
/**
* @generated MessageType for protobuf message SysMessage.Event
*/
export const Event = new Event$Type();
// @generated message type with reflection information, may provide speed optimized methods
class Other$Type extends MessageType<Other> {
constructor() {
super("SysMessage.Other", [
{ no: 2, name: "event", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => Event }
]);
}
create(value?: PartialMessage<Other>): Other {
const message = globalThis.Object.create((this.messagePrototype!));
message.event = [];
if (value !== undefined)
reflectionMergePartial<Other>(this, message, value);
return message;
}
internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: Other): Other {
let message = target ?? this.create(), end = reader.pos + length;
while (reader.pos < end) {
let [fieldNo, wireType] = reader.tag();
switch (fieldNo) {
case /* repeated SysMessage.Event event */ 2:
message.event.push(Event.internalBinaryRead(reader, reader.uint32(), options));
break;
default:
let u = options.readUnknownField;
if (u === "throw")
throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
let d = reader.skip(wireType);
if (u !== false)
(u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
}
}
return message;
}
internalBinaryWrite(message: Other, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
/* repeated SysMessage.Event event = 2; */
for (let i = 0; i < message.event.length; i++)
Event.internalBinaryWrite(message.event[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
let u = options.writeUnknownFields;
if (u !== false)
(u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
return writer;
}
}
/**
* @generated MessageType for protobuf message SysMessage.Other
*/
export const Other = new Other$Type();