GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修正正确类型

Browse Source
This commit is contained in:
手瓜一十雪 2024-08-25 23:04:34 +08:00
parent 6024cabb69
commit 18590be1e7
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/core.ts
View File

@ -4,7 +4,7 @@ import fs from 'node:fs';
import { InstanceContext } from './wrapper'; import { InstanceContext } from './wrapper';
import { proxiedListenerOf } from '@/common/utils/proxy-handler'; import { proxiedListenerOf } from '@/common/utils/proxy-handler';
import { GroupListener, MsgListener, ProfileListener } from './listeners'; import { GroupListener, MsgListener, ProfileListener } from './listeners';
import { GroupMember, SelfInfo } from './entities'; import { DataSource, GroupMember, SelfInfo } from './entities';
import { LegacyNTEventWrapper } from '@/common/framework/event-legacy'; import { LegacyNTEventWrapper } from '@/common/framework/event-legacy';
import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from './apis'; import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from './apis';
import os from 'node:os'; import os from 'node:os';
@ -164,9 +164,9 @@ export class NapCatCore {
} }
// console.log('onMemberListChange', groupCode, arg); // console.log('onMemberListChange', groupCode, arg);
}; };
groupListener.onMemberInfoChange = (groupCode, changeType, members) => { groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
//console.log('onMemberInfoChange', groupCode, changeType, members); //console.log('onMemberInfoChange', groupCode, changeType, members);
if (changeType === 0 && members.get(this.selfInfo.uid)?.isDelete) { if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
// 自身退群或者被踢退群 5s用于Api操作 之后不再出现 // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
setTimeout(() => { setTimeout(() => {
this.apis.GroupApi.groupCache.delete(groupCode); this.apis.GroupApi.groupCache.delete(groupCode);

4
src/core/entities/group.ts
View File

@ -12,6 +12,10 @@ export interface kickMemberV2Req{
kickListUids: Array<string>, kickListUids: Array<string>,
kickMsg: string kickMsg: string
} }
export enum DataSource {
LOCAL,
REMOTE
}
export enum GroupListUpdateType { export enum GroupListUpdateType {
REFRESHALL, REFRESHALL,
GETALL, GETALL,

12
src/core/listeners/NodeIKernelGroupListener.ts
View File

@ -1,4 +1,4 @@
import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities'; import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
export interface IGroupListener { export interface IGroupListener {
onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void; onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void;
@ -31,7 +31,7 @@ export interface IGroupListener {
hasRobot: boolean hasRobot: boolean
}): void; }): void;
onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>): void; onMemberInfoChange(groupCode: string, dataSource: DataSource, members: Map<string, GroupMember>): void;
onSearchMemberChange(...args: unknown[]): void; onSearchMemberChange(...args: unknown[]): void;
@ -124,8 +124,8 @@ export class GroupListener implements IGroupListener {
onJoinGroupNoVerifyFlag(...args: unknown[]) { onJoinGroupNoVerifyFlag(...args: unknown[]) {
} }
onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) { onMemberInfoChange(groupCode: string, dateSource: DataSource, members: Map<string, GroupMember>) {
} }
onMemberListChange(arg: { onMemberListChange(arg: {
@ -225,8 +225,8 @@ export class DebugGroupListener implements IGroupListener {
console.log('onJoinGroupNoVerifyFlag:', ...args); console.log('onJoinGroupNoVerifyFlag:', ...args);
} }
onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>) { onMemberInfoChange(groupCode: string, dataSource: DataSource, members: Map<string, GroupMember>) {
console.log('onMemberInfoChange:', groupCode, changeType, members); console.log('onMemberInfoChange:', groupCode, dataSource, members);
} }
onMemberListChange(...args: unknown[]) { onMemberListChange(...args: unknown[]) {

5
src/onebot/index.ts
View File

@ -11,6 +11,7 @@ import {
GroupMemberRole, GroupMemberRole,
GroupNotifyMsgType, GroupNotifyMsgType,
GroupNotifyMsgStatus, GroupNotifyMsgStatus,
DataSource,
} from '@/core'; } from '@/core';
import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config'; import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config';
import { OneBotApiContextType } from '@/onebot/types'; import { OneBotApiContextType } from '@/onebot/types';
@ -425,9 +426,9 @@ export class NapCatOneBot11Adapter {
} }
}; };
groupListener.onMemberInfoChange = async (groupCode, changeType, members) => { groupListener.onMemberInfoChange = async (groupCode, dataSource, members) => {
//this.context.logger.logDebug('收到群成员信息变动通知', groupCode, changeType); //this.context.logger.logDebug('收到群成员信息变动通知', groupCode, changeType);
if (changeType === 0) { if (dataSource === DataSource.LOCAL) {
const existMembers = this.core.apis.GroupApi.groupMemberCache.get(groupCode); const existMembers = this.core.apis.GroupApi.groupMemberCache.get(groupCode);
if (!existMembers) return; if (!existMembers) return;
members.forEach((member) => { members.forEach((member) => {