fix(core): check getTargetId arg type

koishijs · Jan 16, 2020 · 00ab2ce · 00ab2ce
1 parent e4eea74
commit 00ab2ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/koishi-core/src/utils.ts b/packages/koishi-core/src/utils.ts
@@ -13,11 +13,11 @@ export function getSenderName (meta: MessageMeta) {
     : meta.sender ? meta.sender.card || meta.sender.nickname : userId
 }
 
-export function getTargetId (target: string) {
-  if (!target) return
+export function getTargetId (target: string | number) {
+  if (typeof target !== 'string' && typeof target !== 'number') return
   let qq = +target
   if (!qq) {
-    const capture = /\[CQ:at,qq=(\d+)\]/.exec(target)
+    const capture = /\[CQ:at,qq=(\d+)\]/.exec(target as any)
     if (capture) qq = +capture[1]
   }
   if (!isInteger(qq)) return

diff --git a/packages/koishi-core/tests/utils.spec.ts b/packages/koishi-core/tests/utils.spec.ts
@@ -46,6 +46,7 @@ describe('getTargetId', () => {
 
   test('wrong syntax', () => {
     expect(getTargetId('')).toBeFalsy()
+    expect(getTargetId(true as any)).toBeFalsy()
     expect(getTargetId('[CQ:at,qq=]')).toBeFalsy()
     expect(getTargetId('foo123')).toBeFalsy()
   })