From 0e5e21dc4e1baeaaf8d9625ca4946ea99a681c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 10:13:39 +0800 Subject: [PATCH 1/7] fix --- src/core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core b/src/core index bedbd418..34b1687b 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit bedbd418d34c07497f3df9cc5a90742fb4d614fc +Subproject commit 34b1687b1b494a5a3428220645e9b054650703e9 From 8661d09d577cbbe57b9138be3ff1fa4ec02acecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 11:19:09 +0800 Subject: [PATCH 2/7] fix --- src/common/utils/request.ts | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/common/utils/request.ts b/src/common/utils/request.ts index 3f494178..efafd649 100644 --- a/src/common/utils/request.ts +++ b/src/common/utils/request.ts @@ -26,4 +26,32 @@ export async function HttpGetWithCookies(url: string): Promise> { + return new Promise((resolve, reject) => { + let result: Map = new Map(); + const req = https.get(url, (res: any) => { + res.on('data', (data: any) => { + }); + res.on('end', () => { + try { + const responseCookies = res.headers['set-cookie']; + for (const line of responseCookies) { + const parts = line.split(';'); + const [key, value] = parts[0].split('='); + result.set(key, value); + } + } catch (e) { + } + resolve(result); + + }); + }); + req.on('error', (error: any) => { + resolve(result); + // console.log(error) + }) + req.end() + }) + } \ No newline at end of file From 94e1a6f0ba5a3a8283fd7122e4f7c1903b597c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 12:30:03 +0800 Subject: [PATCH 3/7] fix --- src/onebot11/action/group/GetGroupMemberInfo.ts | 1 + src/onebot11/action/group/GetGroupMemberList.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/onebot11/action/group/GetGroupMemberInfo.ts b/src/onebot11/action/group/GetGroupMemberInfo.ts index bda42159..9a2c297b 100644 --- a/src/onebot11/action/group/GetGroupMemberInfo.ts +++ b/src/onebot11/action/group/GetGroupMemberInfo.ts @@ -6,6 +6,7 @@ import { ActionName } from '../types'; import { NTQQUserApi } from '@/core/apis/user'; import { log, logDebug } from '@/common/utils/log'; import { isNull } from '../../../common/utils/helper'; +import { WebApi } from '@/core/apis/webapi'; export interface PayloadType { diff --git a/src/onebot11/action/group/GetGroupMemberList.ts b/src/onebot11/action/group/GetGroupMemberList.ts index 84ec1a7b..824378c5 100644 --- a/src/onebot11/action/group/GetGroupMemberList.ts +++ b/src/onebot11/action/group/GetGroupMemberList.ts @@ -4,6 +4,7 @@ import { OB11Constructor } from '../../constructor'; import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { napCatCore } from '@/core'; +import { WebApi } from '@/core/apis/webapi'; export interface PayloadType { group_id: number @@ -14,6 +15,7 @@ class GetGroupMemberList extends BaseAction { actionName = ActionName.GetGroupMemberList; protected async _handle(payload: PayloadType) { + console.log(await WebApi.getGroupMember(payload.group_id.toString())); const group = await getGroup(payload.group_id.toString()); if (group) { return OB11Constructor.groupMembers(group); From 93ef20d35812958551f25f506bd33335be268b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 12:34:13 +0800 Subject: [PATCH 4/7] fix --- src/core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core b/src/core index 34b1687b..563a338c 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 34b1687b1b494a5a3428220645e9b054650703e9 +Subproject commit 563a338c73a890910beb5949252c82c17a955c18 From 003be934de96f071d45befa46b2a43c82a8da55a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 12:40:43 +0800 Subject: [PATCH 5/7] fix --- CHANGELOG.md | 1 + src/core | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bad5a961..9db76852 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,3 +9,4 @@ 9. 新增wsHost和httpHost配置 CONFIG: New 10. 新增获取官方Bot账号范围 API: /get_robot_uin_range 11. 新增设置自身在线状态 API： /set_online_status +12. 修复群成员加入时间 上次活跃 活跃等级字段 影响 API: /get_group_member_info /get_group_member_list \ No newline at end of file diff --git a/src/core b/src/core index 563a338c..f29a5aba 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 563a338c73a890910beb5949252c82c17a955c18 +Subproject commit f29a5aba070d6a9b66b7322a2bfb63d6da38e075 From 13337336844ca2b8c91222a7b9f927ff8d1470a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 12:49:04 +0800 Subject: [PATCH 6/7] build: change --- CHANGELOG.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db76852..27af8d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ -1. 修复图片URL,支持Win/Linux X64获取Rkey -2. 支持了设置已读群/私聊消息接口 -3. 支持了好友添加上报事件 -4. 重构了商城表情URL拼接 -5. 重构了Core日志与服务调用部分 -6. 适配最新版Win 9.9.9 23159 提升了兼容性 -7. 表情回应api和上报 -8. 支持获取Cookies 实现更加稳定 API: /get_cookies -9. 新增wsHost和httpHost配置 CONFIG: New -10. 新增获取官方Bot账号范围 API: /get_robot_uin_range -11. 新增设置自身在线状态 API： /set_online_status -12. 修复群成员加入时间 上次活跃 活跃等级字段 影响 API: /get_group_member_info /get_group_member_list \ No newline at end of file +1. 修复图片URL,支持Win/Linux X64获取Rkey - 新增 Module: Moehoo +2. 支持了设置已读群/私聊消息接口 - 新增 API: /mark_private_msg_as_read /mark_group_msg_as_read +3. 支持了好友添加上报事件 - 新增 Event: AddFriend +4. 重构了商城表情URL拼接 - 重构 API: / +5. 重构了Core日志与服务调用部分 - 重构 SYS: Log +6. 适配最新版Win 9.9.9 23159 提升了兼容性 - 修复 SYS: Listener +7. 表情回应api和上报 - 新增 Event/API +8. 支持获取Cookies 实现更加稳定 - 新增 API: /get_cookies +9. 新增wsHost和httpHost配置 - 新增 CONFIG: New +10. 新增获取官方Bot账号范围 - 新增 API: /get_robot_uin_range +11. 新增设置自身在线状态 - 新增 API： /set_online_status +12. 修复群成员加入时间 上次活跃 活跃等级字段 -影响 API: /get_group_member_info /get_group_member_list \ No newline at end of file From 0bded73f163118bf938dfaeacf212235622677fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Sun, 28 Apr 2024 12:50:24 +0800 Subject: [PATCH 7/7] fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27af8d28..0987965b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,4 +9,4 @@ 9. 新增wsHost和httpHost配置 - 新增 CONFIG: New 10. 新增获取官方Bot账号范围 - 新增 API: /get_robot_uin_range 11. 新增设置自身在线状态 - 新增 API： /set_online_status -12. 修复群成员加入时间 上次活跃 活跃等级字段 -影响 API: /get_group_member_info /get_group_member_list \ No newline at end of file +12. 修复群成员加入时间 上次活跃 活跃等级字段 - 影响 API: /get_group_member_info /get_group_member_list