refactor(entity): improve typings

Author: sxzz

src/client/client.ts

@@ -10,7 +10,7 @@ import { AuthorizationError } from './errors/AuthorizationError'
 import { JikePost } from './post'
 import type { PersonalUpdate } from '../types/api-responses'
 import type { CreatePostOption, PostType } from '../types/options'
-import type { Notification, PostDetail } from '../types/entity'
+import type { FollowingUpdate, Notification } from '../types/entity'
 import type { BeforeRetryState } from 'ky/distribution/types/hooks'
 import type { PaginatedFetcher, PaginatedOption } from './utils/paginate'
 import type { Api } from '../api'
@@ -202,13 +202,13 @@ export class JikeClient {
    */
   async queryFollowingUpdates(
     option: PaginatedOption<
-      PostDetail,
+      FollowingUpdate,
       'createdAt',
       FollowingUpdatesMoreKey
     > = {}
   ) {
     const fetcher: PaginatedFetcher<
-      PostDetail,
+      FollowingUpdate,
       FollowingUpdatesMoreKey
     > = async (lastKey) => {
       const result = await this.#client.personalUpdate.followingUpdates({

src/client/user.ts

@@ -2,14 +2,14 @@ import { isSuccess, throwRequestFailureError } from './utils/response'
 import { fetchPaginated } from './utils/paginate'
 import { JikePostWithDetail } from './post'
 import { rawTypeToEnum } from './utils/post'
-import type { PostDetail, SimpleUser } from '../types/entity'
+import type { PostDetail, PostTypeRaw, User } from '../types/entity'
 import type { Users } from '../types/api-responses'
 import type { PaginatedFetcher, PaginatedOption } from './utils/paginate'
 import type { JikeClient } from './client'
 
 export interface FollowerWithTime {
   followTime?: string
-  user: SimpleUser
+  user: User
 }
 
 /**
@@ -88,22 +88,25 @@ export class JikeUser<M extends boolean = boolean> {
       }),
       option
     )
-    return data.map(
-      (item) =>
-        new JikePostWithDetail(
-          this.#client,
-          rawTypeToEnum(item.type),
-          item.id,
-          item
-        )
-    )
+
+    return data
+      .filter((item) => item.type !== 'PERSONAL_UPDATE')
+      .map(
+        (item) =>
+          new JikePostWithDetail(
+            this.#client,
+            rawTypeToEnum(item.type as PostTypeRaw),
+            item.id,
+            item
+          )
+      )
   }
 
   /**
    * 查询用户被关注
    */
-  queryFollowers(option: PaginatedOption<SimpleUser, never, string> = {}) {
-    const fetcher: PaginatedFetcher<SimpleUser, string> = async (lastKey) => {
+  queryFollowers(option: PaginatedOption<User, never, string> = {}) {
+    const fetcher: PaginatedFetcher<User, string> = async (lastKey) => {
       const result = await this.#client.apiClient.userRelation.getFollowerList(
         await this.getUsername(),
         {
@@ -162,8 +165,8 @@ export class JikeUser<M extends boolean = boolean> {
   /**
    * 查询用户关注
    */
-  queryFollowings(option: PaginatedOption<SimpleUser, never, string> = {}) {
-    const fetcher: PaginatedFetcher<SimpleUser, string> = async (lastKey) => {
+  queryFollowings(option: PaginatedOption<User, never, string> = {}) {
+    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 }

src/types/api-responses.ts

@@ -1,10 +1,11 @@
 /* eslint-disable @typescript-eslint/no-namespace */
 import type {
   Comment,
+  FollowingUpdate,
   Notification,
   PostDetail,
+  Profile as ProfileEntity,
   RecommendPost,
-  SimpleUser,
   TabIcons,
   User,
 } from './entity'
@@ -35,14 +36,14 @@ export namespace Notifications {
 
 export namespace UserRelation {
   export interface GetFollowingListResponse {
-    data: SimpleUser[]
+    data: User[]
     loadMoreKey?: {
       createdAt: string
     }
   }
 
   export interface GetFollowerListResponse {
-    data: SimpleUser[]
+    data: User[]
     loadMoreKey?: {
       createdAt: string
     }
@@ -58,7 +59,7 @@ export namespace Users {
 
   export interface LoginResponse {
     isRegister: boolean
-    user: User
+    user: ProfileEntity
     enabledFeatures: string[]
     agreedProtocol: string[]
     bioUpdateAlert: boolean
@@ -70,7 +71,7 @@ export namespace Users {
 
   export interface GeneralProfile {
     /** 用户信息 */
-    user: User
+    user: ProfileEntity
   }
 
   /**
@@ -82,7 +83,7 @@ export namespace Users {
     /** 关系用户，仅他人用户信息可见 */
     relationUsers?: {
       message: string
-      users: SimpleUser[]
+      users: User[]
       page: string
     }
     /** 是否**不**可见，仅他人用户信息可见 */
@@ -119,7 +120,7 @@ export namespace PersonalUpdate {
   }
 
   export interface FollowingUpdatesResponse {
-    data: PostDetail[]
+    data: FollowingUpdate[]
     loadMoreKey?: {
       session: 'PopulatedUpdate'
       lastPageEarliestTime: number