fix(schedule): check time misinterpretation, fix #89

koishijs · Aug 28, 2020 · c8e0bde · c8e0bde
1 parent c50bdfa
commit c8e0bde
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/packages/plugin-eval/src/index.ts b/packages/plugin-eval/src/index.ts
@@ -2,7 +2,7 @@ import { Context, Session } from 'koishi-core'
 import { CQCode, Logger, defineProperty, Random } from 'koishi-utils'
 import { EvalWorker, UserTrap, EvalConfig, Config } from './main'
 
-export { UserTrap, MainAPI } from './main'
+export { UserTrap, MainAPI, Config, MainConfig } from './main'
 
 declare module 'koishi-core/dist/app' {
   interface App {

diff --git a/packages/plugin-schedule/src/database.ts b/packages/plugin-schedule/src/database.ts
@@ -4,10 +4,10 @@ import MongoDatabase from 'koishi-plugin-mongo/dist/database'
 
 declare module 'koishi-core/dist/database' {
   interface Database {
-    createSchedule (time: Date, interval: number, command: string, session: Session): Promise<Schedule>
-    removeSchedule (id: number): Promise<any>
-    getSchedule (id: number): Promise<Schedule>
-    getAllSchedules (assignees?: number[]): Promise<Schedule[]>
+    createSchedule(time: Date, interval: number, command: string, session: Session): Promise<Schedule>
+    removeSchedule(id: number): Promise<any>
+    getSchedule(id: number): Promise<Schedule>
+    getAllSchedules(assignees?: number[]): Promise<Schedule[]>
   }
 
   interface Tables {

diff --git a/packages/plugin-schedule/src/index.ts b/packages/plugin-schedule/src/index.ts
@@ -77,10 +77,16 @@ export function apply(ctx: Context) {
 
       if (!options.rest) return '请输入要执行的指令。'
 
-      const time = Time.parseDate(dateSegments.join('-'))
-      if (Number.isNaN(+time)) {
-        return '请输入合法的日期。'
-      } else if (!options.interval && +time <= Date.now()) {
+      const dateString = dateSegments.join('-')
+      const time = Time.parseDate(dateString)
+      const timestamp = +time
+      if (Number.isNaN(timestamp) || timestamp > 2147483647000) {
+        if (/^\d+$/.test(dateString)) {
+          return `请输入合法的日期。你要输入的是不是 ${dateString}s？`
+        } else {
+          return '请输入合法的日期。'
+        }
+      } else if (!options.interval && timestamp <= Date.now()) {
         return '不能指定过去的时间为起始时间。'
       }