diff --git a/manifest.json b/manifest.json index 799bf15..22a694f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,10 @@ { "manifest_version": 4, "type": "extension", - "name": "LLOneBot v3.27.0", + "name": "LLOneBot v3.27.1", "slug": "LLOneBot", "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发", - "version": "3.27.0", + "version": "3.27.1", "icon": "./icon.jpg", "authors": [ { diff --git a/src/main/main.ts b/src/main/main.ts index eed278b..a1b1032 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -206,20 +206,21 @@ function onLoad() { if (getConfigUtil().getConfig().enablePoke) { if ( qqPkgInfo.buildVersion > '23873'){ log(`当前版本${qqPkgInfo.buildVersion}不支持发送戳一戳模块`) - return } - crychic.loadNode() - crychic.registerPokeHandler((id, isGroup) => { - log(`收到戳一戳消息了!是否群聊:${isGroup},id:${id}`) - let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent - if (isGroup) { - pokeEvent = new OB11GroupPokeEvent(parseInt(id)) - } - else { - pokeEvent = new OB11FriendPokeEvent(parseInt(selfInfo.uin), parseInt(id)) - } - postOb11Event(pokeEvent) - }) + else { + crychic.loadNode() + crychic.registerPokeHandler((id, isGroup) => { + log(`收到戳一戳消息了!是否群聊:${isGroup},id:${id}`) + let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent + if (isGroup) { + pokeEvent = new OB11GroupPokeEvent(parseInt(id)) + } + else { + pokeEvent = new OB11FriendPokeEvent(parseInt(id)) + } + postOb11Event(pokeEvent) + }) + } } registerReceiveHook<{ msgList: Array diff --git a/src/ntqqapi/types/msg.ts b/src/ntqqapi/types/msg.ts index d81255c..1e74520 100644 --- a/src/ntqqapi/types/msg.ts +++ b/src/ntqqapi/types/msg.ts @@ -188,6 +188,7 @@ export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn' export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn' export interface PicElement { + picSubType: PicSubType picType: PicType // 有这玩意儿吗 originImageUrl: string // http url, 没有host,host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn originImageMd5?: string diff --git a/src/onebot11/constructor.ts b/src/onebot11/constructor.ts index 2b46448..addc4fb 100644 --- a/src/onebot11/constructor.ts +++ b/src/onebot11/constructor.ts @@ -163,10 +163,12 @@ export class OB11Constructor { // message_data["data"]["file"] = element.picElement.sourcePath let fileName = element.picElement.fileName const sourcePath = element.picElement.sourcePath - if (element.picElement.picType === PicType.gif && !fileName.endsWith('.gif')) { + const isGif = element.picElement.picType === PicType.gif + if (isGif && !fileName.endsWith('.gif')) { fileName += '.gif' } message_data['data']['file'] = fileName + message_data['data']['subType'] = element.picElement.picSubType // message_data["data"]["path"] = element.picElement.sourcePath // let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64" @@ -297,7 +299,7 @@ export class OB11Constructor { if (message_data.type !== 'unknown' && message_data.data) { const cqCode = encodeCQCode(message_data) if (messagePostFormat === 'string') { - ;(resMsg.message as string) += cqCode + (resMsg.message as string) += cqCode } else (resMsg.message as OB11MessageData[]).push(message_data) diff --git a/src/onebot11/cqcode.ts b/src/onebot11/cqcode.ts index 83ebdbf..121320d 100644 --- a/src/onebot11/cqcode.ts +++ b/src/onebot11/cqcode.ts @@ -50,6 +50,7 @@ export function encodeCQCode(data: OB11MessageData) { } const CQCodeEscape = (text: string) => { + text = text.toString() return text.replace(/\&/g, '&').replace(/\[/g, '[').replace(/\]/g, ']').replace(/,/g, ',') } diff --git a/src/version.ts b/src/version.ts index 080c347..72ae07f 100644 --- a/src/version.ts +++ b/src/version.ts @@ -1 +1 @@ -export const version = '3.27.0' +export const version = '3.27.1'