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

Merge pull request from LLOneBot/dev

Browse Source 
feat: Quick operation reply auto quote original message
This commit is contained in:
linyuchen 2024-05-18 16:53:37 +08:00 committed by GitHub
commit 807ef3b700
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 5 deletions

2
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'

13
src/onebot11/server/quick-operation.ts → 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())

2
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