Merge branch 'dev' into dev

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": [
     {

src/main/main.ts

@@ -206,8 +206,8 @@ function onLoad() {
     if (getConfigUtil().getConfig().enablePoke) {
       if ( qqPkgInfo.buildVersion > '23873'){
         log(`当前版本${qqPkgInfo.buildVersion}不支持发送戳一戳模块`)
-        return
       }
+      else {
         crychic.loadNode()
         crychic.registerPokeHandler((id, isGroup) => {
           log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
@@ -216,11 +216,12 @@ function onLoad() {
             pokeEvent = new OB11GroupPokeEvent(parseInt(id))
           }
           else {
-          pokeEvent = new OB11FriendPokeEvent(parseInt(selfInfo.uin), parseInt(id))
+            pokeEvent = new OB11FriendPokeEvent(parseInt(id))
           }
           postOb11Event(pokeEvent)
         })
       }
+    }
     registerReceiveHook<{
       msgList: Array<RawMessage>
     }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {

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

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)
 

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, ',')
   }
 

src/version.ts

@@ -1 +1 @@
-export const version = '3.27.0'
+export const version = '3.27.1'