chore: ver 3.20.3

# Conflicts:
#	src/onebot11/constructor.ts

manifest.json

@@ -1,10 +1,10 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.20.1",
+  "name": "LLOneBot v3.20.3",
   "slug": "LLOneBot",
   "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.20.1",
+  "version": "3.20.3",
   "icon": "./icon.jpg",
   "authors": [
     {

src/common/config.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import fsPromise from "fs/promises";
 import {Config, OB11Config} from './types';
 
 import {mergeNewProperties} from "./utils/helper";
@@ -76,7 +77,7 @@ export class ConfigUtil {
 
     setConfig(config: Config) {
         this.config = config;
-        fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
+        fsPromise.writeFile(this.configPath, JSON.stringify(config, null, 2), "utf-8").then()
     }
 
     private checkOldConfig(currentConfig: Config | OB11Config,

src/common/data.ts

@@ -94,9 +94,9 @@ export async function refreshGroupMembers(groupQQ: string) {
 export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
 
 export function getUidByUin(uin: string) {
-    for (const key in uidMaps) {
+    for (const uid in uidMaps) {
-        if (uidMaps[key] === uin) {
+        if (uidMaps[uid] === uin) {
-            return key
+            return uid
         }
     }
 }

src/common/types.ts

@@ -15,6 +15,7 @@ export interface CheckVersion {
   version: string
 }
 export interface Config {
+  imageRKey?: string;
   ob11: OB11Config
   token?: string
   heartInterval?: number // ms

src/main/main.ts

@@ -18,7 +18,7 @@ import {
     friendRequests,
     getFriend,
     getGroup,
-    getGroupMember,
+    getGroupMember, groups,
     llonebotError,
     refreshGroupMembers,
     selfInfo,
@@ -53,7 +53,7 @@ import {checkNewVersion, upgradeLLOneBot} from "../common/utils/upgrade";
 import {log} from "../common/utils/log";
 import {getConfigUtil} from "../common/config";
 import {checkFfmpeg} from "../common/utils/video";
-
+import {GroupDecreaseSubType, OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
 
 let running = false;
 
@@ -63,7 +63,6 @@ let mainWindow: BrowserWindow | null = null;
 function onLoad() {
     log("llonebot main onLoad");
     ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
-
         return checkNewVersion();
     });
     ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
@@ -298,11 +297,23 @@ function onLoad() {
                             } else {
                                 log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
                             }
-                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
+                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT || notify.type == GroupNotifyTypes.KICK_MEMBER) {
-                            // log("有成员退出通知");
+                            log("有成员退出通知", notify);
-                            // const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
+                            try {
-                            // let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
+                                const member1 = await NTQQUserApi.getUserDetailInfo(notify.user1.uid);
-                            // postEvent(groupDecreaseEvent, true);
+                                let operatorId = member1.uin;
+                                let subType: GroupDecreaseSubType = "leave";
+                                if (notify.user2.uid) {
+                                    // 是被踢的
+                                    const member2 = await getGroupMember(notify.group.groupCode, notify.user2.uid);
+                                    operatorId = member2.uin;
+                                    subType = "kick";
+                                }
+                                let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin), parseInt(operatorId), subType)
+                                postOB11Event(groupDecreaseEvent, true);
+                            } catch (e) {
+                                log("获取群通知的成员信息失败", notify, e.stack.toString())
+                            }
                         } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
                             log("有加群请求");
                             let groupRequestEvent = new OB11GroupRequestEvent();
@@ -373,13 +384,7 @@ function onLoad() {
             }
         })
         startReceiveHook().then();
-        // NTQQGroupApi.getGroups(true).then(_groups => {
+        NTQQGroupApi.getGroups(true).then()
-        //     _groups.map(group => {
-        //         if (!groups.find(g => g.groupCode == group.groupCode)) {
-        //             groups.push(group)
-        //         }
-        //     })
-        // })
         const config = getConfigUtil().getConfig()
         if (config.ob11.enableHttp) {
             ob11HTTPServer.start(config.ob11.httpPort)

src/ntqqapi/api/user.ts

@@ -3,7 +3,9 @@ import {SelfInfo, User} from "../types";
 import {ReceiveCmdS} from "../hook";
 import {uidMaps} from "../../common/data";
 import {NTQQWindowApi, NTQQWindows} from "./window";
+import {isQQ998, sleep} from "../../common/utils";
 
+let userInfoCache: Record<string, User> = {};  // uid: User
 
 export class NTQQUserApi{
     static async setQQAvatar(filePath: string) {
@@ -30,28 +32,40 @@ export class NTQQUserApi{
         })
         return result.profiles.get(uid)
     }
-    static async getUserDetailInfo(uid: string) {
+    static async getUserDetailInfo(uid: string, getLevel=false) {
-        const result = await callNTQQApi<{ info: User }>({
+        // this.getUserInfo(uid);
-            methodName: NTQQApiMethod.USER_DETAIL_INFO,
+        let methodName = !isQQ998 ? NTQQApiMethod.USER_DETAIL_INFO : NTQQApiMethod.USER_DETAIL_INFO_WITH_BIZ_INFO
-            cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
+        const fetchInfo = async ()=>{
-            afterFirstCmd: false,
+            const result = await callNTQQApi<{ info: User }>({
-            cmdCB: (payload) => {
+                methodName,
-                const success = payload.info.uid == uid
+                cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
-                // log("get user detail info", success, uid, payload)
+                afterFirstCmd: false,
-                return success
+                cmdCB: (payload) => {
-            },
+                    const success = payload.info.uid == uid
-            args: [
+                    // log("get user detail info", success, uid, payload)
-                {
+                    return success
-                    uid
                 },
-                null
+                args: [
-            ]
+                    {
-        })
+                        uid
-        const info = result.info
+                    },
-        if (info?.uin) {
+                    null
-            uidMaps[info.uid] = info.uin
+                ]
+            })
+            const info = result.info
+            if (info?.uin) {
+                uidMaps[info.uid] = info.uin
+            }
+            return info
         }
-        return info
+        // 首次请求两次才能拿到的等级信息
+        if (!userInfoCache[uid] && getLevel) {
+            await fetchInfo()
+            await sleep(1000);
+        }
+        let userInfo = await fetchInfo()
+        userInfoCache[uid] = userInfo
+        return userInfo
     }
 
     static async getPSkey() {

src/ntqqapi/hook.ts

@@ -1,7 +1,7 @@
 import {BrowserWindow} from 'electron';
 import {NTQQApiClass} from "./ntcall";
 import {NTQQMsgApi, sendMessagePool} from "./api/msg"
-import {ChatType, Group, GroupMember, RawMessage, User} from "./types";
+import {ChatType, Group, GroupMember, GroupMemberRole, RawMessage, User} from "./types";
 import {friends, getGroupMember, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
 import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
 import {v4 as uuidv4} from "uuid"
@@ -12,7 +12,6 @@ import {dbUtil} from "../common/db";
 import {NTQQGroupApi} from "./api/group";
 import {log} from "../common/utils/log";
 import {sleep} from "../common/utils/helper";
-import {OB11GroupCardEvent} from "../onebot11/event/notice/OB11GroupCardEvent";
 
 export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
 
@@ -243,6 +242,11 @@ async function processGroupEvent(payload: {groupList: Group[]}) {
                         newMembersSet.add(member.uin);
                     }
 
+                    // 判断bot是否是管理员，如果是管理员不需要从这里得知有人退群，这里的退群无法得知是主动退群还是被踢
+                    let bot = await getGroupMember(group.groupCode, selfInfo.uin)
+                    if (bot.role == GroupMemberRole.admin || bot.role == GroupMemberRole.owner) {
+                        continue
+                    }
                     for (const member of oldMembers) {
                         if (!newMembersSet.has(member.uin) && member.uin != selfInfo.uin) {
                             postOB11Event(new OB11GroupDecreaseEvent(parseInt(group.groupCode), parseInt(member.uin), parseInt(member.uin), "leave"));

src/ntqqapi/ntcall.ts

@@ -35,6 +35,7 @@ export enum NTQQApiMethod {
     GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
     USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
     USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
+    USER_DETAIL_INFO_WITH_BIZ_INFO = "nodeIKernelProfileService/getUserDetailInfoWithBizInfo",
     FILE_TYPE = "getFileType",
     FILE_MD5 = "getFileMd5",
     FILE_COPY = "copyFile",

src/ntqqapi/types/msg.ts

@@ -172,9 +172,11 @@ export interface ArkElement {
 }
 
 export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
+export const IMAGE_HTTP_HOST_NT = "https://multimedia.nt.qq.com.cn"
 
 export interface PicElement {
-    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/
+    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+    originImageMd5?: string;
     sourcePath: string; // 图片本地路径
     thumbPath: Map<number, string>;
     picWidth: number;

src/ntqqapi/types/notify.ts

@@ -4,8 +4,9 @@ export enum GroupNotifyTypes {
     INVITED_JOIN = 4,  // 有人接受了邀请入群
     JOIN_REQUEST = 7,
     ADMIN_SET = 8,
+    KICK_MEMBER = 9,
+    MEMBER_EXIT = 11, // 主动退出
     ADMIN_UNSET = 12,
-    MEMBER_EXIT = 11, // 主动退出?
 
 }
 

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

@@ -15,6 +15,6 @@ export default class GoCQHTTPGetStrangerInfo extends BaseAction<{ user_id: numbe
         if (!uid) {
             throw new Error("查无此人")
         }
-        return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid))
+        return OB11Constructor.stranger(await NTQQUserApi.getUserDetailInfo(uid, true))
     }
 }

src/onebot11/action/group/GetGroupMemberInfo.ts

@@ -21,7 +21,7 @@ class GetGroupMemberInfo extends BaseAction<PayloadType, OB11GroupMember> {
         if (member) {
             if (isNull(member.sex)){
                 log("获取群成员详细信息")
-                let info = (await NTQQUserApi.getUserDetailInfo(member.uid))
+                let info = (await NTQQUserApi.getUserDetailInfo(member.uid, true))
                 log("群成员详细信息结果", info)
                 Object.assign(member, info);
             }

src/onebot11/constructor.ts

@@ -14,7 +14,7 @@ import {
     GrayTipElementSubType,
     Group,
     GroupMember,
-    IMAGE_HTTP_HOST,
+    IMAGE_HTTP_HOST, IMAGE_HTTP_HOST_NT,
     RawMessage,
     SelfInfo,
     Sex,
@@ -40,11 +40,12 @@ import {OB11GroupTitleEvent} from "./event/notice/OB11GroupTitleEvent";
 import {OB11GroupCardEvent} from "./event/notice/OB11GroupCardEvent";
 import {OB11GroupDecreaseEvent} from "./event/notice/OB11GroupDecreaseEvent";
 
+let lastRKeyUpdateTime = 0;
 
 export class OB11Constructor {
     static async message(msg: RawMessage): Promise<OB11Message> {
-
+        let config = getConfigUtil().getConfig();
-        const {enableLocalFile2Url, ob11: {messagePostFormat}} = getConfigUtil().getConfig()
+        const {enableLocalFile2Url, ob11: {messagePostFormat}} = config;
         const message_type = msg.chatType == ChatType.group ? "group" : "private";
         const resMsg: OB11Message = {
             self_id: parseInt(selfInfo.uin),
@@ -140,9 +141,30 @@ export class OB11Constructor {
                 // message_data["data"]["path"] = element.picElement.sourcePath
                 const url = element.picElement.originImageUrl
                 const fileMd5 = element.picElement.md5HexStr
+                // let currentRKey = config.imageRKey || "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
+                let currentRKey = "CAQSKAB6JWENi5LMk0kc62l8Pm3Jn1dsLZHyRLAnNmHGoZ3y_gDZPqZt-64"
                 if (url) {
-                    message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                    if (url.startsWith("/download")) {
-                } else if (fileMd5 && element.picElement.fileUuid.indexOf("_") === -1) { // fileuuid有下划线的是Linux发送的，这个url是另外的格式，目前尚未得知如何组装
+                        if (url.includes("&rkey=")) {
+                            // 正则提取rkey
+                            // const rkey = url.match(/&rkey=([^&]+)/)[1]
+                            // // log("图片url已有rkey", rkey)
+                            // if (rkey != currentRKey){
+                            //     config.imageRKey = rkey
+                            //     if (Date.now() - lastRKeyUpdateTime > 1000 * 60) {
+                            //         lastRKeyUpdateTime = Date.now()
+                            //         getConfigUtil().setConfig(config)
+                            //     }
+                            // }
+                            message_data["data"]["url"] = IMAGE_HTTP_HOST_NT + url
+                        }
+                        else{
+                            message_data["data"]["url"] = IMAGE_HTTP_HOST_NT + url + "&rkey=" + currentRKey
+                        }
+                    } else {
+                        message_data["data"]["url"] = IMAGE_HTTP_HOST + url
+                    }
+                } else if (fileMd5) {
                     message_data["data"]["url"] = `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${fileMd5.toUpperCase()}/0`
                 }
                 // message_data["data"]["file_id"] = element.picElement.fileUuid

src/version.ts

@@ -1 +1 @@
-export const version = "3.20.1"
+export const version = "3.20.3"