koishi-plugin-toram 4.2.0-test.2 → 4.2.0-test.3

package/lib/index.d.ts

@@ -1,7 +1,12 @@
 import { Context, Logger, Schema, Session } from 'koishi';
+import { UserData, BotTodoItem } from './script';
 export declare const name = "toram";
 export declare const inject: string[];
 declare module 'koishi' {
+    interface Tables {
+        toram_user: UserData;
+        toram_todo: BotTodoItem;
+    }
 }
 export interface Config {
     qq: string;

package/lib/index.js

@@ -219,7 +219,7 @@ __name(executeMonthlyCardReminder, "executeMonthlyCardReminder");
 function genMonthlyCardReminderUsers(timeIndex) {
   const users = UserMgr.Inst().getUsersWithMonthlyCardRemindTimeIndex(timeIndex);
   if (users.length === 0) return;
-  const atUsers = users.map((user) => `<at id="${user.qq}"/>`).join(" ") + " ";
+  const atUsers = users.map((user) => `<at id="${user.qq}"/>`).join(" ");
   return atUsers;
 }
 __name(genMonthlyCardReminderUsers, "genMonthlyCardReminderUsers");
@@ -463,7 +463,7 @@ function command_monthlyCardRemind(event, args) {
       return;
   }
   const { timeIndex } = checkResult.result;
-  const qq = Number(event.session.event.user.id);
+  const qq = event.session.event.user.id;
   UserMgr.Inst().setUserMonthlyCardRemindTimeIndex(qq, timeIndex);
   const hours = [
     event.config.monthlyCardReminder_midnightTime,
@@ -491,13 +491,25 @@ function checkArgs3(args) {
 }
 __name(checkArgs3, "checkArgs");
 function command_cancelMonthlyCardRemind(event, args) {
-  const qq = Number(event.session.event.user.id);
+  const qq = event.session.event.user.id;
   UserMgr.Inst().setUserMonthlyCardRemindTimeIndex(qq, -1);
   TalkMgr.Inst().reply(event, "简易回复", {
     result: "月卡提醒取消成功！"
   });
 }
 __name(command_cancelMonthlyCardRemind, "command_cancelMonthlyCardRemind");
+function confirmMonthlyCardGet(event) {
+  const qq = event.session.event.user.id;
+  const user = UserMgr.Inst().getAllMonthlyCardRemindUsers().find((u) => u.qq === qq);
+  let result;
+  if (user) {
+    result = UserMgr.Inst().updateUserLastGetMonthlyCardDate(qq);
+  } else {
+    result = new Result(1002 /* 无需处理 */);
+  }
+  return result;
+}
+__name(confirmMonthlyCardGet, "confirmMonthlyCardGet");
 
 // src/script/monster/monsterClass.ts
 var ElementType = /* @__PURE__ */ ((ElementType2) => {
@@ -576,16 +588,16 @@ var _UserMgr = class _UserMgr {
     }
     return _UserMgr.instance;
   }
-  setUsers() {
-    const data = JsonMgr.Inst().getJson("users.json");
+  async setUsers(ctx) {
+    this.ctx = ctx;
+    const data = await ctx.database.get("toram_user", {});
     if (!data) return;
     data.forEach((user) => {
       this._users.set(user.qq, user);
     });
   }
-  saveUsers() {
-    const data = Array.from(this._users.values());
-    JsonMgr.Inst().saveJson("users.json", data);
+  saveUser(user) {
+    this.ctx.database.upsert("toram_user", () => [user]);
   }
   addUser(qq, saveNow = true) {
     const user = {
@@ -597,7 +609,7 @@ var _UserMgr = class _UserMgr {
     };
     this._users.set(user.qq, user);
     if (saveNow) {
-      this.saveUsers();
+      this.saveUser(user);
     }
   }
   setUserMonthlyCardRemindTimeIndex(qq, timeIndex) {
@@ -607,7 +619,7 @@ var _UserMgr = class _UserMgr {
       user = this._users.get(qq);
     }
     user.monthlyCardRemindTimeIndex = timeIndex;
-    this.saveUsers();
+    this.saveUser(user);
   }
   getUsersWithMonthlyCardRemindTimeIndex(timeIndex) {
     const result = [];
@@ -619,6 +631,14 @@ var _UserMgr = class _UserMgr {
     });
     return result;
   }
+  getAllMonthlyCardRemindUsers() {
+    const result = [];
+    this._users.forEach((user) => {
+      if (user.monthlyCardRemindTimeIndex === -1) return;
+      result.push(user);
+    });
+    return result;
+  }
   updateUserLastGetMonthlyCardDate(qq) {
     let user = this._users.get(qq);
     if (!user) {
@@ -626,8 +646,13 @@ var _UserMgr = class _UserMgr {
       user = this._users.get(qq);
     }
     const now = /* @__PURE__ */ new Date();
-    user.lastGetMonthlyCardDate = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
-    this.saveUsers();
+    const dateStr = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+    if (user.lastGetMonthlyCardDate === dateStr) {
+      return new Result(1002 /* 无需处理 */);
+    }
+    user.lastGetMonthlyCardDate = dateStr;
+    this.saveUser(user);
+    return new Result(1001 /* 通过 */);
   }
 };
 __name(_UserMgr, "UserMgr");
@@ -833,12 +858,27 @@ var Config = import_koishi.Schema.intersect([
 ]);
 async function apply(ctx, config) {
   const logger = ctx.logger("toram");
+  ctx.model.extend("toram_user", {
+    // 各字段的类型声明
+    qq: "string",
+    nickname: "string",
+    otherNames: "list",
+    monthlyCardRemindTimeIndex: "integer",
+    lastGetMonthlyCardDate: "string"
+  });
+  ctx.model.extend("toram_todo", {
+    // 各字段的类型声明
+    id: "string",
+    ts: "double",
+    type: "string",
+    payload: "json"
+  });
   JsonMgr.Inst().setLogger(logger);
   await JsonMgr.Inst().loadJson();
   const bot = ctx.bots.find((bot2) => bot2.selfId === config.qq);
   TalkMgr.Inst().setBot(bot);
   TalkMgr.Inst().setTalks();
-  UserMgr.Inst().setUsers();
+  await UserMgr.Inst().setUsers(ctx);
   MonsterMgr.Inst().setMonsters();
   BotTodoMgr.Inst().setTodos();
   registerBotTodoHandlers();
@@ -853,6 +893,13 @@ async function apply(ctx, config) {
   ]);
   ctx.on("notice", (session) => {
     if (config.sendDialog) logger.info(session);
+    const event = newEvent(ctx, session, config, logger);
+    const result = confirmMonthlyCardGet(event);
+    if (result.code === 1001 /* 通过 */) {
+      TalkMgr.Inst().reply(event, "月卡确认领取");
+    } else {
+      TalkMgr.Inst().reply(event, "戳一戳");
+    }
   });
   ctx.middleware(async (session, next) => {
     if (config.sendDialog) logger.info(session);

package/lib/json/talks.json

@@ -24,12 +24,12 @@
         "你输入的时间段不正确哦？\n时间段可选：凌晨 早上 中午 下午 晚上 深夜"
     ],
     "月卡提醒": [
-        "@_atUsers_@\n魔导书来提醒你去领今天的月卡啦~",
-        "@_atUsers_@\n记得去领今天的月卡哦？",
-        "@_atUsers_@\n你领了今天的月卡了吗？",
-        "@_atUsers_@\n别忘了今天的月卡哦~",
-        "@_atUsers_@\n今天的月卡记得领取哦！",
-        "@_atUsers_@\n布谷布谷，领月卡的时间到啦~",
-        "@_atUsers_@\n快去领今天的月卡吧！"
+        "@_atUsers_@ \n魔导书来提醒你去领今天的月卡啦~",
+        "@_atUsers_@ \n记得去领今天的月卡哦？",
+        "@_atUsers_@ \n你领了今天的月卡了吗？",
+        "@_atUsers_@ \n别忘了今天的月卡哦~",
+        "@_atUsers_@ \n今天的月卡记得领取哦！",
+        "@_atUsers_@ \n布谷布谷，领月卡的时间到啦~",
+        "@_atUsers_@ \n快去领今天的月卡吧！"
     ]
 }

package/lib/script/ResultClass.d.ts

@@ -1,5 +1,6 @@
 export declare enum Code {
     通过 = 1001,
+    无需处理 = 1002,
     参数缺失 = 2001,
     无权限 = 2002,
     等级不正确 = 3001,

package/lib/script/command/monthlyCardRemindCommand.d.ts

@@ -1,3 +1,5 @@
 import { SessionEvent } from "../..";
+import { Result } from "..";
 export declare function command_monthlyCardRemind(event: SessionEvent, args: string[]): void;
 export declare function command_cancelMonthlyCardRemind(event: SessionEvent, args: string[]): void;
+export declare function confirmMonthlyCardGet(event: SessionEvent): Result<void>;

package/lib/script/user/UserMgr.d.ts

@@ -1,12 +1,15 @@
-import { UserData } from "..";
+import { Context } from "koishi";
+import { Result, UserData } from "..";
 export declare class UserMgr {
     private static instance;
     static Inst(): UserMgr;
+    private ctx;
     private _users;
-    setUsers(): void;
-    private saveUsers;
-    addUser(qq: number, saveNow?: boolean): void;
-    setUserMonthlyCardRemindTimeIndex(qq: number, timeIndex: number): void;
+    setUsers(ctx: Context): Promise<void>;
+    private saveUser;
+    addUser(qq: string, saveNow?: boolean): void;
+    setUserMonthlyCardRemindTimeIndex(qq: string, timeIndex: number): void;
     getUsersWithMonthlyCardRemindTimeIndex(timeIndex: number): UserData[];
-    updateUserLastGetMonthlyCardDate(qq: number): void;
+    getAllMonthlyCardRemindUsers(): UserData[];
+    updateUserLastGetMonthlyCardDate(qq: string): Result<void>;
 }

package/lib/script/user/userClass.d.ts

@@ -1,5 +1,5 @@
 export interface UserData {
-    qq: number;
+    qq: string;
     nickname: string;
     otherNames: string[];
     monthlyCardRemindTimeIndex: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-toram",
   "description": "托拉姆物语小工具",
-  "version": "4.2.0-test.2",
+  "version": "4.2.0-test.3",
   "contributors": [
     "青灯 <1874053520@qq.com>"
   ],