Merge pull request #746 from LLOneBot/dev

chore: update version to 7.12.6

Author: idranme

doc/更新日志.txt

@@ -1,3 +1,10 @@
+V7.12.6
+更新时间 2026-04-28
+
+* OneBot 修复 _get_group_notice API 获取不到发给新成员的公告
+* OneBot 支持 _get_group_notice API 获取群公告是否置顶
+
+=================
 V7.12.5
 更新时间 2026-04-27
 

package-dist.json

@@ -1 +1 @@
-{"name":"llonebot-dist","version":"7.12.5","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}
+{"name":"llonebot-dist","version":"7.12.6","type":"module","description":"","main":"llbot.js","author":"linyuchen","repository":{"type":"git","url":"https://github.com/LLOneBot/LuckyLilliaBot"}}

src/ntqqapi/types/group.ts

@@ -156,41 +156,43 @@ export interface GroupAllInfo {
   isAllowModifyConfGroupName: number
 }
 
+interface GroupBulletinFeed {
+  uin: string
+  feedId: string
+  publishTime: string
+  msg: {
+    text: string
+    textFace: string
+    pics: {
+      id: string
+      width: number
+      height: number
+    }[]
+    title: string
+  }
+  type: number
+  fn: number
+  cn: number
+  vn: number
+  settings: {
+    isShowEditCard: number
+    remindTs: number
+    tipWindowType: number
+    confirmRequired: number
+  }
+  pinned: number
+  readNum: number
+  is_read: number
+  is_all_confirm: number
+}
+
 export interface GroupBulletinListResult {
   groupCode: string
   srvCode: number
   readOnly: number
   role: number
-  inst: unknown[]
-  feeds: {
-    uin: string
-    feedId: string
-    publishTime: string
-    msg: {
-      text: string
-      textFace: string
-      pics: {
-        id: string
-        width: number
-        height: number
-      }[]
-      title: string
-    }
-    type: number
-    fn: number
-    cn: number
-    vn: number
-    settings: {
-      isShowEditCard: number
-      remindTs: number
-      tipWindowType: number
-      confirmRequired: number
-    }
-    pinned: number
-    readNum: number
-    is_read: number
-    is_all_confirm: number
-  }[]
+  inst: GroupBulletinFeed[]
+  feeds: GroupBulletinFeed[]
   groupInfo: {
     groupCode: string
     classId: number

src/onebot11/action/go-cqhttp/GetGroupNotice.ts

@@ -21,6 +21,7 @@ interface Notice {
     is_show_edit_card: boolean
     tip_window: boolean
     confirm_required: boolean
+    pinned: boolean
   }
 }
 
@@ -33,7 +34,7 @@ export class GetGroupNotice extends BaseAction<Payload, Notice[]> {
   protected async _handle(payload: Payload) {
     const data = await this.ctx.ntGroupApi.getGroupBulletinList(payload.group_id.toString())
     const result: Notice[] = []
-    for (const feed of data.feeds) {
+    for (const feed of [...data.feeds, ...data.inst]) {
       result.push({
         notice_id: feed.feedId,
         sender_id: +feed.uin,
@@ -51,10 +52,14 @@ export class GetGroupNotice extends BaseAction<Payload, Notice[]> {
         settings: {
           is_show_edit_card: !!feed.settings.isShowEditCard,
           tip_window: !feed.settings.tipWindowType,
-          confirm_required: !!feed.settings.confirmRequired
+          confirm_required: !!feed.settings.confirmRequired,
+          pinned: !!feed.pinned
         }
       })
     }
+    if (data.inst.length > 0) {
+      return result.sort((a, b) => b.publish_time - a.publish_time)
+    }
     return result
   }
 }

src/version.ts

@@ -1 +1 @@
-export const version = '7.12.5'
+export const version = '7.12.6'