Merge pull request #390 from LLOneBot/dev

3.31.5

manifest.json

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

src/ntqqapi/api/group.ts

@@ -19,7 +19,7 @@ declare module 'cordis' {
 export class NTQQGroupApi extends Service {
   static inject = ['ntWindowApi']
 
-  private groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
+  public groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
 
   constructor(protected ctx: Context) {
     super(ctx, 'ntGroupApi', true)
@@ -246,7 +246,7 @@ export class NTQQGroupApi extends Service {
     }
   }
 
-  async getGroupAtAllRemainCount(groupCode: string) {
+  async getGroupRemainAtTimes(groupCode: string) {
     return await invoke<
       GeneralCallResult & {
         atInfo: {

src/ntqqapi/api/msg.ts

@@ -153,12 +153,7 @@ export class NTQQMsgApi extends Service {
       )
       msgList = data.msgList
     }
-    const retMsg = msgList.find(msgRecord => {
-      if (msgRecord.guildId === msgId) {
-        return true
-      }
-    })
-    return retMsg!
+    return msgList.find(msgRecord => msgRecord.guildId === msgId)
   }
 
   async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {

src/ntqqapi/api/user.ts

@@ -3,7 +3,7 @@ import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListene
 import { getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { NodeIKernelProfileService, UserDetailSource, ProfileBizType, forceFetchClientKeyRetType } from '../services'
+import { NodeIKernelProfileService, UserDetailSource, ProfileBizType } from '../services'
 import { NodeIKernelProfileListener } from '../listeners'
 import { NTEventDispatch } from '@/common/utils/eventTask'
 import { Time } from 'cosmokit'
@@ -17,7 +17,7 @@ declare module 'cordis' {
 }
 
 export class NTQQUserApi extends Service {
-  static inject = ['ntFriendApi']
+  static inject = ['ntFriendApi', 'ntGroupApi']
 
   constructor(protected ctx: Context) {
     super(ctx, 'ntUserApi', true)
@@ -187,16 +187,31 @@ export class NTQQUserApi extends Service {
     }
   }
 
-  async getUidByUinV1(Uin: string) {
+  async getUidByUinV1(uin: string) {
     const session = getSession()
     // 通用转换开始尝试
-    let uid = (await session?.getUixConvertService().getUid([Uin]))?.uidInfo.get(Uin)
+    let uid = (await session?.getUixConvertService().getUid([uin]))?.uidInfo.get(uin)
     if (!uid) {
-      let unveifyUid = (await this.getUserDetailInfoByUin(Uin)).info.uid //从QQ Native 特殊转换 方法三
-      if (unveifyUid.indexOf('*') == -1) {
+      for (const membersList of this.ctx.ntGroupApi.groupMembers.values()) { //从群友列表转
+        for (const member of membersList.values()) {
+          if (member.uin === uin) {
+            uid = member.uid
+            break
+          }
+        }
+        if (uid) break
+      }
+    }
+    if (!uid) {
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid //特殊转换
+      if (unveifyUid.indexOf('*') === -1) {
         uid = unveifyUid
       }
     }
+    if (!uid) {
+      const friends = await this.ctx.ntFriendApi.getFriends() //从好友列表转
+      uid = friends.find(item => item.uin === uin)?.uid
+    }
     return uid
   }
 
@@ -221,11 +236,11 @@ export class NTQQUserApi extends Service {
     if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  async getUidByUin(Uin: string) {
+  async getUidByUin(uin: string) {
     if (getBuildVersion() >= 26702) {
-      return await this.getUidByUinV2(Uin)
+      return this.getUidByUinV2(uin)
     }
-    return await this.getUidByUinV1(Uin)
+    return this.getUidByUinV1(uin)
   }
 
   async getUserDetailInfoByUinV2(uin: string) {
@@ -247,25 +262,25 @@ export class NTQQUserApi extends Service {
     }
   }
 
-  async getUserDetailInfoByUin(Uin: string) {
+  async getUserDetailInfoByUin(uin: string) {
     return NTEventDispatch.CallNoListenerEvent
       <(Uin: string) => Promise<UserDetailInfoByUin>>(
         'NodeIKernelProfileService/getUserDetailInfoByUin',
         5000,
-        Uin
+        uin
       )
   }
 
-  async getUinByUidV1(Uid: string) {
+  async getUinByUidV1(uid: string) {
     const ret = await NTEventDispatch.CallNoListenerEvent
       <(Uin: string[]) => Promise<{ uinInfo: Map<string, string> }>>(
         'NodeIKernelUixConvertService/getUin',
         5000,
-        [Uid]
+        [uid]
       )
-    let uin = ret.uinInfo.get(Uid)
+    let uin = ret.uinInfo.get(uid)
     if (!uin) {
-      uin = (await this.getUserDetailInfo(Uid)).uin //从QQ Native 转换
+      uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
     }
     return uin
   }
@@ -293,11 +308,11 @@ export class NTQQUserApi extends Service {
     return uin
   }
 
-  async getUinByUid(Uid: string) {
+  async getUinByUid(uid: string) {
     if (getBuildVersion() >= 26702) {
-      return (await this.getUinByUidV2(Uid))!
+      return this.getUinByUidV2(uid)
     }
-    return await this.getUinByUidV1(Uid)
+    return this.getUinByUidV1(uid)
   }
 
   async forceFetchClientKey() {

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

@@ -7,7 +7,7 @@ interface Payload {
   parent_id?: '/'
 }
 
-export class GoCQHTTPCreateGroupFileFolder extends BaseAction<Payload, null> {
+export class CreateGroupFileFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_CreateGroupFileFolder
 
   async _handle(payload: Payload) {

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

@@ -6,7 +6,7 @@ interface Payload {
   message_id: number | string
 }
 
-export default class GoCQHTTPDelEssenceMsg extends BaseAction<Payload, any> {
+export class DelEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_DelEssenceMsg;
 
   protected async _handle(payload: Payload): Promise<any> {

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

@@ -7,7 +7,7 @@ interface Payload {
   busid?: 102
 }
 
-export class GoCQHTTPDelGroupFile extends BaseAction<Payload, null> {
+export class DelGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFile
 
   async _handle(payload: Payload) {

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

@@ -6,7 +6,7 @@ interface Payload {
   folder_id: string
 }
 
-export class GoCQHTTPDelGroupFolder extends BaseAction<Payload, null> {
+export class DelGroupFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFolder
 
   async _handle(payload: Payload) {

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

@@ -19,7 +19,7 @@ interface FileResponse {
   file: string
 }
 
-export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileResponse> {
+export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
 
   protected async _handle(payload: Payload): Promise<FileResponse> {

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

@@ -13,7 +13,7 @@ interface Response {
   messages: (OB11Message & { content: OB11MessageData })[]
 }
 
-export class GoCQHTTGetForwardMsgAction extends BaseAction<Payload, Response> {
+export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
   protected async _handle(payload: Payload): Promise<any> {
     const msgId = payload.id || payload.message_id

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

@@ -0,0 +1,25 @@
+import BaseAction from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface Response {
+  can_at_all: boolean
+  remain_at_all_count_for_group: number
+  remain_at_all_count_for_uin: number
+}
+
+export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain
+
+  async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupRemainAtTimes(payload.group_id.toString())
+    return {
+      can_at_all: data.atInfo.canAtAll,
+      remain_at_all_count_for_group: data.atInfo.RemainAtAllCountForGroup,
+      remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
+    }
+  }
+}

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

@@ -17,7 +17,7 @@ interface Response {
   messages: OB11Message[]
 }
 
-export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Response> {
+export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
 
   protected async _handle(payload: Payload): Promise<Response> {

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

@@ -24,7 +24,7 @@ interface Response {
   }[]
 }
 
-export class GoCQHTTPGetGroupSystemMsg extends BaseAction<void, Response> {
+export class GetGroupSystemMsg extends BaseAction<void, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupSystemMsg
 
   async _handle(payload: void) {

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

@@ -10,7 +10,7 @@ interface Payload {
   user_id: number | string
 }
 
-export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11User> {
+export class GetStrangerInfo extends BaseAction<Payload, OB11User> {
   actionName = ActionName.GoCQHTTP_GetStrangerInfo
 
   protected async _handle(payload: Payload): Promise<OB11User> {

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

@@ -5,7 +5,7 @@ interface Payload {
   message_id: number
 }
 
-export default class GoCQHTTPMarkMsgAsRead extends BaseAction<Payload, null> {
+export class MarkMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_MarkMsgAsRead
 
   protected async _handle(payload: Payload): Promise<null> {

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

@@ -7,7 +7,7 @@ interface Payload {
   operation: QuickOperation
 }
 
-export class GoCQHTTHandleQuickOperation extends BaseAction<Payload, null> {
+export class HandleQuickOperation extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_HandleQuickOperation
   protected async _handle(payload: Payload): Promise<null> {
     handleQuickOperation(this.ctx, payload.context, payload.operation).catch(e => this.ctx.logger.error(e))

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

@@ -3,7 +3,7 @@ import { OB11PostSendMsg } from '../../types'
 import { ActionName } from '../types'
 import { convertMessage2List } from '../../helper/createMessage'
 
-export class GoCQHTTPSendForwardMsg extends SendMsg {
+export class SendForwardMsg extends SendMsg {
   actionName = ActionName.GoCQHTTP_SendForwardMsg
 
   protected async check(payload: OB11PostSendMsg) {
@@ -12,10 +12,10 @@ export class GoCQHTTPSendForwardMsg extends SendMsg {
   }
 }
 
-export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsg {
+export class SendPrivateForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg
 }
 
-export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsg {
+export class SendGroupForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendGroupForwardMsg
 }

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

@@ -6,7 +6,7 @@ interface Payload {
   message_id: number | string
 }
 
-export default class GoCQHTTPSetEssenceMsg extends BaseAction<Payload, any> {
+export class SetEssenceMsg extends BaseAction<Payload, any> {
   actionName = ActionName.GoCQHTTP_SetEssenceMsg;
 
   protected async _handle(payload: Payload): Promise<any> {

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

@@ -16,7 +16,7 @@ interface Payload {
   folder_id?: string
 }
 
-export class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
+export class UploadGroupFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_UploadGroupFile
 
   protected async _handle(payload: Payload): Promise<null> {
@@ -37,7 +37,7 @@ export class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
   }
 }
 
-export class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null> {
+export class UploadPrivateFile extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_UploadPrivateFile
 
   async getPeer(payload: Payload): Promise<Peer> {

src/onebot11/action/index.ts

@@ -16,11 +16,11 @@ import CanSendRecord from './system/CanSendRecord'
 import CanSendImage from './system/CanSendImage'
 import GetStatus from './system/GetStatus'
 import {
-  GoCQHTTPSendForwardMsg,
-  GoCQHTTPSendGroupForwardMsg,
-  GoCQHTTPSendPrivateForwardMsg,
+  SendForwardMsg,
+  SendGroupForwardMsg,
+  SendPrivateForwardMsg,
 } from './go-cqhttp/SendForwardMsg'
-import GoCQHTTPGetStrangerInfo from './go-cqhttp/GetStrangerInfo'
+import { GetStrangerInfo } from './go-cqhttp/GetStrangerInfo'
 import SendLike from './user/SendLike'
 import SetGroupAddRequest from './group/SetGroupAddRequest'
 import SetGroupLeave from './group/SetGroupLeave'
@@ -35,29 +35,30 @@ import SetGroupAdmin from './group/SetGroupAdmin'
 import SetGroupCard from './group/SetGroupCard'
 import GetImage from './file/GetImage'
 import GetRecord from './file/GetRecord'
-import GoCQHTTPMarkMsgAsRead from './msg/MarkMsgAsRead'
+import { MarkMsgAsRead } from './go-cqhttp/MarkMsgAsRead'
 import CleanCache from './system/CleanCache'
-import { GoCQHTTPUploadGroupFile, GoCQHTTPUploadPrivateFile } from './go-cqhttp/UploadFile'
+import { UploadGroupFile, UploadPrivateFile } from './go-cqhttp/UploadFile'
 import { GetConfigAction, SetConfigAction } from './llonebot/Config'
 import GetGroupAddRequest from './llonebot/GetGroupAddRequest'
 import SetQQAvatar from './llonebot/SetQQAvatar'
-import GoCQHTTPDownloadFile from './go-cqhttp/DownloadFile'
-import GoCQHTTPGetGroupMsgHistory from './go-cqhttp/GetGroupMsgHistory'
+import { DownloadFile } from './go-cqhttp/DownloadFile'
+import { GetGroupMsgHistory } from './go-cqhttp/GetGroupMsgHistory'
 import GetFile from './file/GetFile'
-import { GoCQHTTGetForwardMsgAction } from './go-cqhttp/GetForwardMsg'
+import { GetForwardMsg } from './go-cqhttp/GetForwardMsg'
 import { GetCookies } from './user/GetCookie'
 import { SetMsgEmojiLike } from './msg/SetMsgEmojiLike'
 import { ForwardFriendSingleMsg, ForwardGroupSingleMsg } from './msg/ForwardSingleMsg'
 import { GetGroupEssence } from './group/GetGroupEssence'
 import { GetGroupHonorInfo } from './group/GetGroupHonorInfo'
-import { GoCQHTTHandleQuickOperation } from './go-cqhttp/QuickOperation'
-import GoCQHTTPSetEssenceMsg from './go-cqhttp/SetEssenceMsg'
-import GoCQHTTPDelEssenceMsg from './go-cqhttp/DelEssenceMsg'
+import { HandleQuickOperation } from './go-cqhttp/QuickOperation'
+import { SetEssenceMsg } from './go-cqhttp/SetEssenceMsg'
+import { DelEssenceMsg } from './go-cqhttp/DelEssenceMsg'
 import GetEvent from './llonebot/GetEvent'
-import { GoCQHTTPDelGroupFile } from './go-cqhttp/DelGroupFile'
-import { GoCQHTTPGetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
-import { GoCQHTTPCreateGroupFileFolder } from './go-cqhttp/CreateGroupFileFolder'
-import { GoCQHTTPDelGroupFolder } from './go-cqhttp/DelGroupFolder'
+import { DelGroupFile } from './go-cqhttp/DelGroupFile'
+import { GetGroupSystemMsg } from './go-cqhttp/GetGroupSystemMsg'
+import { CreateGroupFileFolder } from './go-cqhttp/CreateGroupFileFolder'
+import { DelGroupFolder } from './go-cqhttp/DelGroupFolder'
+import { GetGroupAtAllRemain } from './go-cqhttp/GetGroupAtAllRemain'
 
 export function initActionMap(adapter: Adapter) {
   const actionHandlers = [
@@ -105,24 +106,25 @@ export function initActionMap(adapter: Adapter) {
     //以下为go-cqhttp api
     new GetGroupEssence(adapter),
     new GetGroupHonorInfo(adapter),
-    new GoCQHTTPSendForwardMsg(adapter),
-    new GoCQHTTPSendGroupForwardMsg(adapter),
-    new GoCQHTTPSendPrivateForwardMsg(adapter),
-    new GoCQHTTPGetStrangerInfo(adapter),
-    new GoCQHTTPDownloadFile(adapter),
+    new SendForwardMsg(adapter),
+    new SendGroupForwardMsg(adapter),
+    new SendPrivateForwardMsg(adapter),
+    new GetStrangerInfo(adapter),
+    new DownloadFile(adapter),
     new GetGuildList(adapter),
-    new GoCQHTTPMarkMsgAsRead(adapter),
-    new GoCQHTTPUploadGroupFile(adapter),
-    new GoCQHTTPUploadPrivateFile(adapter),
-    new GoCQHTTPGetGroupMsgHistory(adapter),
-    new GoCQHTTGetForwardMsgAction(adapter),
-    new GoCQHTTHandleQuickOperation(adapter),
-    new GoCQHTTPSetEssenceMsg(adapter),
-    new GoCQHTTPDelEssenceMsg(adapter),
-    new GoCQHTTPDelGroupFile(adapter),
-    new GoCQHTTPGetGroupSystemMsg(adapter),
-    new GoCQHTTPCreateGroupFileFolder(adapter),
-    new GoCQHTTPDelGroupFolder(adapter)
+    new MarkMsgAsRead(adapter),
+    new UploadGroupFile(adapter),
+    new UploadPrivateFile(adapter),
+    new GetGroupMsgHistory(adapter),
+    new GetForwardMsg(adapter),
+    new HandleQuickOperation(adapter),
+    new SetEssenceMsg(adapter),
+    new DelEssenceMsg(adapter),
+    new DelGroupFile(adapter),
+    new GetGroupSystemMsg(adapter),
+    new CreateGroupFileFolder(adapter),
+    new DelGroupFolder(adapter),
+    new GetGroupAtAllRemain(adapter)
   ]
   const actionMap = new Map<string, BaseAction<any, any>>()
   for (const action of actionHandlers) {

src/onebot11/action/msg/DeleteMsg.ts

@@ -11,13 +11,17 @@ class DeleteMsg extends BaseAction<Payload, void> {
 
   protected async _handle(payload: Payload) {
     if (!payload.message_id) {
-      throw Error('message_id不能为空')
+      throw new Error('参数message_id不能为空')
     }
     const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
-      throw `消息${payload.message_id}不存在`
+      throw new Error(`消息${payload.message_id}不存在`)
+    }
+    const data = await this.ctx.ntMsgApi.recallMsg(msg.Peer, [msg.MsgId])
+    if (data.result !== 0) {
+      this.ctx.logger.error('delete_msg', payload.message_id, data)
+      throw new Error(`消息撤回失败`)
     }
-    await this.ctx.ntMsgApi.recallMsg(msg.Peer, [msg.MsgId])
   }
 }
 

src/onebot11/action/msg/SendMsg.ts

@@ -48,16 +48,16 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
       }
     }
     if ((contextMode === ContextMode.Private || contextMode === ContextMode.Normal) && payload.user_id) {
-      const Uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
-      const isBuddy = await this.ctx.ntFriendApi.isBuddy(Uid!)
-      //console.log("[调试代码] UIN:", payload.user_id, " UID:", Uid, " IsBuddy:", isBuddy)
+      const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString())
+      if (!uid) throw new Error('无法获取用户信息')
+      const isBuddy = await this.ctx.ntFriendApi.isBuddy(uid)
       return {
         chatType: isBuddy ? ChatType.friend : ChatType.temp,
-        peerUid: Uid!,
-        guildId: payload.group_id?.toString() || '' //临时主动发起时需要传入群号
+        peerUid: uid,
+        guildId: isBuddy ? '' : payload.group_id?.toString() || ''
       }
     }
-    throw '请指定 group_id 或 user_id'
+    throw new Error('请指定 group_id 或 user_id')
   }
 
   protected async check(payload: OB11PostSendMsg): Promise<BaseCheckResult> {
@@ -160,6 +160,9 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
       }
     }
     const returnMsg = await sendMsg(this.ctx, peer, sendElements, deleteAfterSentFiles)
+    if (!returnMsg) {
+      throw new Error('消息发送失败')
+    }
     return { message_id: returnMsg.msgShortId! }
   }
 
@@ -251,9 +254,12 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
           // log("分割后的转发节点", sendElementsSplit)
           for (const eles of sendElementsSplit) {
             const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [], true)
+            if (!nodeMsg) {
+              this.ctx.logger.warn('转发节点生成失败', eles)
+              continue
+            }
             nodeMsgIds.push(nodeMsg.msgId)
             await this.ctx.sleep(400)
-            this.ctx.logger.info('转发节点生成成功', nodeMsg.msgId)
           }
           deleteAfterSentFiles.map((f) => fs.unlink(f, () => {
           }))

src/onebot11/action/types.ts

@@ -76,5 +76,6 @@ export enum ActionName {
   GoCQHTTP_DelGroupFile = 'delete_group_file',
   GoCQHTTP_GetGroupSystemMsg = 'get_group_system_msg',
   GoCQHTTP_CreateGroupFileFolder = 'create_group_file_folder',
-  GoCQHTTP_DelGroupFolder = 'delete_group_folder'
+  GoCQHTTP_DelGroupFolder = 'delete_group_folder',
+  GoCQHTTP_GetGroupAtAllRemain = 'get_group_at_all_remain'
 }

src/onebot11/helper/createMessage.ts

@@ -54,7 +54,7 @@ export async function createSendElements(
             let isAdmin: boolean = true
             if (groupCode) {
               try {
-                remainAtAllCount = (await ctx.ntGroupApi.getGroupAtAllRemainCount(groupCode)).atInfo
+                remainAtAllCount = (await ctx.ntGroupApi.getGroupRemainAtTimes(groupCode)).atInfo
                   .RemainAtAllCountForUin
                 ctx.logger.info(`群${groupCode}剩余at全体次数`, remainAtAllCount)
                 const self = await ctx.ntGroupApi.getGroupMember(groupCode, selfInfo.uin)
@@ -270,8 +270,10 @@ export async function sendMsg(
   const timeout = 10000 + (totalSize / 1024 / 256 * 1000)  // 10s Basic Timeout + PredictTime( For File 512kb/s )
   //log('设置消息超时时间', timeout)
   const returnMsg = await ctx.ntMsgApi.sendMsg(peer, sendElements, waitComplete, timeout)
-  returnMsg.msgShortId = MessageUnique.createMsg(peer, returnMsg.msgId)
-  ctx.logger.info('消息发送', returnMsg.msgShortId)
-  deleteAfterSentFiles.map(path => fsPromise.unlink(path))
-  return returnMsg
+  if (returnMsg) {
+    returnMsg.msgShortId = MessageUnique.createMsg(peer, returnMsg.msgId)
+    ctx.logger.info('消息发送', returnMsg.msgShortId)
+    deleteAfterSentFiles.map(path => fsPromise.unlink(path))
+    return returnMsg
+  }
 }

src/version.ts

@@ -1 +1 @@
-export const version = '3.31.3'
+export const version = '3.31.5'