diff --git a/src/core/src/apis/user.ts b/src/core/src/apis/user.ts index e8aa2a89..9afd7e1c 100644 --- a/src/core/src/apis/user.ts +++ b/src/core/src/apis/user.ts @@ -210,6 +210,7 @@ export class NTQQUserApi { return false; }) static async getUidByUin(Uin: string) { + //此代码仅临时使用,后期会被废弃 if (!requireMinNTQQBuild('26702')) { return await NTQQUserApi.getUidByUinV2(Uin); } @@ -223,6 +224,7 @@ export class NTQQUserApi { return false; }) static async getUinByUid(Uid: string) { + //此代码仅临时使用,后期会被废弃 if (!requireMinNTQQBuild('26702')) { return await NTQQUserApi.getUinByUidV2(Uid); } diff --git a/src/core/src/apis/webapi.ts b/src/core/src/apis/webapi.ts index 9af39803..0b859ae0 100644 --- a/src/core/src/apis/webapi.ts +++ b/src/core/src/apis/webapi.ts @@ -114,6 +114,22 @@ export interface GroupEssenceMsgRet { } } export class WebApi { + static async shareDigest(groupCode: string, msgSeq: string, msgRandom: string, targetGroupCode: string) { + const CookiesObject = await NTQQUserApi.getCookies('qun.qq.com'); + const CookieValue = Object.entries(CookiesObject).map(([key, value]) => `${key}=${value}`).join('; '); + const Bkn = WebApi.genBkn(CookiesObject.skey); + let ret: any = undefined; + const data = 'group_code=' + groupCode + '&msg_seq=' + msgSeq + '&msg_random=' + msgRandom + '&target_group_code=' + targetGroupCode; + const url = 'https://qun.qq.com/cgi-bin/group_digest/share_digest?bkn=' + Bkn + "&" + data; + //console.log(url); + try { + ret = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': CookieValue }); + return ret; + } catch (e) { + return undefined; + } + return undefined; + } @CacheClassFuncAsync(3600 * 1000, 'webapi_get_group_members') static async getGroupEssenceMsg(GroupCode: string, page_start: string) { const CookiesObject = await NTQQUserApi.getCookies('qun.qq.com'); diff --git a/src/core/src/services/NodeIKernelGroupService.ts b/src/core/src/services/NodeIKernelGroupService.ts index d23139ad..994e61ad 100644 --- a/src/core/src/services/NodeIKernelGroupService.ts +++ b/src/core/src/services/NodeIKernelGroupService.ts @@ -9,10 +9,6 @@ import { import { GeneralCallResult } from '@/core/services/common'; export interface NodeIKernelGroupService { - - getUidByUin(uin: string): Promise; - - getUinByUid(uid: string): Promise; //26702 getGroupMemberLevelInfo(groupCode: string): Promise; //26702 diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 377587a5..0f926271 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -22,7 +22,7 @@ import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket'; import { getGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data'; import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/listeners'; import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest'; -import { NTQQGroupApi, NTQQUserApi } from '@/core/apis'; +import { NTQQGroupApi, NTQQUserApi, WebApi } from '@/core/apis'; import { log, logDebug, logError, setLogSelfInfo } from '@/common/utils/log'; import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest'; import { OB11GroupAdminNoticeEvent } from '@/onebot11/event/notice/OB11GroupAdminNoticeEvent'; @@ -209,9 +209,12 @@ export class NapCatOnebot11 { // 临时会话更新 tempGroupCodeMap uid -> source/GroupCode }; msgListener.onRecvMsg = async (msg) => { + //console.log('ob11 onRecvMsg', JSON.stringify(msg, null, 2)); // logDebug('收到消息', msg); for (const m of msg) { + let t = await WebApi.shareDigest(m.peerUid, m.msgSeq,m.msgRandom,m.peerUid); + console.log(t); // try: 减掉3s 试图修复消息半天收不到(不减了不减了 会出大问题) if (this.bootTime > parseInt(m.msgTime)) { logDebug(`消息时间${m.msgTime}早于启动时间${this.bootTime},忽略上报`);