Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-12 07:50:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor: Uid <-> Uin & Remove Cached

Browse Source
This commit is contained in:
手瓜一十雪
2024-06-04 23:13:18 +08:00
parent 62605c843b
commit bcf9a6dc68
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/onebot11/action/extends/GetGroupAddRequest.ts
View File

@@ -1,7 +1,6 @@
import { GroupNotify, GroupNotifyStatus } from '@/core/entities';
import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { uid2UinMap } from '@/core/data';
import { NTQQUserApi } from '@/core/apis/user';
import { NTQQGroupApi } from '@/core/apis/group';
@@ -20,7 +19,7 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
// const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
// const returnData: OB11GroupRequestNotify[] = [];
// for (const notify of notifies) {
// const uin = uid2UinMap[notify.user1.uid] || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
// const uin = || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
// returnData.push({
// group_id: parseInt(notify.group.groupCode),
// user_id: parseInt(uin),

7
src/onebot11/action/go-cqhttp/GetFriendMsgHistory.ts
View File

@@ -1,6 +1,6 @@
import BaseAction from '../BaseAction';
import { OB11Message, OB11User } from '../../types';
import { getFriend, friends, uid2UinMap, getUidByUin } from '@/core/data';
import { getFriend, friends } from '@/core/data';
import { ActionName } from '../types';
import { ChatType } from '@/core/entities';
import { dbUtil } from '@/common/utils/db';
@@ -8,6 +8,7 @@ import { NTQQMsgApi } from '@/core/apis/msg';
import { OB11Constructor } from '../../constructor';
import { logDebug } from '@/common/utils/log';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { NTQQUserApi } from '@/core';
interface Response {
messages: OB11Message[];
@@ -16,7 +17,7 @@ interface Response {
const SchemaData = {
type: 'object',
properties: {
user_id: { type: [ 'number' , 'string' ] },
user_id: { type: ['number', 'string'] },
message_seq: { type: 'number' },
count: { type: 'number' }
},
@@ -29,7 +30,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
actionName = ActionName.GetFriendMsgHistory;
PayloadSchema = SchemaData;
protected async _handle(payload: Payload): Promise<Response> {
const uid = getUidByUin(payload.user_id.toString());
const uid = await NTQQUserApi.getUidByUin(payload.user_id.toString());
if (!uid) {
throw `记录${payload.user_id}不存在`;
}

12
src/onebot11/action/group/GetGroupSystemMsg.ts
View File

@@ -1,9 +1,7 @@
import { NTQQGroupApi } from '@/core';
import { NTQQGroupApi, NTQQUserApi } from '@/core';
import BaseAction from '../BaseAction';
import { ActionName } from '../types';
import { NTQQMsgApi } from '@/core/apis/msg';
import { FromSchema, JSONSchema } from 'json-schema-to-ts';
import { uid2UinMap } from '@/core/data';
const SchemaData = {
type: 'object',
@@ -24,22 +22,22 @@ export class GetGroupSystemMsg extends BaseAction<void, any> {
if (SSNotify.type == 1) {
retData.InvitedRequest.push({
request_id: SSNotify.seq,
invitor_uin: uid2UinMap[SSNotify.user1?.uid],
invitor_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
invitor_nick: SSNotify.user1?.nickName,
group_id: SSNotify.group?.groupCode,
group_name: SSNotify.group?.groupName,
checked: SSNotify.status === 1 ? false : true,
actor: uid2UinMap[SSNotify.user2?.uid] || 0,
actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
});
} else if (SSNotify.type == 7) {
retData.join_requests.push({
request_id: SSNotify.seq,
requester_uin: uid2UinMap[SSNotify.user1?.uid],
requester_uin: await NTQQUserApi.getUinByUid(SSNotify.user1?.uid),
requester_nick: SSNotify.user1?.nickName,
group_id: SSNotify.group?.groupCode,
group_name: SSNotify.group?.groupName,
checked: SSNotify.status === 1 ? false : true,
actor: uid2UinMap[SSNotify.user2?.uid] || 0,
actor: await NTQQUserApi.getUinByUid(SSNotify.user2?.uid) || 0,
});
}
}