diff --git a/src/components/home/HomeFeed.tsx b/src/components/home/HomeFeed.tsx
index 15b73510..eb874d7b 100644
--- a/src/components/home/HomeFeed.tsx
+++ b/src/components/home/HomeFeed.tsx
@@ -25,6 +25,97 @@ import { useGetFeed } from "~/queries/home"
import { EmptyState } from "../ui/EmptyState"
+const PostCard = ({
+ post,
+ simple,
+ isComment,
+ keyword,
+}: {
+ post: ExpandedNote
+ simple?: boolean
+ isComment?: boolean
+ keyword?: string
+}) => {
+ const router = useRouter()
+
+ return (
+
+
+
+ {post.metadata?.content?.title}
+
+ {!simple && (
+
+ {!!post.metadata?.content?.tags?.filter(
+ (tag) => tag !== "post" && tag !== "page",
+ ).length && (
+
+ {post.metadata?.content?.tags
+ ?.filter((tag) => tag !== "post" && tag !== "page")
+ .map((tag, index) => (
+ {
+ e.preventDefault()
+ router.push(`/tag/${tag}`)
+ }}
+ >
+ #{tag}
+
+ ))}
+
+ )}
+ {post.stat?.viewDetailCount && (
+
+
+ {post.stat?.viewDetailCount}
+
+ )}
+
+ )}
+
+ {keyword
+ ? reactStringReplace(
+ post.metadata?.content?.summary || "",
+ keyword,
+ (match, i) => (
+
+ {match}
+
+ ),
+ )
+ : post.metadata?.content?.summary}
+ {post.metadata?.content?.summary && "..."}
+
+
+ {!simple && }
+
+ )
+}
+
const Post = ({
post,
previousPost,
@@ -36,9 +127,9 @@ const Post = ({
filtering: number
keyword?: string
}) => {
- const router = useRouter()
const { t } = useTranslation("common")
const date = useDate()
+ let simple = post.characterId === previousPost?.characterId
if (
filtering &&
@@ -48,7 +139,13 @@ const Post = ({
return
}
- let simple = post.characterId === previousPost?.characterId
+ let isComment
+ if (post.metadata?.content?.tags?.includes("comment") && post.toNote) {
+ isComment = true
+ if (post.toNote?.metadata?.content?.tags?.includes("comment")) {
+ return null
+ }
+ }
return (
@@ -96,76 +193,24 @@ const Post = ({
)}
-
-
-
- {post.metadata?.content?.title}
-
- {!simple && (
-
- {!!post.metadata?.content?.tags?.filter(
- (tag) => tag !== "post" && tag !== "page",
- ).length && (
-
- {post.metadata?.content?.tags
- ?.filter((tag) => tag !== "post" && tag !== "page")
- .map((tag, index) => (
- {
- e.preventDefault()
- router.push(`/tag/${tag}`)
- }}
- >
- #{tag}
-
- ))}
-
- )}
- {post.stat?.viewDetailCount && (
-
-
- {post.stat?.viewDetailCount}
-
- )}
-
- )}
-
- {keyword
- ? reactStringReplace(
- post.metadata?.content?.summary || "",
- keyword,
- (match, i) => (
-
- {match}
-
- ),
- )
- : post.metadata?.content?.summary}
- {post.metadata?.content?.summary && "..."}
-
-
- {!simple && }
-
+ {isComment && (
+
+
+
+ {post.metadata?.content?.summary}
+
+
+ )}
+
)
}
diff --git a/src/models/home.model.ts b/src/models/home.model.ts
index 2e5fd561..60ec5baf 100644
--- a/src/models/home.model.ts
+++ b/src/models/home.model.ts
@@ -47,7 +47,7 @@ export async function getFeed({
case "latest": {
let result = await indexer.note.getMany({
sources: "xlog",
- tags: ["post"],
+ // tags: ["post"],
limit,
cursor,
includeCharacter: true,
@@ -56,12 +56,18 @@ export async function getFeed({
const list = await Promise.all(
result.list.map(async (page: any) => {
+ const isComment = page.metadata?.content?.tags?.includes("comment")
const expand = await expandCrossbellNote({
note: page,
- useStat: false,
- useScore: true,
+ useScore: !isComment,
useHTML,
})
+ if (isComment && expand.toNote) {
+ expand.toNote = await expandCrossbellNote({
+ note: expand.toNote,
+ useHTML,
+ })
+ }
delete expand.metadata?.content.content
return expand
}),