feat(koishi): support , and _ as number delim, fix #1386

koishijs · May 9, 2024 · be8bcb2 · be8bcb2
1 parent 809e6da
commit be8bcb2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/core/src/command/index.ts b/packages/core/src/command/index.ts
@@ -165,7 +165,9 @@ export class Commander {
     this.domain('boolean', () => true)
 
     this.domain('number', (source, session) => {
-      const value = +source
+      // support `,` and `_` as delimiters
+      // https://github.com/koishijs/koishi/issues/1386
+      const value = +source.replace(/[,_]/g, '')
       if (Number.isFinite(value)) return value
       throw new Error('internal.invalid-number')
     }, { numeric: true })

diff --git a/packages/core/src/database.ts b/packages/core/src/database.ts
@@ -13,11 +13,14 @@ declare module './context' {
   }
 
   namespace Context {
+    // https://github.com/typescript-eslint/typescript-eslint/issues/6720
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     interface Database<C extends Context = Context> {
       getUser<K extends FlatKeys<User>>(platform: string, pid: string, modifier?: Driver.Cursor<K>): Promise<FlatPick<User, K>>
       setUser(platform: string, pid: string, data: Update<User>): Promise<void>
       createUser(platform: string, pid: string, data: Partial<User>): Promise<User>
-      getChannel<K extends FlatKeys<Channel>>(platform: string, id: MaybeArray<string>, modifier?: Driver.Cursor<K>): Promise<FlatPick<Channel, K> | FlatPick<Channel, K>[]>
+      getChannel<K extends FlatKeys<Channel>>(platform: string, id: string, modifier?: Driver.Cursor<K>): Promise<FlatPick<Channel, K | 'id' | 'platform'>>
+      getChannel<K extends FlatKeys<Channel>>(platform: string, ids: string[], modifier?: Driver.Cursor<K>): Promise<FlatPick<Channel, K>[]>
       getAssignedChannels<K extends Channel.Field>(fields?: K[], selfIdMap?: Dict<string[]>): Promise<Pick<Channel, K>[]>
       setChannel(platform: string, id: string, data: Update<Channel>): Promise<void>
       createChannel(platform: string, id: string, data: Partial<Channel>): Promise<Channel>
@@ -89,8 +92,6 @@ export class KoishiDatabase {
   constructor(public ctx: Context) {
     ctx.plugin(minato.Database)
 
-    ctx.set('koishi.database', this)
-
     ctx.mixin('koishi.database', {
       getUser: 'database.getUser',
       setUser: 'database.setUser',