koishi-plugin-toram 4.2.1-test.1 → 4.2.2

package/lib/index.js

@@ -178,7 +178,7 @@ var JsonMgr = _JsonMgr;
 
 // src/script/botFunction/monthlyCardReminder.ts
 var MONTHLY_CARD_REMINDER_TYPE = "monthly-card-reminder";
-function scheduleMonthlyCardReminders(groupId, hours) {
+async function scheduleMonthlyCardReminders(groupId, hours) {
   const now = /* @__PURE__ */ new Date();
   for (let i = 0; i < hours.length; i++) {
     const hour = hours[i];
@@ -190,7 +190,7 @@ function scheduleMonthlyCardReminders(groupId, hours) {
       (x) => x.type === MONTHLY_CARD_REMINDER_TYPE && x.payload?.groupId === groupId && x.payload?.timeIndex === i
     );
     if (!exists) {
-      BotTodoMgr.Inst().addTodo(ts, MONTHLY_CARD_REMINDER_TYPE, { groupId, timeIndex: i });
+      await BotTodoMgr.Inst().addTodo(ts, MONTHLY_CARD_REMINDER_TYPE, { groupId, timeIndex: i });
     }
   }
 }
@@ -241,6 +241,53 @@ function executeAllMemberReminder(item) {
 }
 __name(executeAllMemberReminder, "executeAllMemberReminder");
 
+// src/script/botFunction/monthlyCardFinalReminder.ts
+var MONTHLY_CARD_FINAL_REMINDER_TYPE = "monthly-card-final-reminder";
+async function scheduleMonthlyCardFinalReminder(groupId) {
+  const now = /* @__PURE__ */ new Date();
+  const next = new Date(now);
+  next.setHours(23, 30, 0, 0);
+  if (next.getTime() <= now.getTime()) next.setDate(next.getDate() + 1);
+  const ts = next.getTime();
+  const exists = (BotTodoMgr.Inst().getTodosAt(ts) || []).some(
+    (x) => x.type === MONTHLY_CARD_FINAL_REMINDER_TYPE && x.payload?.groupId === groupId
+  );
+  if (!exists) {
+    await BotTodoMgr.Inst().addTodo(ts, MONTHLY_CARD_FINAL_REMINDER_TYPE, { groupId });
+  }
+}
+__name(scheduleMonthlyCardFinalReminder, "scheduleMonthlyCardFinalReminder");
+function executeMonthlyCardFinalReminder(item) {
+  const payload = item.payload || {};
+  const groupId = payload.groupId;
+  if (!groupId) return;
+  const atUsers = genMonthlyCardFinalReminderUsers();
+  if (atUsers) {
+    TalkMgr.Inst().send(groupId, "月卡最后提醒", { atUsers });
+  }
+  const next = new Date(item.ts + 24 * 60 * 60 * 1e3);
+  next.setHours(23, 30, 0, 0);
+  const nextTs = next.getTime();
+  const exists = (BotTodoMgr.Inst().getTodosAt(nextTs) || []).some(
+    (x) => x.type === MONTHLY_CARD_FINAL_REMINDER_TYPE && x.payload?.groupId === groupId
+  );
+  if (!exists) {
+    BotTodoMgr.Inst().addTodo(nextTs, MONTHLY_CARD_FINAL_REMINDER_TYPE, { groupId });
+  }
+}
+__name(executeMonthlyCardFinalReminder, "executeMonthlyCardFinalReminder");
+function genMonthlyCardFinalReminderUsers() {
+  const users = UserMgr.Inst().getAllMonthlyCardRemindUsers();
+  if (users.length === 0) return;
+  const now = /* @__PURE__ */ new Date();
+  const todayStr = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
+  const notConfirmed = users.filter((user) => user.lastGetMonthlyCardDate !== todayStr);
+  if (notConfirmed.length === 0) return;
+  const atUsers = notConfirmed.map((user) => `<at id="${user.qq}"/>`).join(" ");
+  return atUsers;
+}
+__name(genMonthlyCardFinalReminderUsers, "genMonthlyCardFinalReminderUsers");
+
 // src/script/command/allMemberRemindCommand.ts
 function allMemberRemind(event, args) {
   const qq = event.session.event.user.id;
@@ -712,22 +759,22 @@ var _BotTodoMgr = class _BotTodoMgr {
     return list.map((x) => ({ ...x }));
   }
   // 删除某个时间戳下的指定 todo
-  removeTodo(ts, id) {
+  async removeTodo(ts, id) {
     const list = this._todos.get(ts);
     if (!list) return;
     const next = list.filter((x) => x.id !== id);
     if (next.length > 0) this._todos.set(ts, next);
     else this._todos.delete(ts);
-    this.saveTodos();
+    await this.saveTodos();
   }
   // 删除某个时间戳下的所有 todo
-  removeTodosAt(ts) {
+  async removeTodosAt(ts) {
     if (!this._todos.has(ts)) return;
     this._todos.delete(ts);
-    this.saveTodos();
+    await this.saveTodos();
   }
   // 取出并删除“到期”的 todo 列表（ts <= now）
-  popDueTodos(now) {
+  async popDueTodos(now) {
     const result = [];
     const keys = Array.from(this._todos.keys()).filter((ts) => ts <= now).sort((a, b) => a - b);
     keys.forEach((ts) => {
@@ -735,7 +782,7 @@ var _BotTodoMgr = class _BotTodoMgr {
       if (list && list.length) result.push(...list);
       this._todos.delete(ts);
     });
-    if (keys.length > 0) this.saveTodos();
+    if (keys.length > 0) await this.saveTodos();
     return result;
   }
   // 下一个最近的时间戳（若不存在返回 undefined）
@@ -763,10 +810,10 @@ var _BotTodoMgr = class _BotTodoMgr {
     this._nextTs = void 0;
   }
   // 立即重新计算下一个调度点
-  scheduleNext() {
+  async scheduleNext() {
     if (!this._started) return;
     try {
-      const dropped = this.popDueTodos(Date.now());
+      const dropped = await this.popDueTodos(Date.now());
       if (dropped.length) {
         console.warn("BotTodoMgr 清理过期任务数量: ", dropped.length);
       }
@@ -796,7 +843,7 @@ var _BotTodoMgr = class _BotTodoMgr {
         const list = this._todos.get(scheduledTs) || [];
         if (list.length) {
           this._todos.delete(scheduledTs);
-          this.saveTodos();
+          await this.saveTodos();
           await this.executeBatch(list);
         }
       } catch (e) {
@@ -899,6 +946,7 @@ async function apply(ctx, config) {
     config.monthlyCardReminder_eveningTime,
     config.monthlyCardReminder_latenightTime
   ]);
+  scheduleMonthlyCardFinalReminder(config.groupId);
   ctx.on("notice", (session) => {
     if (config.sendDialog) logger.info(session);
     const event = newEvent(ctx, session, config, logger);
@@ -940,11 +988,19 @@ async function apply(ctx, config) {
     const event = newEvent(ctx, session, config, logger);
     allMemberRemind(event, args);
   });
+  ctx.command("我领月卡啦").action(async ({ session }, ...args) => {
+    const event = newEvent(ctx, session, config, logger);
+    const result = confirmMonthlyCardGet(event);
+    if (result.code === 1001 /* 通过 */) {
+      TalkMgr.Inst().reply(event, "月卡确认领取");
+    }
+  });
 }
 __name(apply, "apply");
 function registerBotTodoHandlers() {
   BotTodoMgr.Inst().on(ALL_MEMBER_REMINDER_TYPE, executeAllMemberReminder);
   BotTodoMgr.Inst().on(MONTHLY_CARD_REMINDER_TYPE, executeMonthlyCardReminder);
+  BotTodoMgr.Inst().on(MONTHLY_CARD_FINAL_REMINDER_TYPE, executeMonthlyCardFinalReminder);
 }
 __name(registerBotTodoHandlers, "registerBotTodoHandlers");
 function newEvent(ctx, session, config, logger) {

package/lib/script/BotTodoMgr.d.ts

@@ -23,14 +23,14 @@ export declare class BotTodoMgr {
     private saveTodos;
     addTodo(ts: number, type: string, payload?: any): Promise<string>;
     getTodosAt(ts: number): BotTodoItem[];
-    removeTodo(ts: number, id: string): void;
-    removeTodosAt(ts: number): void;
-    popDueTodos(now: number): BotTodoItem[];
+    removeTodo(ts: number, id: string): Promise<void>;
+    removeTodosAt(ts: number): Promise<void>;
+    popDueTodos(now: number): Promise<BotTodoItem[]>;
     getNextTimestamp(): number | undefined;
     on(type: string, handler: (item: BotTodoItem) => any | Promise<any>): void;
     start(): void;
     stop(): void;
-    scheduleNext(): void;
+    scheduleNext(): Promise<void>;
     private internalPlanNext;
     private executeBatch;
 }

package/lib/script/botFunction/index.d.ts

@@ -1,2 +1,3 @@
 export * from './monthlyCardReminder';
 export * from './allMemberReminder';
+export * from './monthlyCardFinalReminder';

package/lib/script/botFunction/monthlyCardFinalReminder.d.ts

@@ -0,0 +1,4 @@
+import { BotTodoItem } from "../BotTodoMgr";
+export declare const MONTHLY_CARD_FINAL_REMINDER_TYPE = "monthly-card-final-reminder";
+export declare function scheduleMonthlyCardFinalReminder(groupId: string): Promise<void>;
+export declare function executeMonthlyCardFinalReminder(item: BotTodoItem): void;

package/lib/script/botFunction/monthlyCardReminder.d.ts

@@ -1,4 +1,4 @@
 import { BotTodoItem } from "../BotTodoMgr";
 export declare const MONTHLY_CARD_REMINDER_TYPE = "monthly-card-reminder";
-export declare function scheduleMonthlyCardReminders(groupId: string, hours: number[]): void;
+export declare function scheduleMonthlyCardReminders(groupId: string, hours: number[]): Promise<void>;
 export declare function executeMonthlyCardReminder(item: BotTodoItem): void;

package/package.json

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