fix(core): use $ prefix instead of _

koishijs · Feb 4, 2020 · f32a7e8 · f32a7e8
1 parent 797bde2
commit f32a7e8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/packages/koishi-core/src/command.ts b/packages/koishi-core/src/command.ts
@@ -272,7 +272,6 @@ export class Command {
 
     // check authority and usage
     const code = this._checkUser(meta, options)
-    this.context.logger('test').info(code)
     if (code) return this._sendHint(code, meta)
 
     // execute command

diff --git a/packages/koishi-core/src/database.ts b/packages/koishi-core/src/database.ts
@@ -15,7 +15,7 @@ export interface UserData {
   id: number
   flag: number
   authority: number
-  usage: Record<string, Usage> & { _date?: number }
+  usage: Record<string, Usage> & { $date?: number }
 }
 
 export type User<K extends UserField = UserField> = Observed<Pick<UserData, K | 'id'>>

diff --git a/packages/koishi-core/src/utils.ts b/packages/koishi-core/src/utils.ts
@@ -21,12 +21,12 @@ export function getTargetId (target: string | number) {
 const ONE_DAY = 86400000
 
 export function getUsage (name: string, user: Pick<UserData, 'usage'>, time = Date.now()) {
-  const _date = getDateNumber(time)
-  if (user.usage._date !== _date) {
+  const $date = getDateNumber(time)
+  if (user.usage.$date !== $date) {
     const oldUsage = user.usage
-    const newUsage = { _date } as any
+    const newUsage = { $date } as any
     for (const key in oldUsage) {
-      if (key === '_date') continue
+      if (key === '$date') continue
       const { last } = oldUsage[key]
       if (time.valueOf() - last < ONE_DAY) {
         newUsage[key] = { last, count: 0 }

diff --git a/packages/plugin-common/src/admin.ts b/packages/plugin-common/src/admin.ts
@@ -78,7 +78,7 @@ registerUserAction('clearUsage', async (meta, user, ...commands) => {
 
 registerUserAction('showUsage', async (meta, user, ...commands) => {
   const { usage } = user
-  if (!commands.length) commands = Object.keys(usage).filter(k => !k.startsWith('_'))
+  if (!commands.length) commands = Object.keys(usage).filter(k => !k.startsWith('$'))
   if (!commands.length) return meta.$send('用户今日没有调用过指令。')
   return meta.$send([
     '用户今日各指令的调用次数为：',