Merge pull request #367 from LLOneBot/dev

3.30.5

.github/workflows/publish.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: install dependenies
         run: |

README.md

@@ -5,7 +5,7 @@ LiteLoaderQQNT 插件，实现 OneBot 11 协议，用于 QQ 机器人开发
 > [!CAUTION]\
 > **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本插件存在相关性的信息**
 
-TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
+TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 安装方法
 

manifest.json

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

package.json

@@ -25,7 +25,7 @@
     "fast-xml-parser": "^4.4.1",
     "file-type": "^19.4.1",
     "fluent-ffmpeg": "^2.1.3",
-    "minato": "^3.5.0",
+    "minato": "^3.5.1",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   },
@@ -41,5 +41,5 @@
     "vite": "^5.4.2",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.4.0"
+  "packageManager": "yarn@4.4.1"
 }

src/common/config.ts

@@ -5,8 +5,6 @@ import path from 'node:path'
 import { getSelfUin } from './data'
 import { DATA_DIR } from './utils'
 
-//export const HOOK_LOG = false
-
 export class ConfigUtil {
   private readonly configPath: string
   private config: Config | null = null

src/common/data.ts

@@ -1,45 +1,24 @@
 import {
-  type Friend,
   type GroupMember,
   type SelfInfo,
 } from '../ntqqapi/types'
 import { type LLOneBotError } from './types'
 import { NTQQGroupApi } from '../ntqqapi/api/group'
-import { log } from './utils/log'
 import { isNumeric } from './utils/helper'
-import { NTQQFriendApi, NTQQUserApi } from '../ntqqapi/api'
+import { NTQQUserApi } from '../ntqqapi/api'
 import { RawMessage } from '../ntqqapi/types'
 import { getConfigUtil } from './config'
-import { getBuildVersion } from './utils/QQBasicInfo'
 
-export let friends: Friend[] = []
 export const llonebotError: LLOneBotError = {
   ffmpegError: '',
   httpServerError: '',
   wsServerError: '',
   otherError: 'LLOneBot 未能正常启动，请检查日志查看错误',
 }
+
 // 群号 -> 群成员map(uid=>GroupMember)
 export const groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
 
-export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-  const filterKey: 'uin' | 'uid' = isNumeric(uinOrUid.toString()) ? 'uin' : 'uid'
-  const filterValue = uinOrUid
-  let friend = friends.find((friend) => friend[filterKey] === filterValue.toString())
-  if (!friend && getBuildVersion() < 26702) {
-    try {
-      const _friends = await NTQQFriendApi.getFriends(true)
-      friend = _friends.find((friend) => friend[filterKey] === filterValue.toString())
-      if (friend) {
-        friends.push(friend)
-      }
-    } catch (e: any) {
-      log('刷新好友列表失败', e.stack.toString())
-    }
-  }
-  return friend
-}
-
 export async function getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
   const groupCodeStr = groupCode.toString()
   const memberUinOrUidStr = memberUinOrUid.toString()

src/common/types.ts

@@ -12,10 +12,12 @@ export interface OB11Config {
   enableHttpHeart?: boolean
   enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
 }
+
 export interface CheckVersion {
   result: boolean
   version: string
 }
+
 export interface Config {
   enableLLOB: boolean
   ob11: OB11Config

src/ntqqapi/api/friend.ts

@@ -5,6 +5,7 @@ import { getSession } from '@/ntqqapi/wrapper'
 import { BuddyListReqType, NodeIKernelProfileService } from '../services'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { LimitedHashTable } from '@/common/utils/table'
+import { pick } from 'cosmokit'
 
 export class NTQQFriendApi {
   /** 大于或等于 26702 应使用 getBuddyV2 */
@@ -17,14 +18,14 @@ export class NTQQFriendApi {
         buddyList: Friend[]
       }[]
     }>({
-      methodName: NTMethod.FRIENDS,
-      args: [{ force_update: forced }, undefined],
+      className: NTClass.NODE_STORE_API,
+      methodName: 'getBuddyList',
       cbCmd: ReceiveCmdS.FRIENDS,
       afterFirstCmd: false,
     })
-    let _friends: Friend[] = []
-    for (const fData of data.data) {
-      _friends.push(...fData.buddyList)
+    const _friends: Friend[] = []
+    for (const item of data.data) {
+      _friends.push(...item.buddyList)
     }
     return _friends
   }
@@ -73,7 +74,7 @@ export class NTQQFriendApi {
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
       }>({
         className: NTClass.NODE_STORE_API,
         methodName: 'getBuddyList',
@@ -81,7 +82,11 @@ export class NTQQFriendApi {
         cbCmd: ReceiveCmdS.FRIENDS,
         afterFirstCmd: false,
       })
-      return Array.from(data.userSimpleInfos.values())
+      const categoryUids: Map<number, string[]> = new Map()
+      for (const item of data.buddyCategory) {
+        categoryUids.set(item.categoryId, item.buddyUids)
+      }
+      return Object.values(data.userSimpleInfos).filter(v => v.baseInfo && categoryUids.get(v.baseInfo.categoryId)?.includes(v.uid!))
     }
   }
 
@@ -102,7 +107,7 @@ export class NTQQFriendApi {
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
       }>({
         className: NTClass.NODE_STORE_API,
         methodName: 'getBuddyList',
@@ -110,9 +115,9 @@ export class NTQQFriendApi {
         cbCmd: ReceiveCmdS.FRIENDS,
         afterFirstCmd: false,
       })
-      data.userSimpleInfos.forEach((value, key) => {
-        retMap.set(value.uin!, value.uid!)
-      })
+      for (const item of Object.values(data.userSimpleInfos)) {
+        retMap.set(item.uin!, item.uid!)
+      }
     }
     return retMap
   }
@@ -141,7 +146,7 @@ export class NTQQFriendApi {
     } else {
       const data = await invoke<{
         buddyCategory: CategoryFriend[]
-        userSimpleInfos: Map<string, SimpleInfo>
+        userSimpleInfos: Record<string, SimpleInfo>
       }>({
         className: NTClass.NODE_STORE_API,
         methodName: 'getBuddyList',
@@ -149,16 +154,19 @@ export class NTQQFriendApi {
         cbCmd: ReceiveCmdS.FRIENDS,
         afterFirstCmd: false,
       })
-      return Array.from(data.userSimpleInfos).map(([key, value]) => {
-        if (value.baseInfo) {
+      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
+      for (const item of data.buddyCategory) {
+        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
+      }
+      return Object.values(data.userSimpleInfos)
+        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
+        .map(value => {
           return {
             ...value,
             categoryId: value.baseInfo.categoryId,
-            categroyName: data.buddyCategory.find(e => e.categoryId === value.baseInfo.categoryId)?.categroyName
+            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
           }
-        }
-        return value
-      })
+        })
     }
   }
 

src/ntqqapi/api/group.ts

@@ -98,6 +98,10 @@ export class NTQQGroupApi {
         )
       return notifies
     } else {
+      invoke({
+        methodName: ReceiveCmdS.GROUP_NOTIFY,
+        classNameIsRegister: true,
+      })
       return (await invoke<GroupNotifies>({
         methodName: NTMethod.GET_GROUP_NOTICE,
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,

src/ntqqapi/api/msg.ts

@@ -1,5 +1,5 @@
 import { invoke, NTMethod } from '../ntcall'
-import { GeneralCallResult } from '../services'
+import { GeneralCallResult, TmpChatInfoApi } from '../services'
 import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
 import { getSelfNick, getSelfUid } from '../../common/data'
 import { getSession } from '@/ntqqapi/wrapper'
@@ -16,10 +16,22 @@ function generateMsgId() {
 }
 
 export class NTQQMsgApi {
-  /** 27187 TODO */
   static async getTempChatInfo(chatType: ChatType2, peerUid: string) {
     const session = getSession()
-    return session?.getMsgService().getTempChatInfo(chatType, peerUid)
+    if (session) {
+      return session.getMsgService().getTempChatInfo(chatType, peerUid)
+    } else {
+      return await invoke<TmpChatInfoApi>({
+        methodName: 'nodeIKernelMsgService/getTempChatInfo',
+        args: [
+          {
+            chatType,
+            peerUid,
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {

src/ntqqapi/api/user.ts

@@ -1,11 +1,11 @@
 import { invoke, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
 import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
-import { friends, groupMembers, getSelfUin } from '@/common/data'
+import { groupMembers, getSelfUin } from '@/common/data'
 import { CacheClassFuncAsync, getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { NodeIKernelProfileService, UserDetailSource, ProfileBizType } from '../services'
+import { NodeIKernelProfileService, UserDetailSource, ProfileBizType, forceFetchClientKeyRetType } from '../services'
 import { NodeIKernelProfileListener } from '../listeners'
 import { NTEventDispatch } from '@/common/utils/EventTask'
 import { NTQQFriendApi } from './friend'
@@ -146,39 +146,37 @@ export class NTQQUserApi {
     return (hash & 0x7fffffff).toString()
   }
 
-  /** 27187 TODO */
-  static async getPSkey(domains: string[]): Promise<Map<string, string>> {
-    const session = getSession()
-    const res = await session?.getTipOffService().getPskey(domains, true)
-    if (res?.result !== 0) {
-      throw new Error(`获取Pskey失败: ${res?.errMsg}`)
-    }
-    return res.domainPskeyMap
-  }
-
-  /** 27187 TODO */
   static async like(uid: string, count = 1) {
     const session = getSession()
-    return session?.getProfileLikeService().setBuddyProfileLike({
-      friendUid: uid,
-      sourceId: 71,
-      doLikeCount: count,
-      doLikeTollCount: 0
-    })
+    if (session) {
+      return session.getProfileLikeService().setBuddyProfileLike({
+        friendUid: uid,
+        sourceId: 71,
+        doLikeCount: count,
+        doLikeTollCount: 0
+      })
+    } else {
+      return await invoke<GeneralCallResult & { succCounts: number }>({
+        methodName: 'nodeIKernelProfileLikeService/setBuddyProfileLike',
+        args: [
+          {
+            doLikeUserInfo: {
+              friendUid: uid,
+              sourceId: 71,
+              doLikeCount: count,
+              doLikeTollCount: 0
+            }
+          },
+          null,
+        ],
+      })
+    }
   }
 
   static async getUidByUinV1(Uin: string) {
     const session = getSession()
     // 通用转换开始尝试
     let uid = (await session?.getUixConvertService().getUid([Uin]))?.uidInfo.get(Uin)
-    // Uid 好友转
-    if (!uid) {
-      friends.forEach((t) => {
-        if (t.uin == Uin) {
-          uid = t.uid
-        }
-      })
-    }
     //Uid 群友列表转
     if (!uid) {
       for (let groupMembersList of groupMembers.values()) {
@@ -283,14 +281,6 @@ export class NTQQUserApi {
         [Uid]
       )
     let uin = ret.uinInfo.get(Uid)
-    if (!uin) {
-      //从Buddy缓存获取Uin
-      friends.forEach((t) => {
-        if (t.uid == Uid) {
-          uin = t.uin
-        }
-      })
-    }
     if (!uin) {
       uin = (await NTQQUserApi.getUserDetailInfo(Uid)).uin //从QQ Native 转换
     }
@@ -348,9 +338,17 @@ export class NTQQUserApi {
     return await NTQQUserApi.getUinByUidV1(Uid)
   }
 
-  /** 27187 TODO */
   static async forceFetchClientKey() {
     const session = getSession()
-    return await session?.getTicketService().forceFetchClientKey('')
+    if (session) {
+      return await session.getTicketService().forceFetchClientKey('')
+    } else {
+      return await invoke<forceFetchClientKeyRetType>({
+        methodName: 'nodeIKernelTicketService/forceFetchClientKey',
+        args: [{
+          domain: ''
+        }, null],
+      })
+    }
   }
 }

src/ntqqapi/api/webapi.ts

@@ -178,29 +178,6 @@ export class WebApi {
     return memberData
   }
 
-  static async setGroupNotice(GroupCode: string, Content: string = '') {
-    //https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=${bkn}
-    //qid=${群号}&bkn=${bkn}&text=${内容}&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}
-    const _Pskey = (await NTQQUserApi.getPSkey(['qun.qq.com']))['qun.qq.com']
-    const _Skey = await NTQQUserApi.getSkey()
-    const CookieValue = 'p_skey=' + _Pskey + '; skey=' + _Skey + '; p_uin=o' + getSelfUin()
-    let ret: any = undefined
-    //console.log(CookieValue)
-    if (!_Skey || !_Pskey) {
-      //获取Cookies失败
-      return undefined
-    }
-    const Bkn = WebApi.genBkn(_Skey)
-    const data = 'qid=' + GroupCode + '&bkn=' + Bkn + '&text=' + Content + '&pinned=0&type=1&settings={"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}'
-    const url = 'https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?bkn=' + Bkn
-    try {
-      ret = await RequestUtil.HttpGetJson<any>(url, 'GET', '', { 'Cookie': CookieValue })
-      return ret
-    } catch (e) {
-      return undefined
-    }
-  }
-
   static genBkn(sKey: string) {
     sKey = sKey || '';
     let hash = 5381;
@@ -220,7 +197,7 @@ export class WebApi {
       let res = '';
       let resJson;
       try {
-        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue });
+        res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr });
         const match = res.match(/window\.__INITIAL_STATE__=(.*?);/);
         if (match) {
           resJson = JSON.parse(match[1].trim());
@@ -237,7 +214,8 @@ export class WebApi {
     }
 
     let HonorInfo: any = { group_id: groupCode };
-    const CookieValue = (await NTQQUserApi.getCookies('qun.qq.com')).cookies;
+    const cookieObject = await NTQQUserApi.getCookies('qun.qq.com')
+    const cookieStr = Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
 
     if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
       try {

src/ntqqapi/hook.ts

@@ -1,17 +1,16 @@
 import type { BrowserWindow } from 'electron'
 import { NTClass, NTMethod } from './ntcall'
-import { NTQQMsgApi } from './api/msg'
+import { NTQQMsgApi, NTQQFriendApi } from './api'
 import {
   CategoryFriend,
   ChatType,
   GroupMember,
   GroupMemberRole,
   RawMessage,
-  SimpleInfo, User,
+  SimpleInfo,
+  User
 } from './types'
 import {
-  friends,
-  getFriend,
   getGroupMember,
   setSelfInfo
 } from '@/common/data'
@@ -224,116 +223,7 @@ export function removeReceiveHook(id: string) {
   receiveHooks.splice(index, 1)
 }
 
-//let activatedGroups: string[] = []
-
-/*async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
-  for (let group of _groups) {
-    log('update group', group.groupCode)
-    if (group.privilegeFlag === 0) {
-      deleteGroup(group.groupCode)
-      continue
-    }
-    //log('update group', group)
-    NTQQMsgApi.activateChat({ peerUid: group.groupCode, chatType: ChatType.group }).then().catch(log)
-    let existGroup = groups.find((g) => g.groupCode == group.groupCode)
-    if (existGroup) {
-      Object.assign(existGroup, group)
-    } else {
-      groups.push(group)
-      existGroup = group
-    }
-
-    if (needUpdate) {
-      const members = await NTQQGroupApi.getGroupMembers(group.groupCode)
-
-      if (members) {
-        existGroup.members = Array.from(members.values())
-      }
-    }
-  }
-}*/
-
-/*async function processGroupEvent(payload: { groupList: Group[] }) {
-  try {
-    const newGroupList = payload.groupList
-    for (const group of newGroupList) {
-      let existGroup = groups.find((g) => g.groupCode == group.groupCode)
-      if (existGroup) {
-        if (existGroup.memberCount > group.memberCount) {
-          log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`)
-          const oldMembers = existGroup.members
-
-          await sleep(200) // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-          const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode)
-
-          group.members = Array.from(newMembers.values())
-          const newMembersSet = new Set<string>() // 建立索引降低时间复杂度
-
-          for (const member of newMembers) {
-            newMembersSet.add(member[1].uin)
-          }
-
-          // 判断bot是否是管理员，如果是管理员不需要从这里得知有人退群，这里的退群无法得知是主动退群还是被踢
-          const selfUin = getSelfUin()
-          const bot = await getGroupMember(group.groupCode, selfUin)
-          if (bot?.role == GroupMemberRole.admin || bot?.role == GroupMemberRole.owner) {
-            continue
-          }
-          for (const member of oldMembers) {
-            if (!newMembersSet.has(member.uin) && member.uin != selfUin) {
-              postOb11Event(
-                new OB11GroupDecreaseEvent(
-                  parseInt(group.groupCode),
-                  parseInt(member.uin),
-                  parseInt(member.uin),
-                  'leave',
-                ),
-              )
-              break
-            }
-          }
-        }
-        if (group.privilegeFlag === 0) {
-          deleteGroup(group.groupCode)
-        }
-      }
-    }
-
-    updateGroups(newGroupList, false).then()
-  } catch (e: any) {
-    updateGroups(payload.groupList).then()
-    log('更新群信息错误', e.stack.toString())
-  }
-}*/
-
 export async function startHook() {
-
-  // 群列表变动
-  /*registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-      updateGroups(payload.groupList).then()
-    }
-    else {
-      if (process.platform == 'win32') {
-        processGroupEvent(payload).then()
-      }
-    }
-  })
-  registerReceiveHook<{ groupList: Group[]; updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动, store", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-      updateGroups(payload.groupList).then()
-    }
-    else {
-      if (process.platform != 'win32') {
-        processGroupEvent(payload).then()
-      }
-    }
-  })*/
-
   registerReceiveHook<{
     groupCode: string
     dataSource: number
@@ -402,13 +292,6 @@ export async function startHook() {
     log('好友列表变动', friendList.length)
     for (let friend of friendList) {
       NTQQMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend }).then()
-      let existFriend = friends.find((f) => f.uin == friend.uin)
-      if (!existFriend) {
-        friends.push(friend)
-      }
-      else {
-        Object.assign(existFriend, friend)
-      }
     }
   })
 
@@ -506,11 +389,8 @@ export async function startHook() {
     if (isNumeric(peerUid)) {
       chatType = ChatType.group
     }
-    else {
-      // 检查是否好友
-      if (!(await getFriend(peerUid))) {
-        chatType = ChatType.temp
-      }
+    else if (!(await NTQQFriendApi.isBuddy(peerUid))) {
+      chatType = ChatType.temp
     }
     const peer = { peerUid, chatType }
     await sleep(1000)

src/ntqqapi/types/user.ts

@@ -82,7 +82,8 @@ export interface CategoryFriend {
   categroyName: string
   categroyMbCount: number
   onlineCount: number
-  buddyList: User[]
+  buddyList: User[] // V1
+  buddyUids: string[]
 }
 
 export interface CoreInfo {

src/onebot11/action/file/GetFile.ts

@@ -63,7 +63,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
       } else if (fileCache[0].elementType === ElementType.VIDEO) {
         res.url = await NTQQFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
       }
-      if (enableLocalFile2Url && downloadPath && res.file === res.url) {
+      if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {
           res.base64 = await fsPromise.readFile(downloadPath, 'base64')
         } catch (e) {

src/onebot11/action/user/GetCookie.ts

@@ -15,10 +15,13 @@ export class GetCookies extends BaseAction<Payload, Response> {
   actionName = ActionName.GetCookies
 
   protected async _handle(payload: Payload) {
+    if (!payload.domain) {
+      throw '缺少参数 domain'
+    }
     const cookiesObject = await NTQQUserApi.getCookies(payload.domain)
     //把获取到的cookiesObject转换成 k=v; 格式字符串拼接在一起
     const cookies = Object.entries(cookiesObject).map(([key, value]) => `${key}=${value}`).join('; ')
-    const bkn = WebApi.genBkn(cookiesObject.p_skey)
+    const bkn = cookiesObject.skey ? WebApi.genBkn(cookiesObject.skey) : ''
     return { cookies, bkn }
   }
 }

src/onebot11/action/user/GetFriendList.ts

@@ -1,7 +1,6 @@
 import BaseAction from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Constructor } from '../../constructor'
-import { friends } from '@/common/data'
 import { ActionName } from '../types'
 import { NTQQFriendApi } from '@/ntqqapi/api'
 import { getBuildVersion } from '@/common/utils/QQBasicInfo'
@@ -14,24 +13,17 @@ export class GetFriendList extends BaseAction<Payload, OB11User[]> {
   actionName = ActionName.GetFriendList
 
   protected async _handle(payload: Payload) {
+    const refresh = payload?.no_cache === true || payload?.no_cache === 'true'
     if (getBuildVersion() >= 26702) {
-      return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(payload?.no_cache === true || payload?.no_cache === 'true'))
+      return OB11Constructor.friendsV2(await NTQQFriendApi.getBuddyV2(refresh))
     }
-    if (friends.length === 0 || payload?.no_cache === true || payload?.no_cache === 'true') {
-      const _friends = await NTQQFriendApi.getFriends(true)
-      // log('强制刷新好友列表，结果: ', _friends)
-      if (_friends.length > 0) {
-        friends.length = 0
-        friends.push(..._friends)
-      }
-    }
-    return OB11Constructor.friends(friends)
+    return OB11Constructor.friends(await NTQQFriendApi.getFriends(refresh))
   }
 }
 
 // extend
 export class GetFriendWithCategory extends BaseAction<void, any> {
-  actionName = ActionName.GetFriendsWithCategory;
+  actionName = ActionName.GetFriendsWithCategory
 
   protected async _handle(payload: void) {
     if (getBuildVersion() >= 26702) {

src/onebot11/action/user/SendLike.ts

@@ -3,8 +3,8 @@ import { ActionName } from '../types'
 import { NTQQUserApi } from '@/ntqqapi/api'
 
 interface Payload {
-  user_id: number
-  times: number
+  user_id: number | string
+  times: number | string
 }
 
 export default class SendLike extends BaseAction<Payload, null> {
@@ -14,7 +14,7 @@ export default class SendLike extends BaseAction<Payload, null> {
     try {
       const qq = payload.user_id.toString()
       const uid: string = await NTQQUserApi.getUidByUin(qq) || ''
-      const result = await NTQQUserApi.like(uid, parseInt(payload.times?.toString()) || 1)
+      const result = await NTQQUserApi.like(uid, +payload.times || 1)
       if (result?.result !== 0) {
         throw Error(result?.errMsg)
       }

src/onebot11/constructor.ts

@@ -49,6 +49,7 @@ import { OB11GroupRecallNoticeEvent } from './event/notice/OB11GroupRecallNotice
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent'
 import { OB11BaseNoticeEvent } from './event/notice/OB11BaseNoticeEvent'
 import { OB11GroupEssenceEvent } from './event/notice/OB11GroupEssenceEvent'
+import { omit } from 'cosmokit'
 
 export class OB11Constructor {
   static async message(msg: RawMessage): Promise<OB11Message> {
@@ -661,7 +662,7 @@ export class OB11Constructor {
     for (const friend of friends) {
       const sexValue = this.sex(friend.baseInfo.sex!)
       data.push({
-        ...friend.baseInfo,
+        ...omit(friend.baseInfo, ['richBuffer']),
         ...friend.coreInfo,
         user_id: parseInt(friend.coreInfo.uin),
         nickname: friend.coreInfo.nick,

src/version.ts

@@ -1 +1 @@
-export const version = '3.30.0'
+export const version = '3.30.5'