refactor

src/ntqqapi/api/friend.ts

@@ -1,8 +1,7 @@
-import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
+import { Friend, FriendV2, SimpleInfo, CategoryFriend, BuddyListReqType } from '../types'
 import { ReceiveCmdS } from '../hook'
 import { invoke, NTMethod, NTClass } from '../ntcall'
 import { getSession } from '@/ntqqapi/wrapper'
-import { BuddyListReqType } from '../services'
 import { Dict, pick } from 'cosmokit'
 import { Service, Context } from 'cordis'
 

src/ntqqapi/api/group.ts

@@ -65,32 +65,30 @@ export class NTQQGroupApi extends Service {
     return result.result.infos
   }
 
-  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
-    const groupCodeStr = groupCode.toString()
-    const memberUinOrUidStr = memberUinOrUid.toString()
-    if (!this.groupMembers.has(groupCodeStr)) {
+  async getGroupMember(groupCode: string, memberUinOrUid: string) {
+    if (!this.groupMembers.has(groupCode)) {
       try {
         // 更新群成员列表
-        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+        this.groupMembers.set(groupCode, await this.getGroupMembers(groupCode))
       }
       catch (e) {
-        return null
+        return
       }
     }
-    let members = this.groupMembers.get(groupCodeStr)!
+    let members = this.groupMembers.get(groupCode)!
     const getMember = () => {
       let member: GroupMember | undefined = undefined
-      if (isNumeric(memberUinOrUidStr)) {
-        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
+      if (isNumeric(memberUinOrUid)) {
+        member = Array.from(members.values()).find(member => member.uin === memberUinOrUid)
       } else {
-        member = members.get(memberUinOrUidStr)
+        member = members.get(memberUinOrUid)
       }
       return member
     }
     let member = getMember()
     if (!member) {
-      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
-      members = this.groupMembers.get(groupCodeStr)!
+      this.groupMembers.set(groupCode, await this.getGroupMembers(groupCode))
+      members = this.groupMembers.get(groupCode)!
       member = getMember()
     }
     return member

src/ntqqapi/api/user.ts

@@ -1,9 +1,8 @@
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg, UserDetailSource, ProfileBizType } from '../types'
 import { invoke } from '../ntcall'
-import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
 import { getBuildVersion } from '@/common/utils'
 import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { UserDetailSource, ProfileBizType } from '../services'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
@@ -157,30 +156,24 @@ export class NTQQUserApi extends Service {
     return uid
   }
 
-  async getUidByUinV2(uin: string) {
-    const session = getSession()
-    if (session) {
-      let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
-      if (uid) return uid
-      uid = (await session.getProfileService().getUidByUin('FriendsServiceImpl', [uin])).get(uin)
-      if (uid) return uid
-      uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
-      if (uid) return uid
-    } else {
+  async getUidByUinV2(uin: string, groupCode?: string) {
     let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [uin] }])).uids.get(uin)
     if (uid) return uid
     uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
     if (uid) return uid
     uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
     if (uid) return uid
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid
+    if (!unveifyUid.includes('*')) return unveifyUid
+    if (groupCode) {
+      const member = await this.ctx.ntGroupApi.getGroupMember(groupCode, uin)
+      return member?.uid
     }
-    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid //从QQ Native 特殊转换
-    if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  async getUidByUin(uin: string) {
+  async getUidByUin(uin: string, groupCode?: string) {
     if (getBuildVersion() >= 26702) {
-      return this.getUidByUinV2(uin)
+      return this.getUidByUinV2(uin, groupCode)
     }
     return this.getUidByUinV1(uin)
   }
@@ -249,7 +242,7 @@ export class NTQQUserApi extends Service {
     if (session) {
       return await session.getTicketService().forceFetchClientKey('')
     } else {
-      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
+      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }, null])
     }
   }
 

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -1,10 +1,6 @@
+import { BuddyListReqType } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-export enum BuddyListReqType {
-  KNOMAL,
-  KLETTER
-}
-
 export interface NodeIKernelBuddyService {
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
     data: {

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,36 +1,10 @@
-import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-export interface QueryMsgsParams {
-  chatInfo: Peer
-  filterMsgType: []
-  filterSendersUid: string[]
-  filterMsgFromTime: string
-  filterMsgToTime: string
-  pageLimit: number
-  isReverseOrder: boolean
-  isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi {
-  errMsg: string
-  result: number
-  tmpChatInfo?: TmpChatInfo
-}
-
-export interface TmpChatInfo {
-  chatType: number
-  fromNick: string
-  groupCode: string
-  peerUid: string
-  sessionType: number
-  sig: string
-}
-
 export interface NodeIKernelMsgService {
   generateMsgUniqueId(chatType: number, time: string): string
 
-  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,19 +1,6 @@
 import { SimpleInfo } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UserDetailSource {
-  KDB,
-  KSERVER
-}
-
-export enum ProfileBizType {
-  KALL,
-  KBASEEXTEND,
-  KVAS,
-  KQZONE,
-  KOTHER
-}
-
 export interface NodeIKernelProfileService {
   getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
 

src/ntqqapi/types/msg.ts

@@ -1,4 +1,5 @@
 import { GroupMemberRole } from './group'
+import { GeneralCallResult } from '../services'
 
 export interface GetFileListParam {
   sortType: number
@@ -565,3 +566,25 @@ export interface OnGroupFileInfoUpdateParams {
   nextIndex: number
   reqId: number
 }
+
+export interface QueryMsgsParams {
+  chatInfo: Peer
+  filterMsgType: []
+  filterSendersUid: string[]
+  filterMsgFromTime: string
+  filterMsgToTime: string
+  pageLimit: number
+  isReverseOrder: boolean
+  isIncludeCurrent: boolean
+}
+
+export interface TmpChatInfoApi extends GeneralCallResult {
+  tmpChatInfo?: {
+    chatType: number
+    fromNick: string
+    groupCode: string
+    peerUid: string
+    sessionType: number
+    sig: string
+  }
+}

src/ntqqapi/types/user.ts

@@ -344,3 +344,21 @@ export interface UserDetailInfoByUin {
     vipNameColorId: string
   }
 }
+
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
+
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}

src/onebot11/action/group/SetGroupAddRequest.ts

@@ -1,22 +1,25 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupRequestOperateTypes } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
 interface Payload {
   flag: string
-  approve?: boolean | string
+  approve: boolean
   reason?: string
 }
 
 export default class SetGroupAddRequest extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAddRequest
+  payloadSchema = Schema.object({
+    flag: Schema.string().required(),
+    approve: Schema.boolean().default(true),
+    reason: Schema.string()
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const flag = payload.flag.toString()
-    const approve = payload.approve?.toString() !== 'false'
     await this.ctx.ntGroupApi.handleGroupRequest(
-      flag,
-      approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
+      payload.flag,
+      payload.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
       payload.reason
     )
     return null

src/onebot11/action/group/SetGroupAdmin.ts

@@ -1,26 +1,30 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { GroupMemberRole } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   enable: boolean
 }
 
 export default class SetGroupAdmin extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupAdmin
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    enable: Schema.boolean().default(true)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    const enable = payload.enable.toString() === 'true'
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
     await this.ctx.ntGroupApi.setMemberRole(
-      payload.group_id.toString(),
-      member.uid,
-      enable ? GroupMemberRole.admin : GroupMemberRole.normal,
+      groupCode,
+      uid,
+      payload.enable ? GroupMemberRole.admin : GroupMemberRole.normal
     )
     return null
   }

src/onebot11/action/group/SetGroupBan.ts

@@ -1,22 +1,27 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   duration: number
 }
 
 export default class SetGroupBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupBan
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    duration: Schema.number().default(30 * 60)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.banMember(payload.group_id.toString(), [
-      { uid: member.uid, timeStamp: parseInt(payload.duration.toString()) },
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.banMember(groupCode, [
+      { uid, timeStamp: payload.duration },
     ])
     return null
   }

src/onebot11/action/group/SetGroupCard.ts

@@ -1,21 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   card: string
 }
 
 export default class SetGroupCard extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupCard
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    card: Schema.string().default('')
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.setMemberCard(payload.group_id.toString(), member.uid, payload.card || '')
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.setMemberCard(groupCode, uid, payload.card)
     return null
   }
 }

src/onebot11/action/group/SetGroupKick.ts

@@ -1,21 +1,26 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  user_id: number
+  group_id: number | string
+  user_id: number | string
   reject_add_request: boolean
 }
 
 export default class SetGroupKick extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupKick
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    reject_add_request: Schema.boolean().default(false)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const member = await this.ctx.ntGroupApi.getGroupMember(payload.group_id, payload.user_id)
-    if (!member) {
-      throw `群成员${payload.user_id}不存在`
-    }
-    await this.ctx.ntGroupApi.kickMember(payload.group_id.toString(), [member.uid], !!payload.reject_add_request)
+    const groupCode = payload.group_id.toString()
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin, groupCode)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntGroupApi.kickMember(groupCode, [uid], payload.reject_add_request)
     return null
   }
 }

src/onebot11/action/group/SetGroupLeave.ts

@@ -1,20 +1,19 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
-  is_dismiss: boolean
+  group_id: number | string
+  is_dismiss?: boolean
 }
 
-export default class SetGroupLeave extends BaseAction<Payload, void> {
+export default class SetGroupLeave extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupLeave
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    try {
     await this.ctx.ntGroupApi.quitGroup(payload.group_id.toString())
-    } catch (e) {
-      this.ctx.logger.error('退群失败', e)
-      throw e
-    }
+    return null
   }
 }

src/onebot11/action/group/SetGroupName.ts

@@ -1,13 +1,17 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   group_name: string
 }
 
 export default class SetGroupName extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupName
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    group_name: Schema.string().required()
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
     await this.ctx.ntGroupApi.setGroupName(payload.group_id.toString(), payload.group_name)

src/onebot11/action/group/SetGroupWholeBan.ts

@@ -1,17 +1,20 @@
-import { BaseAction } from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: number
+  group_id: number | string
   enable: boolean
 }
 
 export default class SetGroupWholeBan extends BaseAction<Payload, null> {
   actionName = ActionName.SetGroupWholeBan
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    enable: Schema.boolean().default(true)
+  })
 
   protected async _handle(payload: Payload): Promise<null> {
-    const enable = payload.enable.toString() === 'true'
-    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), enable)
+    await this.ctx.ntGroupApi.banGroup(payload.group_id.toString(), payload.enable)
     return null
   }
 }