fix: type error

ikenxuan · Feb 22, 2025 · d5e4c43 · d5e4c43
1 parent 133259f
commit d5e4c43
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 36 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/src/platform/bilibili/routes.ts b/src/platform/bilibili/routes.ts
@@ -1,10 +1,11 @@
 import express, { Request, Response, Router } from 'express'
 import { BilibiliData } from 'amagi/platform/bilibili'
-import { BilibiliDataOptionsMap } from 'amagi/types'
+import { BilibiliDataOptionsMap, OmitMethodType } from 'amagi/types'
 
-/** @ts-ignore */
 export interface BilibiliRequest<T extends keyof BilibiliDataOptionsMap> extends Request {
-  query: Omit<BilibiliDataOptionsMap[T]['opt'], 'methodType'>
+  query: {
+    [K in keyof OmitMethodType<BilibiliDataOptionsMap[T]['opt']>]: string
+  }
 }
 
 /**
@@ -63,8 +64,8 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: '单个视频下载信息数据',
-      avid: req.query.avid,
-      cid: req.query.cid
+      avid: parseInt(req.query.avid),
+      cid: parseInt(req.query.cid)
     }, req.headers.cookie || cookie)
     res.json(data)
   })
@@ -109,7 +110,7 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: '番剧下载信息数据',
-      cid: req.query.cid,
+      cid: parseInt(req.query.cid),
       ep_id: req.query.ep_id
     }, req.headers.cookie || cookie)
     res.json(data)
@@ -121,7 +122,7 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: '用户主页动态列表数据',
-      host_mid: req.query.host_mid
+      host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie)
     res.json(data)
   })
@@ -154,7 +155,7 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: '用户主页数据',
-      host_mid: req.query.host_mid
+      host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie)
     res.json(data)
   })
@@ -199,7 +200,7 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: 'AV转BV',
-      avid: req.query.avid
+      avid: parseInt(req.query.avid)
     }, req.headers.cookie || cookie)
     res.json(data)
   })
@@ -210,7 +211,7 @@ export const registerBilibiliRoutes = (cookie: string): Router => {
   ) => {
     const data = await BilibiliData({
       methodType: '获取UP主总播放量',
-      host_mid: req.query.host_mid
+      host_mid: parseInt(req.query.host_mid)
     }, req.headers.cookie || cookie)
     res.json(data)
   })

diff --git a/src/platform/douyin/routes.ts b/src/platform/douyin/routes.ts
@@ -1,10 +1,11 @@
 import express, { Request, Response, Router } from 'express'
 import { DouyinData } from 'amagi/platform'
-import { DouyinDataOptionsMap } from 'amagi/types'
+import { DouyinDataOptionsMap, OmitMethodType } from 'amagi/types'
 
-/** @ts-ignore */
 export interface DouyinRequest<T extends keyof DouyinDataOptionsMap> extends Request {
-  query: Omit<DouyinDataOptionsMap[T]['opt'], 'methodType'>
+  query: {
+    [K in keyof OmitMethodType<DouyinDataOptionsMap[T]['opt']>]: string
+  }
 }
 
 /**
@@ -30,7 +31,9 @@ export const registerDouyinRoutes = (cookie: string): Router => {
   ) => {
     const data = await DouyinData({
       methodType: '评论数据',
-      aweme_id: req.query.aweme_id
+      aweme_id: req.query.aweme_id,
+      number: parseInt(req.query.number ?? '50'),
+      cursor: parseInt(req.query.cursor ?? '0')
     }, req.headers.cookie || cookie)
     res.json(data)
   })
@@ -86,7 +89,9 @@ export const registerDouyinRoutes = (cookie: string): Router => {
   ) => {
     const data = await DouyinData({
       methodType: '搜索数据',
-      query: req.query.query
+      query: req.query.query,
+      number: parseInt(req.query.number ?? '10'),
+      search_id: req.query.search_id
     }, req.headers.cookie || cookie)
     res.json(data)
   })

diff --git a/src/platform/kuaishou/routes.ts b/src/platform/kuaishou/routes.ts
@@ -1,17 +1,17 @@
 import express, { Request, Response, Router } from 'express'
 import { KuaishouData } from 'amagi/platform'
-import { KuaishouDataOptionsMap } from 'amagi/types'
+import { KuaishouDataOptionsMap, OmitMethodType } from 'amagi/types'
 
-/** @ts-ignore */
 export interface KusiahouRequest<T extends keyof KuaishouDataOptionsMap> extends Request {
-  query: Omit<KuaishouDataOptionsMap[T]['opt'], 'methodType'>
+  query: {
+    [K in keyof OmitMethodType<KuaishouDataOptionsMap[T]['opt']>]: string
+  }
 }
 
 /**
  * 注册快手相关的API接口路由
  * @param cookie - 有效的cookie
  */
-
 export const registerKuaishouRoutes = (cookie: string): Router => {
   const router = express.Router()
   router.get('/fetch_one_work', async (

diff --git a/src/types/DouyinAPIParams.ts b/src/types/DouyinAPIParams.ts
@@ -1,4 +1,3 @@
-import { amagi } from './../server/client'
 import {
   DyEmojiList,
   DyEmojiProList,