Merge pull request #220 from deholic/feature/timeline-banner-contrast

fix: 미스키 스레드/북마크 로딩 및 마크업 정리

Author: deholic

src/infra/MisskeyHttpClient.ts

@@ -316,6 +316,30 @@ export class MisskeyHttpClient implements MastodonApi {
     return data.map((item) => mapMisskeyStatusWithInstance(item, account.instanceUrl));
   }
 
+  async fetchBookmarks(account: Account, limit: number = 20, maxId?: string): Promise<Status[]> {
+    const response = await fetch(`${normalizeInstanceUrl(account.instanceUrl)}/api/i/favorites`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(
+        buildBody(account, {
+          limit,
+          untilId: maxId
+        })
+      )
+    });
+    if (!response.ok) {
+      throw new Error("북마크를 불러오지 못했습니다.");
+    }
+    const data = (await response.json()) as unknown[];
+    return data.map((item) => {
+      const typed = item && typeof item === "object" ? (item as Record<string, unknown>) : null;
+      const note = typed && typed.note ? typed.note : item;
+      return mapMisskeyStatusWithInstance(note, account.instanceUrl);
+    });
+  }
+
   async uploadMedia(account: Account, file: File): Promise<string> {
     const formData = new FormData();
     formData.append("i", account.accessToken);
@@ -338,6 +362,10 @@ export class MisskeyHttpClient implements MastodonApi {
     return id;
   }
 
+  async fetchThreadContext(account: Account, statusId: string): Promise<ThreadContext> {
+    return this.fetchConversation(account, statusId);
+  }
+
   async fetchConversation(account: Account, noteId: string): Promise<ThreadContext> {
     const response = await fetch(`${normalizeInstanceUrl(account.instanceUrl)}/api/notes/conversation`, {
       method: "POST",
@@ -432,6 +460,16 @@ export class MisskeyHttpClient implements MastodonApi {
     return this.fetchNote(account, statusId);
   }
 
+  async bookmark(account: Account, statusId: string): Promise<Status> {
+    await this.postSimple(account, "/api/notes/favorites/create", { noteId: statusId });
+    return this.fetchNote(account, statusId);
+  }
+
+  async unbookmark(account: Account, statusId: string): Promise<Status> {
+    await this.postSimple(account, "/api/notes/favorites/delete", { noteId: statusId });
+    return this.fetchNote(account, statusId);
+  }
+
   async unfavourite(account: Account, statusId: string): Promise<Status> {
     try {
       await this.postSimple(account, "/api/notes/reactions/delete", { noteId: statusId });
@@ -454,6 +492,19 @@ export class MisskeyHttpClient implements MastodonApi {
     return this.fetchNote(account, statusId);
   }
 
+  async fetchNoteState(
+    account: Account,
+    noteId: string
+  ): Promise<{ isFavourited: boolean; isReblogged: boolean; bookmarked: boolean }> {
+    const note = await this.fetchNoteRaw(account, noteId);
+    const isFavorited = Boolean(note.isFavorited ?? false);
+    return {
+      isFavourited: isFavorited,
+      isReblogged: Boolean(note.myRenoteId),
+      bookmarked: isFavorited
+    };
+  }
+
   async reblog(account: Account, statusId: string): Promise<Status> {
     await this.postSimple(account, "/api/notes/create", { renoteId: statusId });
     return this.fetchNote(account, statusId);

src/infra/UnifiedApiClient.ts

@@ -125,4 +125,11 @@ export class UnifiedApiClient implements MastodonApi {
   async fetchThreadContext(account: Account, statusId: string): Promise<ThreadContext> {
     return this.getClient(account).fetchThreadContext(account, statusId);
   }
+
+  fetchNoteState(
+    account: Account,
+    noteId: string
+  ): Promise<{ isFavourited: boolean; isReblogged: boolean; bookmarked: boolean }> {
+    return this.getClient(account).fetchNoteState(account, noteId);
+  }
 }

src/infra/misskeyMapper.ts

@@ -460,7 +460,7 @@ export const mapMisskeyStatusWithInstance = (raw: unknown, instanceUrl?: string)
     reactions,
     reblogged,
     favourited,
-    bookmarked: false,
+    bookmarked: Boolean(value.isFavorited ?? false),
     inReplyToId: value.replyId ? String(value.replyId) : null,
     mentions,
     mediaAttachments,

src/ui/components/TimelineItem.tsx

@@ -1459,7 +1459,7 @@ export const TimelineItem = ({
       ) : null}
       {showContent ? (
         <>
-          <p className="status-text">{displayStatus.content ? contentParts : "(내용 없음)"}</p>
+          <div className="status-text">{displayStatus.content ? contentParts : "(내용 없음)"}</div>
           {previewCard ? (
             <a
               className={`link-preview${previewCard.image ? "" : " no-image"}`}