Merge pull request #415 from LLOneBot/dev

release: 3.32.5

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -7,9 +7,6 @@ body:
     attributes:
       value: |
         欢迎来到 LLOneBot 的 Issue Tracker！请填写以下表格来提交 Bug。
-        在提交新的 Bug 反馈前，请确保您：
-        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
-        * 不与现有的某一 issue 重复
   - type: input
     id: system-version
     attributes:
@@ -40,8 +37,6 @@ body:
       label: OneBot 客户端
       description: 连接至 LLOneBot 的客户端版本信息
       placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
-    validations:
-      required: true
   - type: textarea
     id: what-happened
     attributes:

manifest.json

@@ -4,7 +4,7 @@
   "name": "LLOneBot",
   "slug": "LLOneBot",
   "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
-  "version": "3.32.3",
+  "version": "3.32.5",
   "icon": "./icon.webp",
   "authors": [
     {

package.json

@@ -12,7 +12,7 @@
     "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %LITELOADERQQNT_PROFILE%\\plugins\\LLOneBot\\\"",
     "format": "prettier -cw .",
     "check": "tsc",
-    "compile:proto": "pbjs -t static-module -w es6 -p ./src/ntqqapi/proto -o ./src/ntqqapi/proto/compiled.js systemMessage.proto profileLikeTip.proto && pbts -o ./src/ntqqapi/proto/compiled.d.ts ./src/ntqqapi/proto/compiled.js"
+    "compile:proto": "pbjs --no-create --no-convert --no-encode --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js systemMessage.proto profileLikeTip.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
   },
   "author": "",
   "license": "MIT",

scripts/gen-manifest.ts

@@ -35,4 +35,4 @@ const manifest = {
   }
 }
 
-writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))
+writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))

src/common/globalVars.ts

@@ -19,4 +19,4 @@ export const selfInfo: SelfInfo = {
   uin: '',
   nick: '',
   online: true,
-}
+}

src/common/types.ts

@@ -70,4 +70,4 @@ export interface FileCacheV2 {
   chatType: number
   elementId: string
   elementType: number
-}
+}

src/common/utils/misc.ts

@@ -1,5 +1,5 @@
 import { QQLevel } from '@/ntqqapi/types'
-import { Dict } from 'cosmokit'
+import { Dict, isNullable } from 'cosmokit'
 
 export function isNumeric(str: string) {
   return /^\d+$/.test(str)
@@ -32,4 +32,8 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
       }
     }
   })
-}
+}
+
+export function filterNullable<T>(array: T[]) {
+  return array.filter(e => !isNullable(e)) as NonNullable<T>[]
+}

src/common/utils/upgrade.ts

@@ -5,20 +5,22 @@ import { version } from '../../version'
 import { copyFolder, log, fetchFile } from '.'
 import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
 
-const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
-const checkVersionMirrorHosts = ['https://kkgithub.com']
+const downloadMirrorHosts = ['https://ghp.ci/']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
   const latestVersionText = await getRemoteVersion()
   const latestVersion = latestVersionText.split('.')
-  //log('llonebot last version', latestVersion)
-  const currentVersion: string[] = version.split('.')
+  log('LLOneBot latest version', latestVersion)
+  const currentVersion = version.split('.')
   //log('llonebot current version', currentVersion)
   for (const k of [0, 1, 2]) {
-    if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
+    const latest = parseInt(latestVersion[k])
+    const current = parseInt(currentVersion[k])
+    if (latest > current) {
       log('')
       return { result: true, version: latestVersionText }
-    } else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
+    } else if (latest < current) {
       break
     }
   }
@@ -28,7 +30,7 @@ export async function checkNewVersion() {
 export async function upgradeLLOneBot() {
   const latestVersion = await getRemoteVersion()
   if (latestVersion && latestVersion != '') {
-    const downloadUrl = 'https://github.com/LLOneBot/LLOneBot/releases/download/v' + latestVersion + '/LLOneBot.zip'
+    const downloadUrl = `https://github.com/LLOneBot/LLOneBot/releases/download/v${latestVersion}/LLOneBot.zip`
     const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
     let downloadSuccess = false
     // 多镜像下载
@@ -73,26 +75,34 @@ export async function upgradeLLOneBot() {
 }
 
 export async function getRemoteVersion() {
-  let Version = ''
-  for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-    const mirrorGithub = checkVersionMirrorHosts[i]
-    const tVersion = await getRemoteVersionByMirror(mirrorGithub)
-    if (tVersion && tVersion != '') {
-      Version = tVersion
-      break
+  for (const mirror of releasesMirrorHosts) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
+    if (version) {
+      return version
+    }
+  }
+  for (const mirror of downloadMirrorHosts) {
+    const version = await getRemoteVersionByDownloadMirror(mirror)
+    if (version) {
+      return version
     }
   }
-  return Version
-}
-
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-  let releasePage = 'error'
-
-  try {
-    releasePage = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
-    // log("releasePage", releasePage);
-    if (releasePage === 'error') return ''
-    return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
-  } catch { }
   return ''
 }
+
+export async function getRemoteVersionByDownloadMirror(mirrorGithub: string) {
+  try {
+    const source = 'https://raw.githubusercontent.com/LLOneBot/LLOneBot/main/src/version.ts'
+    const page = (await fetchFile(mirrorGithub + source)).data.toString()
+    return page.match(/(\d+\.\d+\.\d+)/)?.[0]
+  } catch (e) {
+    log(e?.toString())
+  }
+}
+
+export async function getRemoteVersionByReleasesMirror(mirrorGithub: string) {
+  try {
+    const page = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
+    return page.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
+  } catch { }
+}

src/global.d.ts

@@ -6,4 +6,4 @@ declare global {
   var LiteLoader: Dict
   var authData: Dict | undefined
   var navigation: Dict | undefined
-}
+}

src/main/log.ts

@@ -33,4 +33,4 @@ export default class Log {
       enable = input.log!
     })
   }
-}
+}

src/ntqqapi/core.ts

@@ -237,4 +237,4 @@ namespace Core {
   }
 }
 
-export default Core
+export default Core

src/ntqqapi/hook.ts

@@ -173,4 +173,4 @@ export function registerCallHook(
 export function removeReceiveHook(id: string) {
   const index = receiveHooks.findIndex((h) => h.id === id)
   receiveHooks.splice(index, 1)
-}
+}

src/ntqqapi/ntcall.ts

@@ -181,4 +181,4 @@ export function invoke<
       apiArgs,
     )
   })
-}
+}

src/ntqqapi/proto/compiled.d.ts

@@ -34,29 +34,6 @@ export namespace SysMsg {
         /** SystemMessage bodyWrapper. */
         public bodyWrapper?: (SysMsg.ISystemMessageBodyWrapper|null);
 
-        /**
-         * Creates a new SystemMessage instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns SystemMessage instance
-         */
-        public static create(properties?: SysMsg.ISystemMessage): SysMsg.SystemMessage;
-
-        /**
-         * Encodes the specified SystemMessage message. Does not implicitly {@link SysMsg.SystemMessage.verify|verify} messages.
-         * @param message SystemMessage message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ISystemMessage, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified SystemMessage message, length delimited. Does not implicitly {@link SysMsg.SystemMessage.verify|verify} messages.
-         * @param message SystemMessage message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ISystemMessage, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a SystemMessage message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -76,34 +53,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessage;
 
-        /**
-         * Verifies a SystemMessage message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a SystemMessage message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns SystemMessage
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessage;
-
-        /**
-         * Creates a plain object from a SystemMessage message. Also converts values to other types if specified.
-         * @param message SystemMessage
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.SystemMessage, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this SystemMessage to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for SystemMessage
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -149,29 +98,6 @@ export namespace SysMsg {
         /** SystemMessageHeader uid. */
         public uid?: (string|null);
 
-        /**
-         * Creates a new SystemMessageHeader instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns SystemMessageHeader instance
-         */
-        public static create(properties?: SysMsg.ISystemMessageHeader): SysMsg.SystemMessageHeader;
-
-        /**
-         * Encodes the specified SystemMessageHeader message. Does not implicitly {@link SysMsg.SystemMessageHeader.verify|verify} messages.
-         * @param message SystemMessageHeader message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ISystemMessageHeader, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified SystemMessageHeader message, length delimited. Does not implicitly {@link SysMsg.SystemMessageHeader.verify|verify} messages.
-         * @param message SystemMessageHeader message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ISystemMessageHeader, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a SystemMessageHeader message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -191,34 +117,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageHeader;
 
-        /**
-         * Verifies a SystemMessageHeader message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a SystemMessageHeader message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns SystemMessageHeader
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageHeader;
-
-        /**
-         * Creates a plain object from a SystemMessageHeader message. Also converts values to other types if specified.
-         * @param message SystemMessageHeader
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.SystemMessageHeader, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this SystemMessageHeader to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for SystemMessageHeader
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -276,29 +174,6 @@ export namespace SysMsg {
         /** SystemMessageMsgSpec other. */
         public other: number;
 
-        /**
-         * Creates a new SystemMessageMsgSpec instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns SystemMessageMsgSpec instance
-         */
-        public static create(properties?: SysMsg.ISystemMessageMsgSpec): SysMsg.SystemMessageMsgSpec;
-
-        /**
-         * Encodes the specified SystemMessageMsgSpec message. Does not implicitly {@link SysMsg.SystemMessageMsgSpec.verify|verify} messages.
-         * @param message SystemMessageMsgSpec message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ISystemMessageMsgSpec, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified SystemMessageMsgSpec message, length delimited. Does not implicitly {@link SysMsg.SystemMessageMsgSpec.verify|verify} messages.
-         * @param message SystemMessageMsgSpec message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ISystemMessageMsgSpec, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a SystemMessageMsgSpec message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -318,34 +193,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageMsgSpec;
 
-        /**
-         * Verifies a SystemMessageMsgSpec message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a SystemMessageMsgSpec message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns SystemMessageMsgSpec
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageMsgSpec;
-
-        /**
-         * Creates a plain object from a SystemMessageMsgSpec message. Also converts values to other types if specified.
-         * @param message SystemMessageMsgSpec
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.SystemMessageMsgSpec, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this SystemMessageMsgSpec to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for SystemMessageMsgSpec
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -373,29 +220,6 @@ export namespace SysMsg {
         /** SystemMessageBodyWrapper body. */
         public body: Uint8Array;
 
-        /**
-         * Creates a new SystemMessageBodyWrapper instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns SystemMessageBodyWrapper instance
-         */
-        public static create(properties?: SysMsg.ISystemMessageBodyWrapper): SysMsg.SystemMessageBodyWrapper;
-
-        /**
-         * Encodes the specified SystemMessageBodyWrapper message. Does not implicitly {@link SysMsg.SystemMessageBodyWrapper.verify|verify} messages.
-         * @param message SystemMessageBodyWrapper message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ISystemMessageBodyWrapper, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified SystemMessageBodyWrapper message, length delimited. Does not implicitly {@link SysMsg.SystemMessageBodyWrapper.verify|verify} messages.
-         * @param message SystemMessageBodyWrapper message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ISystemMessageBodyWrapper, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a SystemMessageBodyWrapper message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -415,34 +239,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.SystemMessageBodyWrapper;
 
-        /**
-         * Verifies a SystemMessageBodyWrapper message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a SystemMessageBodyWrapper message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns SystemMessageBodyWrapper
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.SystemMessageBodyWrapper;
-
-        /**
-         * Creates a plain object from a SystemMessageBodyWrapper message. Also converts values to other types if specified.
-         * @param message SystemMessageBodyWrapper
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.SystemMessageBodyWrapper, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this SystemMessageBodyWrapper to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for SystemMessageBodyWrapper
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -482,29 +278,6 @@ export namespace SysMsg {
         /** LikeDetail nickname. */
         public nickname: string;
 
-        /**
-         * Creates a new LikeDetail instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns LikeDetail instance
-         */
-        public static create(properties?: SysMsg.ILikeDetail): SysMsg.LikeDetail;
-
-        /**
-         * Encodes the specified LikeDetail message. Does not implicitly {@link SysMsg.LikeDetail.verify|verify} messages.
-         * @param message LikeDetail message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ILikeDetail, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified LikeDetail message, length delimited. Does not implicitly {@link SysMsg.LikeDetail.verify|verify} messages.
-         * @param message LikeDetail message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ILikeDetail, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a LikeDetail message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -524,34 +297,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeDetail;
 
-        /**
-         * Verifies a LikeDetail message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a LikeDetail message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns LikeDetail
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.LikeDetail;
-
-        /**
-         * Creates a plain object from a LikeDetail message. Also converts values to other types if specified.
-         * @param message LikeDetail
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.LikeDetail, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this LikeDetail to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for LikeDetail
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -591,29 +336,6 @@ export namespace SysMsg {
         /** LikeMsg detail. */
         public detail?: (SysMsg.ILikeDetail|null);
 
-        /**
-         * Creates a new LikeMsg instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns LikeMsg instance
-         */
-        public static create(properties?: SysMsg.ILikeMsg): SysMsg.LikeMsg;
-
-        /**
-         * Encodes the specified LikeMsg message. Does not implicitly {@link SysMsg.LikeMsg.verify|verify} messages.
-         * @param message LikeMsg message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.ILikeMsg, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified LikeMsg message, length delimited. Does not implicitly {@link SysMsg.LikeMsg.verify|verify} messages.
-         * @param message LikeMsg message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.ILikeMsg, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a LikeMsg message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -633,34 +355,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.LikeMsg;
 
-        /**
-         * Verifies a LikeMsg message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a LikeMsg message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns LikeMsg
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.LikeMsg;
-
-        /**
-         * Creates a plain object from a LikeMsg message. Also converts values to other types if specified.
-         * @param message LikeMsg
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.LikeMsg, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this LikeMsg to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for LikeMsg
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
@@ -688,29 +382,6 @@ export namespace SysMsg {
         /** ProfileLikeTip msg. */
         public msg?: (SysMsg.ILikeMsg|null);
 
-        /**
-         * Creates a new ProfileLikeTip instance using the specified properties.
-         * @param [properties] Properties to set
-         * @returns ProfileLikeTip instance
-         */
-        public static create(properties?: SysMsg.IProfileLikeTip): SysMsg.ProfileLikeTip;
-
-        /**
-         * Encodes the specified ProfileLikeTip message. Does not implicitly {@link SysMsg.ProfileLikeTip.verify|verify} messages.
-         * @param message ProfileLikeTip message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encode(message: SysMsg.IProfileLikeTip, writer?: $protobuf.Writer): $protobuf.Writer;
-
-        /**
-         * Encodes the specified ProfileLikeTip message, length delimited. Does not implicitly {@link SysMsg.ProfileLikeTip.verify|verify} messages.
-         * @param message ProfileLikeTip message or plain object to encode
-         * @param [writer] Writer to encode to
-         * @returns Writer
-         */
-        public static encodeDelimited(message: SysMsg.IProfileLikeTip, writer?: $protobuf.Writer): $protobuf.Writer;
-
         /**
          * Decodes a ProfileLikeTip message from the specified reader or buffer.
          * @param reader Reader or buffer to decode from
@@ -730,34 +401,6 @@ export namespace SysMsg {
          */
         public static decodeDelimited(reader: ($protobuf.Reader|Uint8Array)): SysMsg.ProfileLikeTip;
 
-        /**
-         * Verifies a ProfileLikeTip message.
-         * @param message Plain object to verify
-         * @returns `null` if valid, otherwise the reason why it is not
-         */
-        public static verify(message: { [k: string]: any }): (string|null);
-
-        /**
-         * Creates a ProfileLikeTip message from a plain object. Also converts values to their respective internal types.
-         * @param object Plain object
-         * @returns ProfileLikeTip
-         */
-        public static fromObject(object: { [k: string]: any }): SysMsg.ProfileLikeTip;
-
-        /**
-         * Creates a plain object from a ProfileLikeTip message. Also converts values to other types if specified.
-         * @param message ProfileLikeTip
-         * @param [options] Conversion options
-         * @returns Plain object
-         */
-        public static toObject(message: SysMsg.ProfileLikeTip, options?: $protobuf.IConversionOptions): { [k: string]: any };
-
-        /**
-         * Converts this ProfileLikeTip to JSON.
-         * @returns JSON object
-         */
-        public toJSON(): { [k: string]: any };
-
         /**
          * Gets the default type url for ProfileLikeTip
          * @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")

src/ntqqapi/types/msg.ts

@@ -282,9 +282,23 @@ export interface PicElement {
 }
 
 export enum GrayTipElementSubType {
-  RECALL = 1,
-  INVITE_NEW_MEMBER = 12,
-  MEMBER_NEW_TITLE = 17,
+  REVOKE = 1,
+  PROCLAMATION = 2,
+  EMOJIREPLY = 3,
+  GROUP = 4,
+  BUDDY = 5,
+  FEED = 6,
+  ESSENCE = 7,
+  GROUPNOTIFY = 8,
+  BUDDYNOTIFY = 9,
+  FILE = 10,
+  FEEDCHANNELMSG = 11,
+  XMLMSG = 12,
+  LOCALMSG = 13,
+  BLOCK = 14,
+  AIOOP = 15,
+  WALLET = 16,
+  JSON = 17,
 }
 
 export interface GrayTipElement {
@@ -541,4 +555,4 @@ export interface MessageElement {
   taskTopMsgElement?: unknown
   recommendedMsgElement?: unknown
   actionBarElement?: unknown
-}
+}

src/ntqqapi/wrapper.ts

@@ -78,4 +78,4 @@ Process.dlopen = function (module: Dict, filename: string, flags = constants.dlo
 
 export function getSession() {
   return wrapperApi['NodeIQQNTWrapperSession']
-}
+}

src/onebot11/action/go-cqhttp/GetForwardMsg.ts

@@ -3,6 +3,7 @@ import { OB11ForwardMessage } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -33,19 +34,21 @@ export class GetForwardMsg extends BaseAction<Payload, Response> {
     const messages = await Promise.all(
       msgList.map(async (msg) => {
         const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (!resMsg) return
         resMsg.message_id = MessageUnique.createMsg({
           chatType: msg.chatType,
           peerUid: msg.peerUid,
         }, msg.msgId)
         return resMsg
-      }),
+      })
     )
-    const forwardMessages = messages.map(v => {
-      const msg = v as Partial<OB11ForwardMessage>
-      msg.content = msg.message
-      delete msg.message
-      return msg as OB11ForwardMessage
-    })
+    const forwardMessages = filterNullable(messages)
+      .map(v => {
+        const msg = v as Partial<OB11ForwardMessage>
+        msg.content = msg.message
+        delete msg.message
+        return msg as OB11ForwardMessage
+      })
     return { messages: forwardMessages }
   }
 }

src/onebot11/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -5,6 +5,7 @@ import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
 import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
@@ -41,6 +42,6 @@ export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
       })
     )
     const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
-    return { messages: ob11MsgList }
+    return { messages: filterNullable(ob11MsgList) }
   }
 }

src/onebot11/action/go-cqhttp/UploadFile.ts

@@ -20,9 +20,9 @@ export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
     if (!success) {
       throw new Error(errMsg)
     }
-    const sendFileEle = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder_id)
+    const file = await SendElementEntities.file(this.ctx, path, payload.name || fileName, payload.folder ?? payload.folder_id)
     const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
+    await sendMsg(this.ctx, peer, [file], [])
     return null
   }
 }

src/onebot11/action/msg/GetMsg.ts

@@ -15,12 +15,12 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
 
   protected async _handle(payload: PayloadType) {
     if (!payload.message_id) {
-      throw '参数message_id不能为空'
+      throw new Error('参数message_id不能为空')
     }
     const msgShortId = MessageUnique.getShortIdByMsgId(payload.message_id.toString())
     const msgIdWithPeer = await MessageUnique.getMsgIdAndPeerByShortId(msgShortId || +payload.message_id)
     if (!msgIdWithPeer) {
-      throw ('消息不存在')
+      throw new Error('消息不存在')
     }
     const peer = {
       guildId: '',
@@ -29,6 +29,9 @@ class GetMsg extends BaseAction<PayloadType, OB11Message> {
     }
     const msg = this.adapter.getMsgCache(msgIdWithPeer.MsgId) ?? (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgIdWithPeer.MsgId])).msgList[0]
     const retMsg = await OB11Entities.message(this.ctx, msg)
+    if (!retMsg) {
+      throw new Error('消息为空')
+    }
     retMsg.message_id = MessageUnique.createMsg(peer, msg.msgId)!
     retMsg.message_seq = retMsg.message_id
     retMsg.real_id = retMsg.message_id

src/onebot11/adapter.ts

@@ -195,6 +195,9 @@ class OneBot11Adapter extends Service {
 
       OB11Entities.message(this.ctx, message)
         .then((msg) => {
+          if (!msg) {
+            return
+          }
           if (!this.config.debug && msg.message.length === 0) {
             return
           }
@@ -440,4 +443,4 @@ namespace OneBot11Adapter {
   }
 }
 
-export default OneBot11Adapter
+export default OneBot11Adapter

src/onebot11/entities.ts

@@ -49,7 +49,8 @@ import { pathToFileURL } from 'node:url'
 import OneBot11Adapter from './adapter'
 
 export namespace OB11Entities {
-  export async function message(ctx: Context, msg: RawMessage): Promise<OB11Message> {
+  export async function message(ctx: Context, msg: RawMessage): Promise<OB11Message | undefined> {
+    if (!msg.senderUin || msg.senderUin === '0') return //跳过空消息
     const {
       debug,
       messagePostFormat,
@@ -57,14 +58,14 @@ export namespace OB11Entities {
     const selfUin = selfInfo.uin
     const resMsg: OB11Message = {
       self_id: parseInt(selfUin),
-      user_id: parseInt(msg.senderUin!),
+      user_id: parseInt(msg.senderUin),
       time: parseInt(msg.msgTime) || Date.now(),
       message_id: msg.msgShortId!,
       real_id: msg.msgShortId!,
       message_seq: msg.msgShortId!,
       message_type: msg.chatType === ChatType.group ? 'group' : 'private',
       sender: {
-        user_id: parseInt(msg.senderUin!),
+        user_id: parseInt(msg.senderUin),
         nickname: msg.sendNickName,
         card: msg.sendMemberName ?? '',
       },
@@ -81,7 +82,7 @@ export namespace OB11Entities {
     if (msg.chatType === ChatType.group) {
       resMsg.sub_type = 'normal'
       resMsg.group_id = parseInt(msg.peerUin)
-      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin!)
+      const member = await ctx.ntGroupApi.getGroupMember(msg.peerUin, msg.senderUin)
       if (member) {
         resMsg.sender.role = groupMemberRole(member.role)
         resMsg.sender.nickname = member.nick
@@ -373,11 +374,10 @@ export namespace OB11Entities {
     }
     for (const element of msg.elements) {
       if (element.grayTipElement) {
-        if (element.grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
-          const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr)
-          if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-            //判断业务类型
-            //Poke事件
+        const { grayTipElement } = element
+        if (grayTipElement.subElementType === GrayTipElementSubType.JSON) {
+          const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
+          if (grayTipElement.jsonGrayTipElement.busiId === 1061) {
             const pokedetail: Dict[] = json.items
             //筛选item带有uid的元素
             const poke_uid = pokedetail.filter(item => item.uid)
@@ -389,7 +389,6 @@ export namespace OB11Entities {
               )
             }
           }
-          //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
         }
       }
     }
@@ -489,7 +488,7 @@ export namespace OB11Entities {
         }
       }
       else if (element.fileElement) {
-        return new OB11GroupUploadNoticeEvent(parseInt(msg.peerUid), parseInt(msg.senderUin!), {
+        return new OB11GroupUploadNoticeEvent(+msg.peerUid, +msg.senderUin!, {
           id: element.fileElement.fileUuid!,
           name: element.fileElement.fileName,
           size: parseInt(element.fileElement.fileSize),
@@ -543,7 +542,7 @@ export namespace OB11Entities {
         }
 
         if (
-          grayTipElement.subElementType == GrayTipElementSubType.INVITE_NEW_MEMBER &&
+          grayTipElement.subElementType == GrayTipElementSubType.XMLMSG &&
           xmlElement?.templId == '10179'
         ) {
           ctx.logger.info('收到新人被邀请进群消息', grayTipElement)
@@ -563,35 +562,9 @@ export namespace OB11Entities {
             }
           }
         }
-        else if (grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE) {
+        else if (grayTipElement.subElementType == GrayTipElementSubType.JSON) {
           const json = JSON.parse(grayTipElement.jsonGrayTipElement.jsonStr)
-          /*
-          {
-            align: 'center',
-            items: [
-              { txt: '恭喜', type: 'nor' },
-              {
-                col: '3',
-                jp: '5',
-                param: ["QQ号"],
-                txt: '林雨辰',
-                type: 'url'
-              },
-              { txt: '获得群主授予的', type: 'nor' },
-              {
-                col: '3',
-                jp: '',
-                txt: '好好好',
-                type: 'url'
-              },
-              { txt: '头衔', type: 'nor' }
-            ]
-          }
-    
-          * */
           if (grayTipElement.jsonGrayTipElement.busiId == 1061) {
-            //判断业务类型
-            //Poke事件
             const pokedetail: Dict[] = json.items
             //筛选item带有uid的元素
             const poke_uid = pokedetail.filter(item => item.uid)
@@ -653,7 +626,7 @@ export namespace OB11Entities {
     shortId: number
   ): Promise<OB11FriendRecallNoticeEvent | OB11GroupRecallNoticeEvent | undefined> {
     const msgElement = msg.elements.find(
-      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.RECALL,
+      (element) => element.grayTipElement?.subElementType === GrayTipElementSubType.REVOKE,
     )
     if (!msgElement) {
       return

src/renderer/icon.ts

@@ -1,7 +1,7 @@
 export const iconSvg = `
 <?xml version="2.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="50px" y="10px" width="262px" height="150" viewBox="0 0 212 262" enable-background="new 0 0 212 262" xml:space="preserve">  
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="50px" y="10px" width="262px" height="150" viewBox="0 0 212 262" enable-background="new 0 0 212 262" xml:space="preserve">
 <image id="image0" width="212" height="210" x="0" y="-20" transform="rotate(180, 100, 100)"
     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANQAAAEGCAYAAAAdX7uIAAAAIGNIUk0AAHomAACAhAAA+gAAAIDo
 AAB1MAAA6mAAADqYAAAXcJy6UTwAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAADsMAAA7DAcdv

src/version.ts

@@ -1 +1 @@
-export const version = '3.32.3'
+export const version = '3.32.5'