Add invitor_id field to group request events per OneBot 11 standard

Co-authored-by: sj817 <74231782+sj817@users.noreply.github.com>

.github/release-template/release-info.md

@@ -1,25 +0,0 @@
-[使用文档](https://napneko.github.io/)
-
-## Windows 一键包
-我们提供了轻量化一键部署方案
-相对于普通需要安装QQ的方案,下面已内置QQ和Napcat 阅读使用文档参考
-
-你可以下载 
-
-NapCat.Shell.Windows.OneKey.zip (无头) 
-NapCat.Framework.Windows.OneKey.zip (有头) 
-
-启动后可自动化部署一键包,教程参考使用文档安装部分
-
-## 警告
-**注意QQ版本推荐使用 40768+ 版本 最低可以使用40768版本**
-**默认WebUi密钥为随机密码 控制台查看**
-
-**[9.9.22-40990 X64 Win](https://dldir1v6.qq.com/qqfile/qq/QQNT/2c9d3f6c/QQ9.9.22.40990_x64.exe)**
-[LinuxX64 DEB 40990 ](https://dldir1.qq.com/qqfile/qq/QQNT/ec800879/linuxqq_3.2.20-40990_amd64.deb)
-[LinuxX64 RPM 40990 ](https://dldir1.qq.com/qqfile/qq/QQNT/ec800879/linuxqq_3.2.20-40990_x86_64.rpm)
-[LinuxArm64 DEB 40990 ](https://dldir1.qq.com/qqfile/qq/QQNT/ec800879/linuxqq_3.2.20-40990_arm64.deb)
-[LinuxArm64 RPM  40990 ](https://dldir1.qq.com/qqfile/qq/QQNT/ec800879/linuxqq_3.2.20-40990_aarch64.rpm)
-[MAC   DMG   40990 ](https://dldir1v6.qq.com/qqfile/qq/QQNT/c6cb0f5d/QQ_v6.9.82.40990.dmg)
-## 如果WinX64缺少运行库或者xxx.dll？
-[安装运行库](https://aka.ms/vs/17/release/vc_redist.x64.exe)

.github/workflows/release.yml

@@ -136,41 +136,19 @@ jobs:
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
-    - name: Download Windows OneKey Packages
-      run: |
-        # Get latest release tag using jq for reliable JSON parsing
-        LATEST_RELEASE=$(curl -s https://api.github.com/repos/NapNeko/NapCatQQ/releases/latest | jq -r '.tag_name')
-        echo "Latest release: $LATEST_RELEASE"
-        
-        # Download OneKey packages if they exist (non-zero exit code won't fail the step)
-        curl -f -L -o NapCat.Shell.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Shell.Windows.OneKey.zip" || echo "Warning: NapCat.Shell.Windows.OneKey.zip not found in latest release"
-        curl -f -L -o NapCat.Framework.Windows.OneKey.zip "https://github.com/NapNeko/NapCatQQ/releases/download/$LATEST_RELEASE/NapCat.Framework.Windows.OneKey.zip" || echo "Warning: NapCat.Framework.Windows.OneKey.zip not found in latest release"
-        
-    - name: Generate Release Notes
-      run: |
-        # Create header with version
-        echo "# V${{ env.VERSION }} Refactor" > RELEASE_NOTES.md
-        
-        # Add fixed release information
-        cat .github/release-template/release-info.md >> RELEASE_NOTES.md
-        
-        # Add changelog section
-        echo "" >> RELEASE_NOTES.md
-        chmod +x ./script/generate-changelog.sh
-        ./script/generate-changelog.sh >> RELEASE_NOTES.md
+    - name: Clone Changes Log
+      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/docs/changelogs/CHANGELOG.v${{ env.VERSION }}.md
         
     - name: Create Release Draft and Upload Artifacts
       uses: softprops/action-gh-release@v1
       with:
         name: NapCat V${{ env.VERSION }}
         token: ${{ secrets.GITHUB_TOKEN }}
-        body_path: RELEASE_NOTES.md
+        body_path: CHANGELOG.md
         files: |
           NapCat.Framework.zip
           NapCat.Shell.zip
           NapCat.Framework.Windows.Once.zip
-          NapCat.Shell.Windows.OneKey.zip
-          NapCat.Framework.Windows.OneKey.zip
         draft: true
 
   build-docker:

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.9.26",
+  "version": "4.9.27",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.9.26",
+  "version": "4.9.27",
   "scripts": {
     "build:universal": "npm run build:webui && npm run dev:universal || exit 1",
     "build:framework": "npm run build:webui && npm run dev:framework || exit 1",

script/generate-changelog.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Get the latest 10 commits excluding those starting with "release:"
-echo "## 更新"
-echo ""
-git log --oneline -20 --pretty=format:"%s" | grep -v "^release:" | head -10 | while read -r line; do
-    echo "- $line"
-done

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.9.26';
+export const napCatVersion = '4.9.27';

src/onebot/api/msg.ts

@@ -1434,7 +1434,8 @@ export class OneBotMsgApi {
         +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid),
         'invite',
         '',
-        request_seq
+        request_seq,
+        +await this.core.apis.UserApi.getUinByUidV2(groupInvite.invitorUid)
       );
     } else if (SysMessage.contentHead.type === 528 && SysMessage.contentHead.subType === 39 && SysMessage.body?.msgContent) {
       return await this.obContext.apis.UserApi.parseLikeEvent(SysMessage.body?.msgContent);

src/onebot/event/request/OB11GroupRequest.ts

@@ -9,13 +9,15 @@ export class OB11GroupRequestEvent extends OB11BaseRequestEvent {
   comment: string;
   flag: string;
   sub_type: string;
+  invitor_id?: number;
 
-  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string) {
+  constructor (core: NapCatCore, groupId: number, userId: number, sub_type: string, comment: string, flag: string, invitorId?: number) {
     super(core);
     this.group_id = groupId;
     this.user_id = userId;
     this.sub_type = sub_type;
     this.comment = comment;
     this.flag = flag;
+    this.invitor_id = invitorId;
   }
 }

src/onebot/index.ts

@@ -466,13 +466,15 @@ export class NapCatOneBot11Adapter {
             notify.status === GroupNotifyMsgStatus.KUNHANDLE
           ) {
             this.context.logger.logDebug(`收到邀请我加群通知:${notify}`);
+            const inviterUin = +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid);
             const groupInviteEvent = new OB11GroupRequestEvent(
               this.core,
               +notify.group.groupCode,
-              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid),
+              inviterUin,
               'invite',
               notify.postscript,
-              flag
+              flag,
+              inviterUin
             );
             this.networkManager
               .emitEvent(groupInviteEvent)
@@ -488,9 +490,10 @@ export class NapCatOneBot11Adapter {
               this.core,
               +notify.group.groupCode,
               +await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid),
-              'add',
+              'invite',
               notify.postscript,
-              flag
+              flag,
+              +await this.core.apis.UserApi.getUinByUidV2(notify.user2.uid)
             );
             this.networkManager
               .emitEvent(groupInviteEvent)