diff --git a/packages/api-client/__tests__/controllers/note.test.ts b/packages/api-client/__tests__/controllers/note.test.ts index 0725d770..6f37ffc5 100644 --- a/packages/api-client/__tests__/controllers/note.test.ts +++ b/packages/api-client/__tests__/controllers/note.test.ts @@ -87,14 +87,6 @@ describe('test note client', () => { expect(data.title).toBe('1') }) - it('should like note', async () => { - mockResponse('/notes/like/1', null) - - const data = await client.note.likeIt('1') - - expect(data).toBeNull() - }) - it('should forbidden if no password provide', async () => { spyOn(axiosAdaptor, 'get').mockRejectedValue({ response: { diff --git a/packages/api-client/__tests__/controllers/post.test.ts b/packages/api-client/__tests__/controllers/post.test.ts index 6e948df4..4087e129 100644 --- a/packages/api-client/__tests__/controllers/post.test.ts +++ b/packages/api-client/__tests__/controllers/post.test.ts @@ -66,12 +66,4 @@ describe('test post client', () => { expect(data).toStrictEqual({ title: '1' }) expect(data.$raw).toBeDefined() }) - - it('should thumbs-up post', async () => { - mockResponse('/posts/_thumbs-up?id=1', null) - - const data = await client.post.thumbsUp('1') - - expect(data).toBeNull() - }) }) diff --git a/packages/api-client/adaptors/ky.ts b/packages/api-client/adaptors/ky.ts index 63b26f5b..903c1f88 100644 --- a/packages/api-client/adaptors/ky.ts +++ b/packages/api-client/adaptors/ky.ts @@ -34,13 +34,15 @@ export const createKyAdaptor = (ky: KyInstance) => { get(url, options) { return getDataFromKyResponse(ky.get(url, options)) }, - post(url, options) { + async post(url, options) { const data = options.data delete options.data const kyOptions: Options = { ...options, + json: data, } + // FIXME https://github.com/sindresorhus/ky/issues/535 return getDataFromKyResponse(ky.post(url, kyOptions)) }, diff --git a/packages/api-client/controllers/note.ts b/packages/api-client/controllers/note.ts index c52f9539..d9ac4117 100644 --- a/packages/api-client/controllers/note.ts +++ b/packages/api-client/controllers/note.ts @@ -8,11 +8,12 @@ import type { NoteWrappedPayload, NoteWrappedWithLikedPayload, } from '~/models/note' -import type { HTTPClient } from '../core/client' import type { SortOptions } from './base' import { autoBind } from '~/utils/auto-bind' +import { HTTPClient } from '../core/client' + declare module '../core/client' { interface HTTPClient< T extends IRequestAdapter = IRequestAdapter, @@ -110,13 +111,6 @@ export class NoteController implements IController { }) } - /** - * 喜欢这篇日记 - */ - likeIt(id: string | number) { - return this.proxy.like(id).get() - } - /** * 获取专栏内的所有日记 */ diff --git a/packages/api-client/controllers/post.ts b/packages/api-client/controllers/post.ts index 50b47a77..73f25e80 100644 --- a/packages/api-client/controllers/post.ts +++ b/packages/api-client/controllers/post.ts @@ -4,10 +4,11 @@ import type { IRequestHandler, RequestProxyResult } from '~/interfaces/request' import type { SelectFields } from '~/interfaces/types' import type { ModelWithLiked, PaginateResult } from '~/models/base' import type { PostModel } from '~/models/post' -import type { HTTPClient } from '../core/client' import { autoBind } from '~/utils/auto-bind' +import { HTTPClient } from '../core/client' + declare module '../core/client' { interface HTTPClient< T extends IRequestAdapter = IRequestAdapter, @@ -85,11 +86,4 @@ export class PostController implements IController { getLatest() { return this.proxy.latest.get>() } - - /** - * 点赞 - */ - thumbsUp(id: string) { - return this.proxy('_thumbs-up').get({ params: { id } }) - } } diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 9cb88304..1c726676 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -53,7 +53,7 @@ "cors": "2.8.5", "express": "4.18.2", "form-data": "4.0.0", - "ky": "0.33.3", + "ky": "1.1.0", "lodash": "4.17.21", "tsup": "7.2.0", "umi-request": "1.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 162a53f7..387ae179 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -424,8 +424,8 @@ importers: specifier: 4.0.0 version: 4.0.0 ky: - specifier: 0.33.3 - version: 0.33.3 + specifier: 1.1.0 + version: 1.1.0 lodash: specifier: 4.17.21 version: 4.17.21 @@ -5548,9 +5548,9 @@ packages: json-buffer: 3.0.1 dev: true - /ky@0.33.3: - resolution: {integrity: sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==} - engines: {node: '>=14.16'} + /ky@1.1.0: + resolution: {integrity: sha512-n/rS/Yw+pc/j61kl353yIhxpM/FN0VidhPeiMv6Y/QyyCUpSJtHtHlX655wYolZ/Wc3BKO4Q5syWKfzJ5CT7Bg==} + engines: {node: '>=18'} dev: true /levn@0.4.1: