From 948f10d4e343f790f5a9d2eabd3ff6747de93f75 Mon Sep 17 00:00:00 2001 From: linyuchen Date: Sat, 18 May 2024 16:51:34 +0800 Subject: [PATCH] feat: Quick operation reply auto quote original message --- src/onebot11/action/go-cqhttp/QuickOperation.ts | 2 +- src/onebot11/{server => action}/quick-operation.ts | 13 ++++++++++--- src/onebot11/server/post-ob11-event.ts | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) rename src/onebot11/{server => action}/quick-operation.ts (94%) diff --git a/src/onebot11/action/go-cqhttp/QuickOperation.ts b/src/onebot11/action/go-cqhttp/QuickOperation.ts index 376d084..b34668b 100644 --- a/src/onebot11/action/go-cqhttp/QuickOperation.ts +++ b/src/onebot11/action/go-cqhttp/QuickOperation.ts @@ -1,5 +1,5 @@ import BaseAction from '../BaseAction' -import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../server/quick-operation' +import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../quick-operation' import { log } from '@/common/utils' import { ActionName } from '../types' diff --git a/src/onebot11/server/quick-operation.ts b/src/onebot11/action/quick-operation.ts similarity index 94% rename from src/onebot11/server/quick-operation.ts rename to src/onebot11/action/quick-operation.ts index 44ccbff..32f2e6f 100644 --- a/src/onebot11/server/quick-operation.ts +++ b/src/onebot11/action/quick-operation.ts @@ -1,14 +1,14 @@ // handle quick action, create at 2024-5-18 10:54:39 by linyuchen -import { OB11Message, OB11MessageAt, OB11MessageData } from '../types' +import { OB11Message, OB11MessageAt, OB11MessageData, OB11MessageDataType } from '../types' import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest' import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest' import { dbUtil } from '@/common/db' import { NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, Peer } from '@/ntqqapi/api' import { ChatType, Group, GroupRequestOperateTypes } from '@/ntqqapi/types' import { getGroup, getUidByUin } from '@/common/data' -import { convertMessage2List, createSendElements, sendMsg } from '../action/msg/SendMsg' +import { convertMessage2List, createSendElements, sendMsg } from './msg/SendMsg' import { isNull, log } from '@/common/utils' @@ -80,7 +80,14 @@ async function handleMsg(msg: OB11Message, quickAction: QuickOperationPrivateMes } if (reply) { let group: Group = null - let replyMessage: OB11MessageData[] = [] + let replyMessage: OB11MessageData[] = [ + { + type: OB11MessageDataType.reply, + data: { + id: msg.message_id.toString(), + }, + } + ] if (msg.message_type == 'group') { group = await getGroup(msg.group_id.toString()) diff --git a/src/onebot11/server/post-ob11-event.ts b/src/onebot11/server/post-ob11-event.ts index 0300cef..d78f130 100644 --- a/src/onebot11/server/post-ob11-event.ts +++ b/src/onebot11/server/post-ob11-event.ts @@ -7,7 +7,7 @@ import { wsReply } from './ws/reply' import { log } from '@/common/utils' import { getConfigUtil } from '@/common/config' import crypto from 'crypto' -import { handleQuickOperation, QuickOperationEvent } from './quick-operation' +import { handleQuickOperation, QuickOperationEvent } from '../action/quick-operation' export type PostEventType = OB11Message | OB11BaseMetaEvent | OB11BaseNoticeEvent