From 41c4ca341532694d17ce9644d688e948a70e524e Mon Sep 17 00:00:00 2001
From: DIYgod <i@diygod.me>
Date: Sun, 28 Apr 2024 18:37:56 +0800
Subject: [PATCH] feat: entry columns

---
 .../components/entry-column/notification-item.tsx   | 13 +++++++++----
 .../src/components/entry-column/picture-item.tsx    |  9 +++++----
 .../components/entry-column/social-media-item.tsx   |  9 +++++----
 .../src/components/entry-column/video-item.tsx      |  7 ++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/renderer/src/components/entry-column/notification-item.tsx b/src/renderer/src/components/entry-column/notification-item.tsx
index 2d4bb4e445..cb6365cfcc 100644
--- a/src/renderer/src/components/entry-column/notification-item.tsx
+++ b/src/renderer/src/components/entry-column/notification-item.tsx
@@ -1,18 +1,23 @@
 import dayjs from "@renderer/lib/dayjs"
 import { SiteIcon } from "../site-icon"
+import { EntriesResponse } from "@renderer/lib/types"
 
-export function NotificationItem({ entry }: { entry: any }) {
+export function NotificationItem({
+  entry,
+}: {
+  entry: EntriesResponse[number]
+}) {
   return (
     <div className="flex my-5 px-2 py-3">
-      <SiteIcon url={entry.feed.site_url} />
+      <SiteIcon url={entry.feeds.siteUrl} />
       <div className="line-clamp-5 text-sm flex-1 -mt-0.5 leading-tight">
         <div className="text-zinc-500 text-[10px] space-x-1">
-          <span>{entry.feed.title}</span>
+          <span>{entry.feeds.title}</span>
           <span>·</span>
           <span>
             {dayjs
               .duration(
-                dayjs(entry.published_at).diff(dayjs(), "minute"),
+                dayjs(entry.publishedAt).diff(dayjs(), "minute"),
                 "minute",
               )
               .humanize()}
diff --git a/src/renderer/src/components/entry-column/picture-item.tsx b/src/renderer/src/components/entry-column/picture-item.tsx
index b59acfdacc..b9c07214ca 100644
--- a/src/renderer/src/components/entry-column/picture-item.tsx
+++ b/src/renderer/src/components/entry-column/picture-item.tsx
@@ -1,7 +1,8 @@
 import dayjs from "@renderer/lib/dayjs"
 import { SiteIcon } from "../site-icon"
+import { EntriesResponse } from "@renderer/lib/types"
 
-export function PictureItem({ entry }: { entry: any }) {
+export function PictureItem({ entry }: { entry: EntriesResponse[number] }) {
   return (
     <div className="flex">
       <div>
@@ -22,14 +23,14 @@ export function PictureItem({ entry }: { entry: any }) {
           <div className="space-x-1 text-[13px]">
             <SiteIcon
               className="w-3.5 h-3.5 inline-block mr-0 align-sub"
-              url={entry.feed.site_url}
+              url={entry.feeds.siteUrl}
             />
-            <span>{entry.feed.title}</span>
+            <span>{entry.feeds.title}</span>
             <span className="text-zinc-500">·</span>
             <span className="text-zinc-500">
               {dayjs
                 .duration(
-                  dayjs(entry.published_at).diff(dayjs(), "minute"),
+                  dayjs(entry.publishedAt).diff(dayjs(), "minute"),
                   "minute",
                 )
                 .humanize()}
diff --git a/src/renderer/src/components/entry-column/social-media-item.tsx b/src/renderer/src/components/entry-column/social-media-item.tsx
index d3866567f3..c3116cc5cb 100644
--- a/src/renderer/src/components/entry-column/social-media-item.tsx
+++ b/src/renderer/src/components/entry-column/social-media-item.tsx
@@ -1,10 +1,11 @@
 import dayjs from "@renderer/lib/dayjs"
 import { SiteIcon } from "@renderer/components/site-icon"
+import { EntriesResponse } from "@renderer/lib/types"
 
-export function SocialMediaItem({ entry }: { entry: any }) {
+export function SocialMediaItem({ entry }: { entry: EntriesResponse[number] }) {
   return (
     <div className="flex my-5 px-2 py-3">
-      <SiteIcon url={entry.feed.site_url} />
+      <SiteIcon url={entry.feeds.siteUrl} />
       <div>
         <div className="line-clamp-5 text-sm flex-1 -mt-0.5">
           <div className="space-x-1">
@@ -13,13 +14,13 @@ export function SocialMediaItem({ entry }: { entry: any }) {
             <span className="text-zinc-500">
               {dayjs
                 .duration(
-                  dayjs(entry.published_at).diff(dayjs(), "minute"),
+                  dayjs(entry.publishedAt).diff(dayjs(), "minute"),
                   "minute",
                 )
                 .humanize()}
             </span>
           </div>
-          <div className="mt-0.5">{entry.text}</div>
+          <div className="mt-0.5">{entry.description}</div>
         </div>
         <div className="flex gap-2 overflow-x-auto mt-1">
           {entry.images?.map((image) => (
diff --git a/src/renderer/src/components/entry-column/video-item.tsx b/src/renderer/src/components/entry-column/video-item.tsx
index 0aa0444495..b7e1a91210 100644
--- a/src/renderer/src/components/entry-column/video-item.tsx
+++ b/src/renderer/src/components/entry-column/video-item.tsx
@@ -1,7 +1,8 @@
 import dayjs from "@renderer/lib/dayjs"
 import { SiteIcon } from "../site-icon"
+import { EntriesResponse } from "@renderer/lib/types"
 
-export function VideoItem({ entry }: { entry: any }) {
+export function VideoItem({ entry }: { entry: EntriesResponse[number] }) {
   return (
     <div className="flex">
       <div>
@@ -22,14 +23,14 @@ export function VideoItem({ entry }: { entry: any }) {
           <div className="space-x-1 text-[13px]">
             <SiteIcon
               className="w-3.5 h-3.5 inline-block mr-0 align-sub"
-              url={entry.feed.site_url}
+              url={entry.feeds.siteUrl}
             />
             <span>{entry.author}</span>
             <span className="text-zinc-500">·</span>
             <span className="text-zinc-500">
               {dayjs
                 .duration(
-                  dayjs(entry.published_at).diff(dayjs(), "minute"),
+                  dayjs(entry.publishedAt).diff(dayjs(), "minute"),
                   "minute",
                 )
                 .humanize()}