feat(jike-client): improve post

Author: sxzz

src/client/client.ts

@@ -3,15 +3,16 @@ import EventEmitter from 'eventemitter3'
 import { resolveApiConfig } from '../request'
 import { ApiClient } from '../api-client'
 import { objectPick } from '../utils'
+import { PostType } from '../types/options'
 import { isSuccess, throwRequestFailureError } from './utils/response'
 import { resolveAreaCode } from './utils/user'
 import { JikeUser } from './user'
 import { fetchPaginated } from './utils/paginate'
 import { AuthorizationError } from './errors/AuthorizationError'
-import { JikePost } from './post'
+import { JikePost, JikePostWithDetail } from './post'
+import type { CreatePostOption } from '../types/options'
 import type { FollowingUpdatesMoreKey, JikeClientJSON } from './types'
-import type { CreatePostOption, PostType } from '../types/options'
-import type { FollowingUpdate, Notification } from '../types/entity'
+import type { FollowingUpdate, Notification, Post } from '../types/entity'
 import type { BeforeRetryState } from 'ky/distribution/types/hooks'
 import type { PaginatedFetcher, PaginatedOption } from './utils/paginate'
 import type { Api } from '../api'
@@ -228,14 +229,22 @@ export class JikeClient extends EventEmitter<EventMap> {
       const newKey = result.data.loadMoreKey
       return [newKey, result.data.data]
     }
-    return fetchPaginated(
+    const updates = await fetchPaginated(
       fetcher,
       (item, data) => ({
         createdAt: new Date(item.createdAt),
         total: data.length + 1,
       }),
       option
     )
+    return updates.map((update) => {
+      // TODO repost
+      if (update.type === 'ORIGINAL_POST') {
+        return this.getPost(PostType.ORIGINAL, update.id, update)
+      } else {
+        return update
+      }
+    })
   }
 
   /**
@@ -253,14 +262,21 @@ export class JikeClient extends EventEmitter<EventMap> {
     if (!isSuccess(result)) throwRequestFailureError(result, '发送动态')
     return {
       /** 动态 */
-      post: new JikePost(this, type, result.data.data.id, result.data.data),
+      post: this.getPost(type, result.data.data.id, result.data.data),
       /** 提示文本 */
       toast: result.data.toast,
     }
   }
 
-  getPost(type: PostType, id: string) {
-    return new JikePost(this, type, id)
+  getPost(type: PostType, id: string): JikePost
+  getPost(type: PostType, id: string, detail: Post): JikePostWithDetail
+  getPost(
+    type: PostType,
+    id: string,
+    detail?: Post
+  ): JikePost | JikePostWithDetail {
+    if (!detail) return new JikePost(this, type, id)
+    else return new JikePostWithDetail(this, type, id, detail)
   }
 
   /**

src/client/post.ts

@@ -8,7 +8,7 @@ import type {
   ListCommentOption,
   PostType,
 } from '../types/options'
-import type { Comment, PostDetail, User } from '../types/entity'
+import type { Comment, Post, User } from '../types/entity'
 import type { JikeClient } from './client'
 
 /**
@@ -18,14 +18,9 @@ export class JikePost {
   #client: JikeClient
   type: PostType
   id: string
-  detail?: PostDetail
+  detail?: Post
 
-  constructor(
-    client: JikeClient,
-    type: PostType,
-    id: string,
-    detail?: PostDetail
-  ) {
+  constructor(client: JikeClient, type: PostType, id: string, detail?: Post) {
     this.#client = client
     this.type = type
     this.id = id
@@ -53,6 +48,7 @@ export class JikePost {
   async like() {
     const result = await this.apiClient.posts.like(this.type, this.id)
     if (!isSuccess(result)) throwRequestFailureError(result, '动态点赞')
+    if (this.detail) this.detail.liked = true
   }
 
   /**
@@ -61,6 +57,7 @@ export class JikePost {
   async unlike() {
     const result = await this.apiClient.posts.unlike(this.type, this.id)
     if (!isSuccess(result)) throwRequestFailureError(result, '取消动态点赞')
+    if (this.detail) this.detail.liked = false
   }
 
   /**
@@ -172,17 +169,12 @@ export class JikePost {
 }
 
 export class JikePostWithDetail extends JikePost {
-  constructor(
-    client: JikeClient,
-    type: PostType,
-    id: string,
-    detail: PostDetail
-  ) {
+  constructor(client: JikeClient, type: PostType, id: string, detail: Post) {
     super(client, type, id, detail)
     this.detail = detail
   }
 
-  getDetail(): PostDetail {
+  getDetail(): Post {
     return this.detail!
   }
 }

src/client/user.ts

@@ -1,9 +1,8 @@
+import { PostType } from '../types/options'
 import { isSuccess, throwRequestFailureError } from './utils/response'
 import { fetchPaginated } from './utils/paginate'
-import { JikePostWithDetail } from './post'
-import { rawTypeToEnum } from './utils/post'
 import type { UserUnfollowOption } from '../types/options'
-import type { PostDetail, PostTypeRaw, User } from '../types/entity'
+import type { PersonalPost, User } from '../types/entity'
 import type { Users } from '../types/api-responses'
 import type { PaginatedFetcher, PaginatedOption } from './utils/paginate'
 import type { JikeClient } from './client'
@@ -76,9 +75,9 @@ export class JikeUser<M extends boolean = boolean> {
    * 查询用户动态
    */
   async queryPersonalUpdate(
-    option: PaginatedOption<PostDetail, 'createdAt', string> = {}
+    option: PaginatedOption<PersonalPost, 'createdAt', string> = {}
   ) {
-    const fetcher: PaginatedFetcher<PostDetail, string> = async (lastKey) => {
+    const fetcher: PaginatedFetcher<PersonalPost, string> = async (lastKey) => {
       const result = await this.#client.apiClient.personalUpdate.single(
         await this.getUsername(),
         { limit: 500, loadMoreKey: lastKey ? { lastId: lastKey } : undefined }
@@ -89,7 +88,7 @@ export class JikeUser<M extends boolean = boolean> {
       return [newKey, result.data.data]
     }
 
-    const data = await fetchPaginated(
+    const updates = await fetchPaginated(
       fetcher,
       (item, data) => ({
         createdAt: new Date(item.createdAt),
@@ -98,17 +97,10 @@ export class JikeUser<M extends boolean = boolean> {
       option
     )
 
-    return data
-      .filter((item) => item.type !== 'PERSONAL_UPDATE')
-      .map(
-        (item) =>
-          new JikePostWithDetail(
-            this.#client,
-            rawTypeToEnum(item.type as PostTypeRaw),
-            item.id,
-            item
-          )
-      )
+    return updates.map((update) => {
+      // TODO: repost
+      return this.#client.getPost(PostType.ORIGINAL, update.id, update)
+    })
   }
 
   /**

src/types/api-responses.ts

@@ -5,7 +5,8 @@ import type {
   Comment,
   FollowingUpdate,
   Notification,
-  PostDetail,
+  OriginalPost,
+  PersonalPost,
   Profile as ProfileEntity,
   RecommendPost,
   Story,
@@ -17,10 +18,11 @@ export namespace Posts {
   export interface CreateResponse {
     /** 提示文本 */
     toast: string
-    data: PostDetail
+    data: OriginalPost
   }
   export interface GetResponse {
-    data: PostDetail
+    // TODO: post detail
+    data: any
   }
   export interface RemoveResponse {
     /** 提示文本 */
@@ -136,7 +138,7 @@ export namespace Users {
 
 export namespace PersonalUpdate {
   export interface SingleResponse {
-    data: PostDetail[]
+    data: PersonalPost[]
     loadMoreKey?: {
       lastId: string
     }

src/types/entity/other.ts

@@ -1,55 +1,10 @@
 import type { Topic } from './topic'
-import type {
-  LinkInfo,
-  Picture,
-  ReadTrackInfo,
-  Rollouts,
-  ScrollingSubtitle,
-  UrlsInText,
-} from './post'
+import type { Picture, ReadTrackInfo, UrlsInText } from './post'
 import type { User } from './user'
 
 export type PostTypeRaw = 'ORIGINAL_POST' | 'REPOST'
 export type TargetType = PostTypeRaw | 'STORY'
 
-export interface PostDetail {
-  id: string
-  type: PostTypeRaw | 'PERSONAL_UPDATE'
-  content: string
-  /** 评论并转发到动态时存在。仅评论转发的内容，不包含上层评论 */
-  rawContent?: string
-  urlsInText: UrlsInText[]
-  status: string
-  isCommentForbidden: boolean
-  likeCount: number
-  commentCount: number
-  repostCount: number
-  shareCount: number
-  pictures: Picture[]
-  collected: boolean
-  collectTime?: string
-  user: User
-  createdAt: string
-  isFeatured: boolean
-  enablePictureComments: boolean
-  repostable: boolean
-  rollouts: Rollouts
-  scrollingSubtitles: ScrollingSubtitle[]
-  actionTime?: string
-  pinned?: {
-    personalUpdate: boolean
-  }
-  target?: Target
-  targetType?: string
-  rootType?: string
-  liked?: boolean
-  syncCommentId?: string
-  replyToComment?: Comment
-  topic?: Topic
-  /** 链接 */
-  linkInfo?: LinkInfo
-}
-
 export interface Target {
   type: string
   id: string

src/types/entity/post.ts

@@ -18,7 +18,7 @@ export interface PersonalUpdate {
    */
   createdAt: string
   updateIds: string[]
-  action: LiteralUnion<'USER_FOLLOW'>
+  action: LiteralUnion<'USER_FOLLOW' | 'LIVE_SHARE'>
   usernames: string[]
   targetUsernames: string[]
   users: User[]
@@ -78,15 +78,28 @@ export interface OriginalPost {
   likeIcon?: LiteralUnion<'book'>
   /** 阅读时的 track 信息 */
   readTrackInfo: ReadTrackInfo
+  /** 是否点赞 */
+  liked?: boolean
 }
 
+/** 动态 */
+export type Post = OriginalPost /* | Repost */
+
+/** 主页动态 */
+export type PersonalPost = {
+  /**
+   * ISO-8601 格式，如 `2015-03-04T00:00:00.000Z`
+   */
+  actionTime: string
+} & Post
+
 /** 关注动态 */
 export type FollowingUpdate = {
   /**
    * ISO-8601 格式，如 `2015-03-04T00:00:00.000Z`
    */
   actionTime: string
-} & (PersonalUpdate | OriginalPost)
+} & (PersonalUpdate | Post)
 
 /** 阅读时的 track 信息 */
 export interface ReadTrackInfo {