koishi-plugin-toram 4.1.2 → 4.2.0-test.1

package/lib/index.d.ts

@@ -2,6 +2,9 @@ import { Context, Logger, Schema, Session } from 'koishi';
 export declare const name = "toram";
 export declare const inject: string[];
 declare module 'koishi' {
+    interface Events {
+        'notice.notify'(...args: any[]): void;
+    }
 }
 export interface Config {
     qq: string;
@@ -17,6 +20,7 @@ export interface Config {
     monthlyCardReminder_afternoonTime: number;
     monthlyCardReminder_eveningTime: number;
     monthlyCardReminder_latenightTime: number;
+    sendDialog: boolean;
 }
 export declare const Config: Schema<Config>;
 export interface SessionEvent {

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");
@@ -319,6 +319,14 @@ function checkArgs(args, config) {
     if (date.getFullYear() !== y || date.getMonth() !== m - 1 || date.getDate() !== d) return null;
     return { date, yearProvided };
   }, "parseSingleDay");
+  const timeStr = timePointStr.trim().replace(/：/g, ":");
+  const tm = timeStr.match(/^(\d{1,2}):(\d{1,2})$/);
+  if (!tm) return new Result(3002 /* 时间不正确 */);
+  const hour = Number(tm[1]);
+  const minute = Number(tm[2]);
+  if (!Number.isInteger(hour) || !Number.isInteger(minute) || hour < 0 || hour > 23 || minute < 0 || minute > 59) {
+    return new Result(3002 /* 时间不正确 */);
+  }
   const periodParts = timePeriod.split("-").map((s) => s.trim()).filter((s) => s.length > 0);
   if (periodParts.length < 1 || periodParts.length > 2) {
     return new Result(3002 /* 时间不正确 */);
@@ -335,13 +343,13 @@ function checkArgs(args, config) {
       endDate = new Date(endDate.getFullYear() + 1, endDate.getMonth(), endDate.getDate());
     }
   }
-  const timeStr = timePointStr.trim().replace(/：/g, ":");
-  const tm = timeStr.match(/^(\d{1,2}):(\d{1,2})$/);
-  if (!tm) return new Result(3002 /* 时间不正确 */);
-  const hour = Number(tm[1]);
-  const minute = Number(tm[2]);
-  if (!Number.isInteger(hour) || !Number.isInteger(minute) || hour < 0 || hour > 23 || minute < 0 || minute > 59) {
-    return new Result(3002 /* 时间不正确 */);
+  if (periodParts.length === 1 && !startParsed.yearProvided) {
+    const firstDt = new Date(startDate);
+    firstDt.setHours(hour, minute, 0, 0);
+    if (firstDt.getTime() <= now.getTime()) {
+      startDate = new Date(startDate.getFullYear() + 1, startDate.getMonth(), startDate.getDate());
+      endDate = startDate;
+    }
   }
   if (endDate.getTime() < startDate.getTime()) return new Result(3002 /* 时间不正确 */);
   const timeList = [];
@@ -351,7 +359,9 @@ function checkArgs(args, config) {
   while (cursor.getTime() <= endDate.getTime()) {
     const dt = new Date(cursor);
     dt.setHours(hour, minute, 0, 0);
-    timeList.push(dt.getTime());
+    if (dt.getTime() > now.getTime()) {
+      timeList.push(dt.getTime());
+    }
     cursor.setDate(cursor.getDate() + 1);
     guard++;
     if (guard > maxDays) return new Result(3002 /* 时间不正确 */);
@@ -816,7 +826,10 @@ var Config = import_koishi.Schema.intersect([
     monthlyCardReminder_afternoonTime: import_koishi.Schema.number().description("月卡提醒的下午时间").default(16),
     monthlyCardReminder_eveningTime: import_koishi.Schema.number().description("月卡提醒的晚上时间").default(20),
     monthlyCardReminder_latenightTime: import_koishi.Schema.number().description("月卡提醒的深夜时间").default(23)
-  }).description("月卡提醒管理")
+  }).description("月卡提醒管理"),
+  import_koishi.Schema.object({
+    sendDialog: import_koishi.Schema.boolean().description("是否发送日志以调试").default(false)
+  }).description("调试相关")
 ]);
 async function apply(ctx, config) {
   const logger = ctx.logger("toram");
@@ -839,7 +852,7 @@ async function apply(ctx, config) {
     config.monthlyCardReminder_latenightTime
   ]);
   ctx.middleware(async (session, next) => {
-    logger.info(session);
+    if (config.sendDialog) logger.info(session);
     if (session.event.message.elements.some((e) => e.type === "at" && e.attrs.id === config.qq)) {
       const event = newEvent(ctx, session, config, logger);
       TalkMgr.Inst().reply(event, "被@", {
@@ -853,6 +866,9 @@ async function apply(ctx, config) {
     }
     return next();
   });
+  ctx.on("notice.notify", (session) => {
+    if (config.sendDialog) logger.info(session);
+  });
   ctx.command("升级 <等级数>").action(async ({ session }, ...args) => {
     const event = newEvent(ctx, session, config, logger);
     command_levelUP(event, args);
@@ -869,14 +885,6 @@ async function apply(ctx, config) {
     const event = newEvent(ctx, session, config, logger);
     allMemberRemind(event, args);
   });
-  ctx.command("魔导书，测试全员提醒").action(async ({ session }) => {
-    if (!config.adminQQList.includes(session.event.user.id)) return;
-    const event = newEvent(ctx, session, config, logger);
-    const groupId = event.config.groupId;
-    const content = "这是一个测试全员提醒的消息";
-    const message = genAtAllMessage(content);
-    TalkMgr.Inst().send(groupId, "简易回复", { result: message });
-  });
 }
 __name(apply, "apply");
 function registerBotTodoHandlers() {

package/package.json

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