Merge remote-tracking branch 'origin/v2' into v2

# Conflicts:
#	src/core/apis/group.ts
This commit is contained in:
Wesley F. Young 2024-08-10 20:26:42 +08:00
commit 1258270ac4
2 changed files with 8 additions and 2 deletions

View File

@ -6,7 +6,13 @@ export enum GroupListUpdateType {
MODIFIED, MODIFIED,
REMOVE REMOVE
} }
export interface GroupMemberCache {
group: {
data: GroupMember[];
isExpired: boolean;
}
isExpired: boolean;
}
export interface Group { export interface Group {
groupCode: string, groupCode: string,
createTime?: string,//高版本才有 createTime?: string,//高版本才有

View File

@ -35,7 +35,7 @@ async function handleMsg(coreContext: NapCatCore, msg: OB11Message, quickAction:
let replyMessage: OB11MessageData[] = []; let replyMessage: OB11MessageData[] = [];
if (msg.message_type == 'group') { if (msg.message_type == 'group') {
group = await getGroup(msg.group_id!.toString()); group = await coreContext.getApiContext().GroupApi.getGroup(msg.group_id!.toString());
replyMessage.push({ replyMessage.push({
type: 'reply', type: 'reply',
data: { data: {