fix: following and follower list loadMoreKey

Author: sxzz

src/api/user-relation.ts

@@ -13,7 +13,7 @@ import type {
  */
 export const getFollowingList = <T = UserRelation.GetFollowingListResponse>(
   username: string,
-  option: PaginationOption = {}
+  option: PaginationOption<string> = {}
 ) =>
   toResponse<T>(
     request.post('1.0/userRelation/getFollowingList', {
@@ -32,7 +32,7 @@ export const getFollowingList = <T = UserRelation.GetFollowingListResponse>(
  */
 export const getFollowerList = <T = UserRelation.GetFollowerListResponse>(
   username: string,
-  option: PaginationOption<{ createdAt: string }> = {}
+  option: PaginationOption<string> = {}
 ) =>
   toResponse<T>(
     request.post('1.0/userRelation/getFollowerList', {

src/client/user.ts

@@ -111,12 +111,12 @@ export class JikeUser<M extends boolean = boolean> {
         await this.getUsername(),
         {
           limit: 20,
-          loadMoreKey: lastKey ? { createdAt: lastKey } : undefined,
+          loadMoreKey: lastKey,
         }
       )
       if (!isSuccess(result)) throwRequestFailureError(result, '查询用户被关注')
 
-      const newKey = result.data.loadMoreKey?.createdAt
+      const newKey = result.data.loadMoreKey
       return [newKey, result.data.data]
     }
 
@@ -140,11 +140,14 @@ export class JikeUser<M extends boolean = boolean> {
     ) => {
       const result = await this.#client.apiClient.userRelation.getFollowerList(
         await this.getUsername(),
-        { limit: 1, loadMoreKey: lastKey ? { createdAt: lastKey } : undefined }
+        {
+          limit: 1,
+          loadMoreKey: lastKey,
+        }
       )
       if (!isSuccess(result)) throwRequestFailureError(result, '查询用户被关注')
 
-      const newKey = result.data.loadMoreKey?.createdAt
+      const newKey = result.data.loadMoreKey
       const data: FollowerWithTime[] = result.data.data[0]
         ? [
             {
@@ -221,11 +224,11 @@ export class JikeUser<M extends boolean = boolean> {
     const fetcher: PaginatedFetcher<User, string> = async (lastKey) => {
       const result = await this.#client.apiClient.userRelation.getFollowingList(
         await this.getUsername(),
-        { limit: 20, loadMoreKey: lastKey ? { createdAt: lastKey } : undefined }
+        { limit: 20, loadMoreKey: lastKey }
       )
       if (!isSuccess(result)) throwRequestFailureError(result, '查询用户被关注')
 
-      const newKey = result.data.loadMoreKey?.createdAt
+      const newKey = result.data.loadMoreKey
       return [newKey, result.data.data]
     }
 

src/types/api-responses.ts

@@ -48,16 +48,12 @@ export namespace Notifications {
 export namespace UserRelation {
   export interface GetFollowingListResponse {
     data: User[]
-    loadMoreKey?: {
-      createdAt: string
-    }
+    loadMoreKey?: string
   }
 
   export interface GetFollowerListResponse {
     data: User[]
-    loadMoreKey?: {
-      createdAt: string
-    }
+    loadMoreKey?: string
   }
 
   export interface FollowResponse {

tests/api/user-relation.test.ts

@@ -12,12 +12,14 @@ describe('user relation should work', () => {
     const result = await api.userRelation.getFollowerList(username, { limit })
     expect(isSuccess(result)).toBe(true)
     expect(result.data.data.length).toBe(limit)
+    expect(result.data.loadMoreKey).toBeTypeOf('string')
   })
 
   it('getFollowingList should work', async () => {
     const result = await api.userRelation.getFollowingList(username, { limit })
     expect(isSuccess(result)).toBe(true)
     expect(result.data.data.length).toBe(limit)
+    expect(result.data.loadMoreKey).toBeTypeOf('string')
   })
 
   it.todo('follow should work')