diff --git a/CHANGELOG.md b/CHANGELOG.md index ee4071b8..8f5d6d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,4 +24,4 @@ QQ Version: 3.2.7-23361 / 9.9.9-23361 9. 支持表情回应api和上报 - 新增 Event/API 10. 支持获取Cookies 实现更加稳定 且支持Skey缓存3600S Pskey每次刷新 - 新增 API: /get_cookies 11. 支持 服务端踢下线 / 其它设备上线 / 重复登录 / 自身在线状态变更 日志 - 新增 Sys: Log -12. 支持了消息统计 - 新增 API: /get_status +12. 支持了消息统计 - API: /get_status diff --git a/src/core b/src/core index 22382f6d..db31eb4f 160000 --- a/src/core +++ b/src/core @@ -1 +1 @@ -Subproject commit 22382f6d339f5d91fa9ed19225a13873122d9885 +Subproject commit db31eb4f35170f09fd8af414fab459e18de706fe diff --git a/src/onebot11/action/group/GetGroupNotice.ts b/src/onebot11/action/group/GetGroupNotice.ts index 803c6f50..c3c5ec33 100644 --- a/src/onebot11/action/group/GetGroupNotice.ts +++ b/src/onebot11/action/group/GetGroupNotice.ts @@ -18,7 +18,7 @@ interface GroupNotice { } } type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed; -export class GetGroupNotice extends BaseAction { +export class GetGroupNotice extends BaseAction { actionName = ActionName.GoCQHTTP_GetGroupNotice; protected async _handle(payload: PayloadType) { @@ -27,20 +27,23 @@ export class GetGroupNotice extends BaseAction { if (!ret) { throw new Error('获取公告失败'); } - let retNotices: ApiGroupNotice[] = new Array(); - for (let key in ret.feeds) { - let retNotice: ApiGroupNotice = { - ...ret.feeds[key], - sender_id: ret.feeds[key].u, - publish_time: ret.feeds[key].pubt, + const retNotices: GroupNotice[] = new Array(); + for (const key in ret.feeds) { + const retApiNotice: WebApiGroupNoticeFeed = ret.feeds[key]; + const retNotice: GroupNotice = { + // ...ret.feeds[key], + sender_id: retApiNotice.u, + publish_time: retApiNotice.pubt, message: { - text: ret.feeds[key].msg.text, - image: [] + text: retApiNotice.msg.text, + image: retApiNotice.msg.pics?.map((pic) => { + return { id: pic.id, height: pic.h, width: pic.w }; + }) || [] } - } + }; retNotices.push(retNotice); } return retNotices; } -} \ No newline at end of file +}