fix

This reverts commit 58cd38c4a8.

.github/workflows/build.yml

@@ -8,15 +8,17 @@ jobs:
   Build-LiteLoader:
     runs-on: ubuntu-latest
     steps:
-
     - name: Clone Main Repository
       uses: actions/checkout@v4
-
+      with:
+          repository: 'NapNeko/NapCatQQ'
+          submodules: true
+          ref: main
+          token: ${{ secrets.NAPCAT_BUILD }}
     - name: Use Node.js 20.X
       uses: actions/setup-node@v4
       with:
         node-version: 20.x
-
     - name: Build NuCat Framework
       run: |
           npm i
@@ -25,25 +27,25 @@ jobs:
           npm i --omit=dev 
           rm package-lock.json
           cd ..
-
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
         name: NapCat.Framework
         path: dist
-
   Build-Shell:
     runs-on: ubuntu-latest
     steps:
-
         - name: Clone Main Repository
           uses: actions/checkout@v4
-
+          with:
+                repository: 'NapNeko/NapCatQQ'
+                submodules: true
+                ref: main
+                token: ${{ secrets.NAPCAT_BUILD }}
         - name: Use Node.js 20.X
           uses: actions/setup-node@v4
           with:
               node-version: 20.x
-
         - name: Build NuCat LiteLoader
           run: |
                 npm i
@@ -52,7 +54,6 @@ jobs:
                 npm i --omit=dev
                 rm package-lock.json
                 cd ..
-                
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.5.2';
+export const napCatVersion = '2.5.3';

src/core/services/NodeIKernelBuddyService.ts

@@ -114,7 +114,7 @@ export interface NodeIKernelBuddyService {
 
     reportDoubtBuddyReqUnread(): void;
 
-    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>;
+    getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>;
 
     isNull(): boolean;
 }

src/onebot/action/extends/FetchUserProfileLike.ts

@@ -0,0 +1,11 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+export class FetchUserProfileLike extends BaseAction<{ qq: number }, any> {
+    actionName = ActionName.FetchUserProfileLike;
+
+    async _handle(payload: { qq: number }) {
+        if (!payload.qq) throw new Error('qq is required');
+        return await this.core.apis.UserApi.getUidByUinV2(payload.qq.toString());
+    }
+}

src/onebot/action/index.ts

@@ -68,8 +68,8 @@ import SetGroupPortrait from './go-cqhttp/SetGroupPortrait';
 import { FetchCustomFace } from './extends/FetchCustomFace';
 import GoCQHTTPUploadPrivateFile from './go-cqhttp/UploadPrivateFile';
 import { FetchEmojiLike } from './extends/FetchEmojiLike';
+import { FetchUserProfileLike } from './extends/FetchUserProfileLike';
 import { NapCatCore } from '@/core';
-
 import { NapCatOneBot11Adapter } from '@/onebot';
 import GetGuildProfile from './guild/GetGuildProfile';
 import SetModelShow from './go-cqhttp/SetModelShow';
@@ -85,6 +85,7 @@ import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
 import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
 import { GetGroupSystemMsg } from './system/GetSystemMsg';
 
+
 export type ActionMap = Map<string, BaseAction<any, any>>;
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore): ActionMap {
@@ -178,6 +179,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupFileSystemInfo(obContext, core),
         new GetGroupFilesByFolder(obContext, core),
         new GetGroupSystemMsg(obContext, core),
+        new FetchUserProfileLike(obContext, core),
     ];
     const actionMap = new Map();
     for (const action of actionHandlers) {

src/onebot/action/types.ts

@@ -118,4 +118,5 @@ export enum ActionName {
     DelGroupNotice = '_del_group_notice',
     GetGroupInfoEx = "get_group_info_ex",
     GetGroupSystemMsg = 'get_group_system_msg',
+    FetchUserProfileLike = "fetch_user_profile_like",
 }

src/onebot/api/msg.ts

@@ -607,6 +607,14 @@ export class OneBotMsgApi {
         }),
 
         [OB11MessageDataType.miniapp]: async () => undefined,
+
+        [OB11MessageDataType.contact]: async ({ data }, context) => {
+            let arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(data.qq, '');
+            return this.ob11ToRawConverters.json({
+                data: { data: arkJson.arkMsg },
+                type: OB11MessageDataType.json
+            }, context);
+        }
     };
 
     constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore) {

src/onebot/types/message.ts

@@ -62,6 +62,7 @@ export enum OB11MessageDataType {
     dice = 'dice',
     RPS = 'rps',
     miniapp = 'miniapp',//json类
+    contact = 'contact',
     Location = 'location'
 }
 
@@ -81,10 +82,15 @@ export interface OB11MessageText {
         text: string, // 纯文本
     }
 }
-
+export interface OB11MessageContext {
+    type: OB11MessageDataType.contact,
+    data: {
+        qq: string,
+    }
+}
 export interface OB11MessageFileBase {
     data: {
-        file_unique?:string,
+        file_unique?: string,
         path?: string;
         thumb?: string;
         name?: string;
@@ -198,7 +204,7 @@ export type OB11MessageData =
     OB11MessageAt | OB11MessageReply |
     OB11MessageImage | OB11MessageRecord | OB11MessageFile | OB11MessageVideo |
     OB11MessageNode | OB11MessageIdMusic | OB11MessageCustomMusic | OB11MessageJson |
-    OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown | OB11MessageForward
+    OB11MessageDice | OB11MessageRPS | OB11MessageMarkdown | OB11MessageForward | OB11MessageContext
 
 export interface OB11PostSendMsg {
     message_type?: 'private' | 'group'

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.5.2', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.5.3', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.5.2", "napcat-update-button", "secondary")
+          SettingButton("V2.5.3", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([