refactor: MemberInfo-1

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,56 +25,56 @@ 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 webGroupMembers = await WebApi.getGroupMembers(payload.group_id.toString());
+    const role = (await getGroupMember(payload.group_id, selfInfo.uin))?.role;
+
     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]);
     }
-    // 合并数据
-    for (let i = 0, len = webGroupMembers.length; i < len; i++) {
-      if (!webGroupMembers[i]?.uin) {
-        continue;
-      }
-      const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
-      if (MemberData) {
-        MemberData.join_time = webGroupMembers[i]?.join_time;
-        MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
-        MemberData.qage = webGroupMembers[i]?.qage;
-        MemberData.level = webGroupMembers[i]?.lv.level;
-        MemberMap.set(webGroupMembers[i]?.uin, MemberData);
-      }
-    }
-    // 还原Map到Array
-    const RetGroupMember: OB11GroupMember[] = Array.from(MemberMap.values());
 
-     // 无管理员权限通过本地记录获取发言时间
-    const haveAdmin = RetGroupMember[0].last_sent_time !== 0;
-    if (!haveAdmin) {
-      //logDebug('没有管理员权限，使用本地记录');
-      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;
+    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;
         }
-      })
+        const MemberData = MemberMap.get(webGroupMembers[i]?.uin);
+        if (MemberData) {
+          MemberData.join_time = webGroupMembers[i]?.join_time;
+          MemberData.last_sent_time = webGroupMembers[i]?.last_speak_time;
+          MemberData.qage = webGroupMembers[i]?.qage;
+          MemberData.level = webGroupMembers[i]?.lv.level;
+          MemberMap.set(webGroupMembers[i]?.uin, MemberData);
+        }
+      }
+    } else if ((ob11Config.GroupLocalTimeRecord as Array<number>).includes(payload.group_id)) {
+      const _sendAndJoinRember = await getLastSentTimeAndJoinTime(payload.group_id);
+      _sendAndJoinRember.forEach((element) => {
+        let MemberData = MemberMap.get(element.user_id);
+        if (MemberData) {
+          MemberData.join_time = element.join_time;
+          MemberData.last_sent_time = element.last_sent_time;
+        }
+      });
     }
-    
-    return RetGroupMember;
+    // 还原索引到Array 一同返回
+    _groupMembers = Array.from(MemberMap.values());
+    return _groupMembers;
   }
 }
 

src/onebot11/action/group/LastSendAndJoinRemberLRU.ts

@@ -1,188 +0,0 @@
-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 path from "path";
-
-const dbPath = path.join(
-  ob11Config.getConfigDir(),
-  `lastSendAndJoinRember_${selfInfo.uin}.db`
-);
-const remberDb = new sqlite3.Database(dbPath);
-
-// 初始化全部的群到内存中
-const groupIds: number[] = [];
-remberDb.serialize(() => {
-  const sql = `SELECT * FROM sqlite_master WHERE type='table'`;
-  remberDb.all(sql, [], (err, rows: { name: string }[]) => {
-    if (err) return logError(err);
-    rows.forEach((row) => groupIds.push(parseInt(row.name)));
-    logDebug(`已加载 ${groupIds.length} 个群`);
-    console.log(groupIds);
-  });
-});
-
-const createTableSQL = (groupId: number) =>
-  `CREATE TABLE IF NOT EXISTS "${groupId}" (
-        user_id INTEGER,
-        last_sent_time INTEGER,
-        join_time INTEGER,
-        PRIMARY KEY (user_id)
-    );`;
-
-async function createTableIfNotExist(groupId: number) {
-  // 未开启本地记录
-  if (!ob11Config.localDB) return;
-
-  logDebug("检测数据表存在", groupId);
-  if (groupIds.includes(groupId)) {
-    logDebug("数据表已存在", groupId);
-    return;
-  }
-
-  logDebug("创建数据表", groupId);
-  return new Promise((resolve, reject) => {
-    const sql = createTableSQL(groupId);
-    remberDb.all(sql, (err) => {
-      if (err) {
-        logError("数据表创建失败", err);
-        reject(err);
-        return;
-      }
-      groupIds.push(groupId);
-      logDebug("数据表创建成功", groupId);
-      resolve(true);
-    });
-  });
-}
-
-// 入群记录
-export async function insertJoinTime(
-  groupId: number,
-  userId: number,
-  time: number
-) {
-  // 未开启本地记录
-  if (!ob11Config.localDB) return;
-
-  logDebug("插入入群时间", userId, groupId);
-  await createTableIfNotExist(groupId);
-  remberDb.all(
-    `INSERT OR REPLACE INTO "${groupId}"  (user_id, last_sent_time, join_time) VALUES (?,?,?)`,
-    [userId, time, time],
-    (err) => {
-      if (err)
-        logError(err),
-          Promise.reject(),
-          console.log("插入入群时间失败", userId, groupId);
-    }
-  );
-}
-
-// 发言记录
-const LURCache = new LRU<number>();
-const LastSentCache = new (class {
-  private cache: { gid: number; uid: number }[] = [];
-  private maxSize: number;
-
-  constructor(maxSize: number = 5000) {
-    this.maxSize = maxSize;
-  }
-
-  get(gid: number, uid: number): boolean {
-    const exists = this.cache.some(
-      (entry) => entry.gid === gid && entry.uid === uid
-    );
-    if (!exists) {
-      this.cache.push({ gid, uid });
-      if (this.cache.length > this.maxSize) {
-        this.cache.shift();
-      }
-    }
-
-    return exists;
-  }
-})();
-
-LURCache.on(async (node) => {
-  const { value: time, groupId, userId } = node;
-
-  logDebug("插入发言时间", userId, groupId);
-  await createTableIfNotExist(groupId);
-
-  const method = await getDataSetMethod(groupId, userId);
-  logDebug("插入发言时间方法判断", userId, groupId, method);
-
-  const sql =
-    method == "update"
-      ? `UPDATE "${groupId}" SET last_sent_time = ? WHERE user_id = ?`
-      : `INSERT INTO "${groupId}" (last_sent_time, user_id)  VALUES (?, ?)`;
-
-  remberDb.all(sql, [time, userId], (err) => {
-    if (err) {
-      return logError("插入/更新发言时间失败", userId, groupId);
-    }
-    logDebug("插入/更新发言时间成功", userId, groupId);
-  });
-});
-
-async function getDataSetMethod(groupId: number, userId: number) {
-  // 缓存记录
-  if (LastSentCache.get(groupId, userId)) {
-    logDebug("缓存命中", userId, groupId);
-    return "update";
-  }
-
-  // 数据库判断
-  return new Promise<"insert" | "update">((resolve, reject) => {
-    remberDb.all(
-      `SELECT * FROM "${groupId}" WHERE user_id = ?`,
-      [userId],
-      (err, rows) => {
-        if (err) {
-          logError("查询发言时间存在失败", userId, groupId, err);
-          return logError("插入发言时间失败", userId, groupId, err);
-        }
-
-        if (rows.length === 0) {
-          logDebug("查询发言时间不存在", userId, groupId);
-          return resolve("insert");
-        }
-
-        logDebug("查询发言时间存在", userId, groupId);
-        resolve("update");
-      }
-    );
-  });
-}
-
-interface IRember {
-  last_sent_time: number;
-  join_time: number;
-  user_id: number;
-}
-export async function getLastSentTimeAndJoinTime(
-  groupId: number
-): Promise<IRember[]> {
-  logDebug("读取发言时间", groupId);
-  return new Promise<IRember[]>((resolve, reject) => {
-    remberDb.all(`SELECT * FROM "${groupId}" `, (err, rows: IRember[]) => {
-      if (err) {
-        logError("查询发言时间失败", groupId);
-        return resolve([]);
-      }
-      logDebug("查询发言时间成功", groupId, rows);
-      resolve(rows);
-    });
-  });
-}
-
-export function insertLastSentTime(
-  groupId: number,
-  userId: number,
-  time: number
-) {
-  if (!ob11Config.localDB) return;
-  LURCache.set(groupId, userId,time)
-}

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 缓存实现 但是现在在这里方便
 //