GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: group member role not sync

Browse Source
This commit is contained in:
linyuchen 2024-03-24 20:21:18 +08:00
parent 626d445dc3
commit 468f1710b9
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest.json
View File

@ -3,7 +3,7 @@
"type": "extension", "type": "extension",
"name": "LLOneBot v3.19.2", "name": "LLOneBot v3.19.2",
"slug": "LLOneBot", "slug": "LLOneBot",
"description": "LiteLoaderQQNT的OneBotApi,不支持商店在线更新", "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
"version": "3.19.2", "version": "3.19.2",
"icon": "./icon.jpg", "icon": "./icon.jpg",
"authors": [ "authors": [

19
src/main/main.ts
View File

@ -4,28 +4,36 @@ import {BrowserWindow, dialog, ipcMain} from 'electron';
import * as fs from 'node:fs'; import * as fs from 'node:fs';
import {Config} from "../common/types"; import {Config} from "../common/types";
import { import {
CHANNEL_CHECK_VERSION,
CHANNEL_ERROR, CHANNEL_ERROR,
CHANNEL_GET_CONFIG, CHANNEL_GET_CONFIG,
CHANNEL_LOG, CHANNEL_LOG,
CHANNEL_CHECK_VERSION,
CHANNEL_SELECT_FILE, CHANNEL_SELECT_FILE,
CHANNEL_SET_CONFIG, CHANNEL_SET_CONFIG,
CHANNEL_UPDATE, CHANNEL_UPDATE,
} from "../common/channels"; } from "../common/channels";
import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer"; import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
import {DATA_DIR, wrapText} from "../common/utils"; import {DATA_DIR} from "../common/utils";
import { import {
friendRequests, friendRequests,
getFriend, getFriend,
getGroup, getGroup,
getGroupMember, groups, getGroupMember,
llonebotError, llonebotError,
refreshGroupMembers, refreshGroupMembers,
selfInfo, uidMaps selfInfo,
uidMaps
} from "../common/data"; } from "../common/data";
import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook"; import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
import {OB11Constructor} from "../onebot11/constructor"; import {OB11Constructor} from "../onebot11/constructor";
import {ChatType, FriendRequestNotify, GroupNotifies, GroupNotifyTypes, RawMessage} from "../ntqqapi/types"; import {
ChatType,
FriendRequestNotify,
GroupMemberRole,
GroupNotifies,
GroupNotifyTypes,
RawMessage
} from "../ntqqapi/types";
import {ob11HTTPServer} from "../onebot11/server/http"; import {ob11HTTPServer} from "../onebot11/server/http";
import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent"; import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent"; import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
@ -285,6 +293,7 @@ function onLoad() {
log("变动管理员获取成功") log("变动管理员获取成功")
groupAdminNoticeEvent.user_id = parseInt(member1.uin); groupAdminNoticeEvent.user_id = parseInt(member1.uin);
groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set"; groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
// member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
postOB11Event(groupAdminNoticeEvent, true); postOB11Event(groupAdminNoticeEvent, true);
} else { } else {
log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode)); log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));

12
src/ntqqapi/hook.ts
View File

@ -2,7 +2,7 @@ import {BrowserWindow} from 'electron';
import {NTQQApiClass} from "./ntcall"; import {NTQQApiClass} from "./ntcall";
import {NTQQMsgApi, sendMessagePool} from "./api/msg" import {NTQQMsgApi, sendMessagePool} from "./api/msg"
import {ChatType, Group, GroupMember, RawMessage, User} from "./types"; import {ChatType, Group, GroupMember, RawMessage, User} from "./types";
import {friends, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data"; import {friends, getGroupMember, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent"; import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
import {v4 as uuidv4} from "uuid" import {v4 as uuidv4} from "uuid"
import {postOB11Event} from "../onebot11/server/postOB11Event"; import {postOB11Event} from "../onebot11/server/postOB11Event";
@ -281,10 +281,16 @@ registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROU
} }
}) })
registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMember>}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, (payload) => { registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMember>}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
const groupCode = payload.groupCode; const groupCode = payload.groupCode;
const members = Array.from(payload.members.values()); const members = Array.from(payload.members.values());
// log("群成员变动", groupCode, payload.members.keys(), payload.members.values()) log("群成员信息变动", groupCode, members)
for(const member of members) {
const existMember = await getGroupMember(groupCode, member.uin);
if (existMember){
Object.assign(existMember, member);
}
}
// const existGroup = groups.find(g => g.groupCode == groupCode); // const existGroup = groups.find(g => g.groupCode == groupCode);
// if (existGroup) { // if (existGroup) {
// log("对比群成员", existGroup.members, members) // log("对比群成员", existGroup.members, members)

2
src/version.ts
View File

@ -1 +1 @@
export const version = "3.19.2" export const version = "3.19.3"