mirror of
https://github.com/NapNeko/NapCatQQ.git
synced 2025-07-19 12:03:37 +00:00
feat: doubt friends支持
This commit is contained in:
@@ -89,4 +89,28 @@ export class NTQQFriendApi {
|
|||||||
async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
|
async handleDoubtFriendRequest(friendUid: string, str1: string = '', str2: string = '') {
|
||||||
this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
|
this.context.session.getBuddyService().approvalDoubtBuddyReq(friendUid, str1, str2);
|
||||||
}
|
}
|
||||||
|
async getDoubtFriendRequest(count: number) {
|
||||||
|
let date = Date.now().toString();
|
||||||
|
const [, ret] = await this.core.eventWrapper.callNormalEventV2(
|
||||||
|
'NodeIKernelBuddyService/getDoubtBuddyReq',
|
||||||
|
'NodeIKernelBuddyListener/onDoubtBuddyReqChange',
|
||||||
|
[date, count, ''],
|
||||||
|
() => true,
|
||||||
|
(data) => data.reqId === date
|
||||||
|
);
|
||||||
|
let requests = Promise.all(ret.doubtList.map(async (item) => {
|
||||||
|
return {
|
||||||
|
flag: item.uid, //注意强制String 非isNumeric 不遵守则不符合设计
|
||||||
|
uin: await this.core.apis.UserApi.getUinByUidV2(item.uid) ?? 0,// 信息字段
|
||||||
|
nick: item.nick, // 信息字段 这个不是nickname 可能是来源的群内的昵称
|
||||||
|
source: item.source, // 信息字段
|
||||||
|
reason: item.reason, // 信息字段
|
||||||
|
msg: item.msg, // 信息字段
|
||||||
|
group_code: item.groupCode, // 信息字段
|
||||||
|
time: item.reqTime, // 信息字段
|
||||||
|
type: 'doubt' //保留字段
|
||||||
|
};
|
||||||
|
}))
|
||||||
|
return requests;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -106,7 +106,7 @@ export interface NodeIKernelBuddyService {
|
|||||||
|
|
||||||
getAddMeSetting(): unknown;
|
getAddMeSetting(): unknown;
|
||||||
|
|
||||||
getDoubtBuddyReq(reqId: string, num: number): Promise<GeneralCallResult>;
|
getDoubtBuddyReq(reqId: string, num: number,uk:string): Promise<GeneralCallResult>;
|
||||||
|
|
||||||
getDoubtBuddyUnreadNum(): number;
|
getDoubtBuddyUnreadNum(): number;
|
||||||
|
|
||||||
|
@@ -116,10 +116,14 @@ import { GetRkeyServer } from './packet/GetRkeyServer';
|
|||||||
import { GetRkeyEx } from './packet/GetRkeyEx';
|
import { GetRkeyEx } from './packet/GetRkeyEx';
|
||||||
import { CleanCache } from './system/CleanCache';
|
import { CleanCache } from './system/CleanCache';
|
||||||
import SetFriendRemark from './user/SetFriendRemark';
|
import SetFriendRemark from './user/SetFriendRemark';
|
||||||
|
import { SetDoubtFriendsAddRequest } from './new/SetDoubtFriendsAddRequest';
|
||||||
|
import { GetDoubtFriendsAddRequest } from './new/GetDoubtFriendsAddRequest';
|
||||||
|
|
||||||
export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
|
||||||
|
|
||||||
const actionHandlers = [
|
const actionHandlers = [
|
||||||
|
new SetDoubtFriendsAddRequest(obContext, core),
|
||||||
|
new GetDoubtFriendsAddRequest(obContext, core),
|
||||||
new SetFriendRemark(obContext, core),
|
new SetFriendRemark(obContext, core),
|
||||||
new GetRkeyEx(obContext, core),
|
new GetRkeyEx(obContext, core),
|
||||||
new GetRkeyServer(obContext, core),
|
new GetRkeyServer(obContext, core),
|
||||||
|
18
src/onebot/action/new/GetDoubtFriendsAddRequest.ts
Normal file
18
src/onebot/action/new/GetDoubtFriendsAddRequest.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
|
import { ActionName } from '@/onebot/action/router';
|
||||||
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
|
|
||||||
|
const SchemaData = Type.Object({
|
||||||
|
count: Type.Number({ default: 50 }),
|
||||||
|
});
|
||||||
|
|
||||||
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
|
export class GetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
|
||||||
|
override actionName = ActionName.GetDoubtFriendsAddRequest;
|
||||||
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
|
async _handle(payload: Payload) {
|
||||||
|
return await this.core.apis.FriendApi.getDoubtFriendRequest(payload.count);
|
||||||
|
}
|
||||||
|
}
|
21
src/onebot/action/new/SetDoubtFriendsAddRequest.ts
Normal file
21
src/onebot/action/new/SetDoubtFriendsAddRequest.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { OneBotAction } from '@/onebot/action/OneBotAction';
|
||||||
|
import { ActionName } from '@/onebot/action/router';
|
||||||
|
import { Static, Type } from '@sinclair/typebox';
|
||||||
|
|
||||||
|
const SchemaData = Type.Object({
|
||||||
|
flag: Type.String(),
|
||||||
|
//注意强制String 非isNumeric 不遵守则不符合设计
|
||||||
|
approve: Type.Boolean({ default: true }),
|
||||||
|
//该字段没有语义 仅做保留 强制为True
|
||||||
|
});
|
||||||
|
|
||||||
|
type Payload = Static<typeof SchemaData>;
|
||||||
|
|
||||||
|
export class SetDoubtFriendsAddRequest extends OneBotAction<Payload, unknown> {
|
||||||
|
override actionName = ActionName.SetDoubtFriendsAddRequest;
|
||||||
|
override payloadSchema = SchemaData;
|
||||||
|
|
||||||
|
async _handle(payload: Payload) {
|
||||||
|
return await this.core.apis.FriendApi.handleDoubtFriendRequest(payload.flag);
|
||||||
|
}
|
||||||
|
}
|
@@ -10,6 +10,10 @@ export interface InvalidCheckResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const ActionName = {
|
export const ActionName = {
|
||||||
|
// new extends 完全差异OneBot类别
|
||||||
|
GetDoubtFriendsAddRequest: 'get_doubt_friends_add_request',
|
||||||
|
SetDoubtFriendsAddRequest: 'set_doubt_friends_add_request',
|
||||||
|
// napcat
|
||||||
GetRkeyEx: 'get_rkey',
|
GetRkeyEx: 'get_rkey',
|
||||||
GetRkeyServer: 'get_rkey_server',
|
GetRkeyServer: 'get_rkey_server',
|
||||||
SetGroupRemark: 'set_group_remark',
|
SetGroupRemark: 'set_group_remark',
|
||||||
|
Reference in New Issue
Block a user