From c862a157dbfbadba67b238425de5f734e8129ef4 Mon Sep 17 00:00:00 2001 From: H3CoF6 <1707889225@qq.com> Date: Sat, 9 May 2026 03:44:08 +0800 Subject: [PATCH] feat: implement send group notice --- packages/core/src/bridge/bridge-actions.ts | 48 +++++++++++++++ packages/core/src/bridge/bridge.ts | 6 ++ packages/core/src/bridge/web-actions.ts | 0 packages/core/src/bridge/web/group-essence.ts | 17 +----- packages/core/src/bridge/web/group-honor.ts | 8 +-- packages/core/src/bridge/web/group-notice.ts | 59 +++++++++++++++++++ packages/core/src/bridge/web/request-util.ts | 18 +++++- packages/core/src/onebot/actions/extended.ts | 26 +++++++- packages/core/src/onebot/api-handler.ts | 1 + packages/core/src/onebot/instance-context.ts | 1 + 10 files changed, 158 insertions(+), 26 deletions(-) create mode 100644 packages/core/src/bridge/web-actions.ts create mode 100644 packages/core/src/bridge/web/group-notice.ts diff --git a/packages/core/src/bridge/bridge-actions.ts b/packages/core/src/bridge/bridge-actions.ts index 05f921b7..7cb0efdf 100644 --- a/packages/core/src/bridge/bridge-actions.ts +++ b/packages/core/src/bridge/bridge-actions.ts @@ -13,6 +13,7 @@ import { PushMsgSchema } from './proto/message'; import { RequestUtil } from './web/request-util'; import { getHonorListWebAPI, WebHonorType } from './web/group-honor'; import { getGroupEssenceMsg, getGroupEssenceMsgAll } from './web/group-essence'; +import { setGroupNoticeWebAPI } from './web/group-notice' import { OidbMuteMemberSchema, OidbMuteAllSchema, @@ -1454,4 +1455,51 @@ export async function getGroupEssenceAll(bridge: Bridge, groupId: number) { const essenceDataAll = await getGroupEssenceMsgAll(cookieObject, groupCode); return essenceDataAll; +} + +export async function sendGroupNotice( + bridge: Bridge, + groupId: number, + content: string, + options?: { + image?: string; // 未来如果要发图片,传路径进来 + pinned?: number; + type?: number; + confirm_required?: number; + } +) { + const groupCode = groupId.toString(); + const cookieObject = await getCookies(bridge, 'qun.qq.com'); + + let picId = ''; + let imgWidth = 540; + let imgHeight = 300; + + // 📝 预留的图片上传逻辑: + // if (options?.image) { + // const picInfo = await bridge.uploadGroupBulletinPic(groupCode, options.image); + // picId = picInfo.id; + // imgWidth = picInfo.width; + // imgHeight = picInfo.height; + // } + + const ret = await setGroupNoticeWebAPI( + cookieObject, + groupCode, + content, + options?.pinned ?? 0, + options?.type ?? 1, + 1, + 1, + options?.confirm_required ?? 1, + picId, + imgWidth, + imgHeight + ); + + if (!ret || ret.ec !== 0) { + throw new Error(`设置群公告失败: ${ret?.em || '未知错误(Cookie过期或权限不足)'}`); + } + + return ret; } \ No newline at end of file diff --git a/packages/core/src/bridge/bridge.ts b/packages/core/src/bridge/bridge.ts index c149e2b7..ba095316 100644 --- a/packages/core/src/bridge/bridge.ts +++ b/packages/core/src/bridge/bridge.ts @@ -69,6 +69,7 @@ import { forceFetchClientKey as forceFetchClientKey_, getGroupEssence as getGroupEssence_, getGroupEssenceAll as getGroupEssenceAll_, + sendGroupNotice as sendGroupNotice_, } from './bridge-actions'; import type { GroupFilesResult } from './bridge-actions'; import type { MediaIndexNode } from './bridge-actions'; @@ -472,6 +473,11 @@ export class Bridge { async getGroupEssenceAll(groupId: number): Promise { return getGroupEssenceAll_(this, groupId); } + + async sendGroupNotice(groupId: number, content: string, options?: any) { + return sendGroupNotice_(this, groupId, content, options); + } + async fetchGroupFileCount(groupId: number): Promise<{ fileCount: number; maxCount: number }> { return fetchGroupFileCount_(this, groupId); } } diff --git a/packages/core/src/bridge/web-actions.ts b/packages/core/src/bridge/web-actions.ts new file mode 100644 index 00000000..e69de29b diff --git a/packages/core/src/bridge/web/group-essence.ts b/packages/core/src/bridge/web/group-essence.ts index d78c5233..d942dedf 100644 --- a/packages/core/src/bridge/web/group-essence.ts +++ b/packages/core/src/bridge/web/group-essence.ts @@ -1,4 +1,4 @@ -import { RequestUtil } from './request-util'; +import { RequestUtil, cookieToString, getBknFromCookie } from './request-util'; // 定义接口返回类型 export interface GroupEssenceMsgRet { @@ -11,21 +11,6 @@ export interface GroupEssenceMsgRet { [key: string]: any; } -function cookieToString(cookieObject: Record): string { - return Object.entries(cookieObject) - .map(([key, value]) => `${key}=${value}`) - .join('; '); -} - -// 获取 QQ Web 接口必需的 bkn (或 gtk) 鉴权参数 -function getBknFromCookie(cookieObject: Record): string { - const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; - let hash = 5381; - for (let i = 0; i < skey.length; i++) { - hash += (hash << 5) + skey.charCodeAt(i); - } - return (hash & 2147483647).toString(); -} /** * 分页获取群精华消息 diff --git a/packages/core/src/bridge/web/group-honor.ts b/packages/core/src/bridge/web/group-honor.ts index 231969d4..f77fdc3a 100644 --- a/packages/core/src/bridge/web/group-honor.ts +++ b/packages/core/src/bridge/web/group-honor.ts @@ -1,4 +1,4 @@ -import { RequestUtil } from './request-util'; +import { RequestUtil, cookieToString } from './request-util'; export enum WebHonorType { TALKATIVE = 'talkative', @@ -8,12 +8,6 @@ export enum WebHonorType { ALL = 'all', } -// 将 Cookie 对象转换为字符串的工具函数 -function cookieToString(cookieObject: Record): string { - return Object.entries(cookieObject) - .map(([key, value]) => `${key}=${value}`) - .join('; '); -} async function fetchHonorData(cookieObject: Record, groupCode: string, type: number) { let resJson; diff --git a/packages/core/src/bridge/web/group-notice.ts b/packages/core/src/bridge/web/group-notice.ts new file mode 100644 index 00000000..11b35fd7 --- /dev/null +++ b/packages/core/src/bridge/web/group-notice.ts @@ -0,0 +1,59 @@ +import { RequestUtil, cookieToString, getBknFromCookie } from './request-util'; + +export interface SetNoticeRetSuccess { + ec?: number; + em?: string; + [key: string]: any; +} + + +/** + * 发送群公告 Web API + */ +export async function setGroupNoticeWebAPI( + cookieObject: Record, + groupCode: string, + content: string, + pinned: number = 0, + type: number = 1, + isShowEditCard: number = 1, + tipWindowType: number = 1, + confirmRequired: number = 1, + picId: string = '', + imgWidth: number = 540, + imgHeight: number = 300 +): Promise { + try { + const settings = JSON.stringify({ + is_show_edit_card: isShowEditCard, + tip_window_type: tipWindowType, + confirm_required: confirmRequired, + }); + + const externalParam = { + pic: picId, + imgWidth: imgWidth.toString(), + imgHeight: imgHeight.toString(), + }; + + const url = `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({ + bkn: getBknFromCookie(cookieObject), + qid: groupCode, + text: content, + pinned: pinned.toString(), + type: type.toString(), + settings, + ...(picId === '' ? {} : externalParam), + }).toString()}`; + + const ret = await RequestUtil.HttpGetJson( + url, + 'POST', // 注意这里必须是 POST + '', + { Cookie: cookieToString(cookieObject) } + ); + return ret; + } catch (e) { + return undefined; + } +} \ No newline at end of file diff --git a/packages/core/src/bridge/web/request-util.ts b/packages/core/src/bridge/web/request-util.ts index b70a62ca..0c880a48 100644 --- a/packages/core/src/bridge/web/request-util.ts +++ b/packages/core/src/bridge/web/request-util.ts @@ -108,4 +108,20 @@ export class RequestUtil { static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string; } = {}) { return this.HttpGetJson(url, method, data, headers, false, false); } -} \ No newline at end of file +} + +export function cookieToString(cookieObject: Record): string { + return Object.entries(cookieObject) + .map(([key, value]) => `${key}=${value}`) + .join('; '); +} + + +export function getBknFromCookie(cookieObject: Record): string { + const skey = cookieObject['p_skey'] || cookieObject['skey'] || ''; + let hash = 5381; + for (let i = 0; i < skey.length; i++) { + hash += (hash << 5) + skey.charCodeAt(i); + } + return (hash & 2147483647).toString(); +} diff --git a/packages/core/src/onebot/actions/extended.ts b/packages/core/src/onebot/actions/extended.ts index bdc193b4..0d09a3c9 100644 --- a/packages/core/src/onebot/actions/extended.ts +++ b/packages/core/src/onebot/actions/extended.ts @@ -230,8 +230,30 @@ export function register(h: ApiHandler, ctx: ApiActionContext): void { // --- Group notice stubs --- - h.registerAction('_send_group_notice', async () => { - return failedResponse(RETCODE.ACTION_FAILED, 'not yet implemented'); + h.registerAction('send_group_notice', async (params) => { + const groupId = asNumber(params.group_id); + const content = asString(params.content); + + if (!groupId || !content) { + return failedResponse(RETCODE.BAD_REQUEST, 'group_id and content are required'); + } + if (!ctx.sendGroupNotice) { + return failedResponse(RETCODE.ACTION_FAILED, 'not implemented'); + } + + try { + const options = { + image: asString(params.image), + pinned: params.pinned !== undefined ? Number(params.pinned) : 0, + type: params.type !== undefined ? Number(params.type) : 1, + confirm_required: params.confirm_required !== undefined ? Number(params.confirm_required) : 1, + }; + + await ctx.sendGroupNotice(groupId, content, options); + return okResponse(); + } catch (e) { + return failedResponse(RETCODE.ACTION_FAILED, String(e)); + } }); h.registerAction('_get_group_notice', async () => { diff --git a/packages/core/src/onebot/api-handler.ts b/packages/core/src/onebot/api-handler.ts index b90f6db8..36be910f 100644 --- a/packages/core/src/onebot/api-handler.ts +++ b/packages/core/src/onebot/api-handler.ts @@ -98,6 +98,7 @@ export interface ApiActionContext { getGroupHonorInfo?: (groupId: number, type: WebHonorType | string) => Promise; getGroupEssence?: (groupId: number, pageStart?: number, pageLimit?: number) => Promise; getGroupEssenceAll?: (groupId: number) => Promise; + sendGroupNotice?: (groupId: number, content: string, options?: any) => Promise; } type ActionHandler = (params: JsonObject) => Promise; diff --git a/packages/core/src/onebot/instance-context.ts b/packages/core/src/onebot/instance-context.ts index 441f07c1..e4d7cfb9 100644 --- a/packages/core/src/onebot/instance-context.ts +++ b/packages/core/src/onebot/instance-context.ts @@ -128,6 +128,7 @@ export function buildApiContext(ref: InstanceRef): ApiActionContext { getGroupHonorInfo: (groupId: number, type: WebHonorType | string)=> bridge.getGroupHonorInfo(groupId, type), getGroupEssence: (groupId: number, pageStart: number = 0, pageLimit: number = 50) => bridge.getGroupEssence(groupId, pageStart, pageLimit), getGroupEssenceAll: (groupId: number) => bridge.getGroupEssenceAll(groupId), + sendGroupNotice: (groupId: number, content: string, options?: any) => bridge.sendGroupNotice(groupId, content, options), }; }