refactor: MemberInfo-1

src/common/utils/LastSendAndJoinRemberLRU.ts

@@ -2,7 +2,7 @@ import sqlite3 from "sqlite3";
 import { logError, logDebug } from "@/common/utils/log";
 import { selfInfo } from "@/core/data";
 import { ob11Config } from "@/onebot11/config";
-import LRU from "./LRUCache";
+import LRU from "../../onebot11/action/group/LRUCache";
 import path from "path";
 
 const dbPath = path.join(
@@ -32,8 +32,7 @@ const createTableSQL = (groupId: number) =>
     );`;
 
 async function createTableIfNotExist(groupId: number) {
-  // 未开启本地记录
+
-  if (!ob11Config.localDB) return;
 
   logDebug("检测数据表存在", groupId);
   if (groupIds.includes(groupId)) {
@@ -63,9 +62,6 @@ export async function insertJoinTime(
   userId: number,
   time: number
 ) {
-  // 未开启本地记录
-  if (!ob11Config.localDB) return;
-
   logDebug("插入入群时间", userId, groupId);
   await createTableIfNotExist(groupId);
   remberDb.all(
@@ -183,6 +179,5 @@ export function insertLastSentTime(
   userId: number,
   time: number
 ) {
-  if (!ob11Config.localDB) return;
   LURCache.set(groupId, userId,time)
 }

src/common/utils/helper.ts

@@ -145,6 +145,7 @@ export function migrateConfig(oldConfig: any) {
     musicSignUrl: oldConfig.musicSignUrl,
     reportSelfMessage: oldConfig.reportSelfMessage,
     token: oldConfig.token,
+    GroupLocalTimeRecord: []
   };
   return newConfig;
 }

src/onebot11/action/group/GetGroupMemberList.ts

@@ -1,4 +1,4 @@
-import { getGroup, groupMembers } from '@/core/data';
+import { getGroup, getGroupMember, groupMembers, selfInfo } from '@/core/data';
 import { OB11GroupMember } from '../../types';
 import { OB11Constructor } from '../../constructor';
 import BaseAction from '../BaseAction';
@@ -7,7 +7,8 @@ import { napCatCore, NTQQGroupApi, NTQQUserApi, SignMiniApp } from '@/core';
 import { WebApi } from '@/core/apis/webapi';
 import { logDebug } from '@/common/utils/log';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { getLastSentTimeAndJoinTime }from "./LastSendAndJoinRemberLRU"
+import { getLastSentTimeAndJoinTime } from "../../../common/utils/LastSendAndJoinRemberLRU"
+import { ob11Config } from '@/onebot11/config';
 
 const SchemaData = {
   type: 'object',
@@ -24,25 +25,30 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
   actionName = ActionName.GetGroupMemberList;
   PayloadSchema = SchemaData;
   protected async _handle(payload: Payload) {
-    const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
+    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
-    const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
+
     const group = await getGroup(payload.group_id.toString());
     if (!group) {
       throw (`群${payload.group_id}不存在`);
     }
+
+    // 从Data里面获取
+    let _groupMembers: OB11GroupMember[] = OB11Constructor.groupMembers(group);
     if (payload.no_cache == true || payload.no_cache === 'true') {
       // webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());'
       const _groupMembers = await NTQQGroupApi.getGroupMembers(payload.group_id.toString());
       groupMembers.set(group.groupCode, _groupMembers);
     }
-    const _groupMembers = OB11Constructor.groupMembers(group);
 
-    // 方便索引处理
+    const MemberMap: Map<number, OB11GroupMember> = new Map<number, OB11GroupMember>();
+    // 转为Map 方便索引
     for (let i = 0, len = _groupMembers.length; i < len; i++) {
-
       MemberMap.set(_groupMembers[i].user_id, _groupMembers[i]);
     }
-    // 合并数据
+
+    const isPrivilege = role === 3 || role === 4;
+    if (isPrivilege) {
+      const webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
       for (let i = 0, len = webGroupMembers.length; i < len; i++) {
         if (!webGroupMembers[i]?.uin) {
           continue;
@@ -56,24 +62,19 @@ class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
           MemberMap.set(webGroupMembers[i]?.uin, MemberData);
         }
       }
-    // 还原Map到Array
+    } else if ((ob11Config.GroupLocalTimeRecord as Array<number>).includes(payload.group_id)) {
-    const RetGroupMember: OB11GroupMember[] = Array.from(MemberMap.values());
+      const _sendAndJoinRember = await getLastSentTimeAndJoinTime(payload.group_id);
-
+      _sendAndJoinRember.forEach((element) => {
-     // 无管理员权限通过本地记录获取发言时间
+        let MemberData = MemberMap.get(element.user_id);
-    const haveAdmin = RetGroupMember[0].last_sent_time !== 0;
+        if (MemberData) {
-    if (!haveAdmin) {
+          MemberData.join_time = element.join_time;
-      //logDebug('没有管理员权限，使用本地记录');
+          MemberData.last_sent_time = element.last_sent_time;
-      const _sendAndJoinRember = await getLastSentTimeAndJoinTime(parseInt(group.groupCode));
-      _sendAndJoinRember.forEach((rember) => {
-        const member = RetGroupMember.find(member=>member.user_id == rember.user_id);
-        if(member){
-          member.last_sent_time = rember.last_sent_time;
-          member.join_time = rember.join_time;
         }
-      })
+      });
     }
-    
+    // 还原索引到Array 一同返回
-    return RetGroupMember;
+    _groupMembers = Array.from(MemberMap.values());
+    return _groupMembers;
   }
 }
 

src/onebot11/config.ts

@@ -33,7 +33,7 @@ export interface OB11Config {
   reportSelfMessage: boolean;
   token: string;
 
-  localDB: boolean;
+  GroupLocalTimeRecord: Array<string>;
 
   read(): OB11Config;
 
@@ -67,7 +67,7 @@ class Config extends ConfigBase<OB11Config> implements OB11Config {
   reportSelfMessage = false;
   token = '';
 
-  localDB = true;
+  GroupLocalTimeRecord = [];
 
   getConfigPath() {
     return path.join(this.getConfigDir(), `onebot11_${selfInfo.uin}.json`);

src/onebot11/main.ts

@@ -35,7 +35,7 @@ import { Data as SysData } from '@/proto/SysMessage';
 import { Data as DeviceData } from '@/proto/SysMessage.DeviceChange';
 import { OB11FriendPokeEvent, OB11GroupPokeEvent } from './event/notice/OB11PokeEvent';
 import { isEqual } from '@/common/utils/helper';
-import { insertLastSentTime } from "./action/group/LastSendAndJoinRemberLRU"
+import { insertLastSentTime } from "../common/utils/LastSendAndJoinRemberLRU"
 
 //下面几个其实应该移进Core-Data 缓存实现 但是现在在这里方便
 //

src/webui/ui/components/WebUiApiOB11Config.ts

@@ -26,6 +26,7 @@ export interface OB11Config {
   musicSignUrl: '';
   reportSelfMessage: boolean;
   token: '';
+  GroupLocalTimeRecord: [];
 }
 
 class WebUiApiOB11ConfigWrapper {

static/assets/renderer.js

@@ -108,7 +108,7 @@ class WebUiApiOB11ConfigWrapper {
     this.retCredential = Credential;
   }
   async GetOB11Config() {
-    let ConfigResponse = await fetch("/api/OB11Config/GetConfig", {
+    const ConfigResponse = await fetch("/api/OB11Config/GetConfig", {
       method: "POST",
       headers: {
         Authorization: "Bearer " + this.retCredential,
@@ -116,7 +116,7 @@ class WebUiApiOB11ConfigWrapper {
       }
     });
     if (ConfigResponse.status == 200) {
-      let ConfigResponseJson = await ConfigResponse.json();
+      const ConfigResponseJson = await ConfigResponse.json();
       if (ConfigResponseJson.code == 0) {
         return ConfigResponseJson?.data;
       }
@@ -124,7 +124,7 @@ class WebUiApiOB11ConfigWrapper {
     return {};
   }
   async SetOB11Config(config) {
-    let ConfigResponse = await fetch("/api/OB11Config/SetConfig", {
+    const ConfigResponse = await fetch("/api/OB11Config/SetConfig", {
       method: "POST",
       headers: {
         Authorization: "Bearer " + this.retCredential,
@@ -133,7 +133,7 @@ class WebUiApiOB11ConfigWrapper {
       body: JSON.stringify({ config: JSON.stringify(config) })
     });
     if (ConfigResponse.status == 200) {
-      let ConfigResponseJson = await ConfigResponse.json();
+      const ConfigResponseJson = await ConfigResponse.json();
       if (ConfigResponseJson.code == 0) {
         return true;
       }
@@ -142,10 +142,11 @@ class WebUiApiOB11ConfigWrapper {
   }
 }
 const OB11ConfigWrapper = new WebUiApiOB11ConfigWrapper();
+
 async function onSettingWindowCreated(view) {
   const isEmpty = (value) => value === void 0 || value === void 0 || value === "";
   await OB11ConfigWrapper.Init(localStorage.getItem("auth"));
-  let ob11Config = await OB11ConfigWrapper.GetOB11Config();
+  const ob11Config = await OB11ConfigWrapper.GetOB11Config();
   const setOB11Config = (key, value) => {
     const configKey = key.split(".");
     if (configKey.length === 2) {
@@ -289,18 +290,18 @@ async function onSettingWindowCreated(view) {
       SettingList([
         SettingItem(
           "GitHub 仓库",
-          `https://github.com/NapNeko/NapCatQQ`,
+          "https://github.com/NapNeko/NapCatQQ",
           SettingButton("点个星星", "open-github")
         ),
-        SettingItem("NapCat 文档", ``, SettingButton("看看文档", "open-docs")),
+        SettingItem("NapCat 文档", "", SettingButton("看看文档", "open-docs")),
         SettingItem(
           "Telegram 群",
-          `https://t.me/+nLZEnpne-pQ1OWFl`,
+          "https://t.me/+nLZEnpne-pQ1OWFl",
           SettingButton("进去逛逛", "open-telegram")
         ),
         SettingItem(
           "QQ 群",
-          `545402644`,
+          "545402644",
           SettingButton("我要进去", "open-qq-group")
         )
       ]),
@@ -413,7 +414,7 @@ async function onSettingWindowCreated(view) {
         dom.removeAttribute("is-active");
       if (!isEmpty(dom.dataset.controlDisplayId)) {
         const displayDom = document.querySelector(
-          //@ts-ignore 等待修复
+          //@ts-expect-error 等待修复
           `#${dom.dataset.controlDisplayId}`
         );
         if (active)