diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index f154bff8..9771c5f3 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -225,9 +225,9 @@ export class NTQQGroupApi { async kickMemberV2Inner(param: KickMemberV2Req) { return this.context.session.getGroupService().kickMemberV2(param); } - async deleteGroupBulletin(GroupCode: string, feedId: string) { + async deleteGroupBulletin(GroupCode: string, noticeId: string) { const _Pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!; - return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, _Pskey, feedId); + return this.context.session.getGroupService().deleteGroupBulletin(GroupCode, _Pskey, noticeId); } async quitGroupV2(GroupCode: string, needDeleteLocalMsg: boolean) { const param = { diff --git a/src/core/entities/webapi.ts b/src/core/entities/webapi.ts index a9112ecc..7632b149 100644 --- a/src/core/entities/webapi.ts +++ b/src/core/entities/webapi.ts @@ -57,7 +57,7 @@ export interface WebApiGroupMemberRet { export interface WebApiGroupNoticeFeed { u: number;//发送者 - fid: string;//fid + fid: string;//fid,notice_id pubt: number;//时间 msg: { text: string diff --git a/src/core/services/NodeIKernelGroupService.ts b/src/core/services/NodeIKernelGroupService.ts index 5317eb3c..2a3156dd 100644 --- a/src/core/services/NodeIKernelGroupService.ts +++ b/src/core/services/NodeIKernelGroupService.ts @@ -209,7 +209,7 @@ export interface NodeIKernelGroupService { getGroupBulletin(groupCode: string): unknown; - deleteGroupBulletin(groupCode: string, seq: string, feedId: string): void; + deleteGroupBulletin(groupCode: string, seq: string, noticeId: string): void; publishGroupBulletin(groupCode: string, pskey: string, data: any): Promise; diff --git a/src/onebot/action/group/DelGroupNotice.ts b/src/onebot/action/group/DelGroupNotice.ts index c91ac833..d66cb3ab 100644 --- a/src/onebot/action/group/DelGroupNotice.ts +++ b/src/onebot/action/group/DelGroupNotice.ts @@ -8,9 +8,9 @@ const SchemaData = { type: 'object', properties: { group_id: { type: ['number', 'string'] }, - feed_id: { type: 'string' }, + notice_id: { type: 'string' }, }, - required: ['group_id','feed_id'], + required: ['group_id','notice_id'], } as const satisfies JSONSchema; type Payload = FromSchema; @@ -22,7 +22,7 @@ export class DelGroupNotice extends BaseAction { async _handle(payload: Payload) { const NTQQGroupApi = this.core.apis.GroupApi; const group = payload.group_id.toString(); - const feedId = payload.feed_id; - return await NTQQGroupApi.deleteGroupBulletin(group, feedId); + const noticeId = payload.notice_id; + return await NTQQGroupApi.deleteGroupBulletin(group, noticeId); } } diff --git a/src/onebot/action/group/GetGroupNotice.ts b/src/onebot/action/group/GetGroupNotice.ts index 22b18145..af764d91 100644 --- a/src/onebot/action/group/GetGroupNotice.ts +++ b/src/onebot/action/group/GetGroupNotice.ts @@ -6,7 +6,7 @@ import { FromSchema, JSONSchema } from 'json-schema-to-ts'; interface GroupNotice { sender_id: number; publish_time: number; - feed_id: string; + notice_id: string; message: { text: string image: Array<{ @@ -46,7 +46,7 @@ export class GetGroupNotice extends BaseAction { const retApiNotice: WebApiGroupNoticeFeed = ret.feeds[key]; const retNotice: GroupNotice = { //...ret.feeds[key], - feed_id: retApiNotice.fid, + notice_id: retApiNotice.fid, sender_id: retApiNotice.u, publish_time: retApiNotice.pubt, message: {