From 14bfc481c4d9a8ad979e3ce4752da89b16638cd3 Mon Sep 17 00:00:00 2001 From: vivganes Date: Fri, 7 Apr 2023 16:35:58 +0530 Subject: [PATCH 1/8] fix #496 --- packages/app/src/Element/Bookmarks.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index cd6ddea8..dd037ec6 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -1,13 +1,14 @@ import { useState, useMemo, ChangeEvent } from "react"; import { useSelector } from "react-redux"; import { FormattedMessage } from "react-intl"; -import { HexKey, TaggedRawEvent } from "@snort/nostr"; +import { EventKind, HexKey, TaggedRawEvent } from "@snort/nostr"; import Note from "Element/Note"; import { RootState } from "State/Store"; import { UserCache } from "Cache/UserCache"; import messages from "./messages"; +import NoteReaction from "./NoteReaction"; interface BookmarksProps { pubkey: HexKey; @@ -25,7 +26,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { function renderOption(p: HexKey) { const profile = UserCache.getFromCache(p); return profile ? : null; - } + } return (
@@ -43,6 +44,20 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { {bookmarks .filter(b => (onlyPubkey === "all" ? true : b.pubkey === onlyPubkey)) .map(n => { + switch(n.kind){ + case EventKind.TextNote: + return ( + + ); + case EventKind.Reaction: + case EventKind.Repost: + return ; + } return ( Date: Fri, 7 Apr 2023 16:39:47 +0530 Subject: [PATCH 2/8] fix prettier warnings --- packages/app/src/Element/Bookmarks.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index dd037ec6..87a77f4a 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -26,7 +26,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { function renderOption(p: HexKey) { const profile = UserCache.getFromCache(p); return profile ? : null; - } + } return (
@@ -44,7 +44,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { {bookmarks .filter(b => (onlyPubkey === "all" ? true : b.pubkey === onlyPubkey)) .map(n => { - switch(n.kind){ + switch (n.kind) { case EventKind.TextNote: return ( Date: Fri, 7 Apr 2023 16:44:31 +0530 Subject: [PATCH 3/8] missed event type --- packages/app/src/Element/Bookmarks.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 87a77f4a..10f8b381 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -56,6 +56,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { ); case EventKind.Reaction: case EventKind.Repost: + case EventKind.ZapReceipt: return ; } return ( From 02eef1464c9548e2bc84b5a27df3a4fff49de350 Mon Sep 17 00:00:00 2001 From: vivganes Date: Fri, 7 Apr 2023 16:53:51 +0530 Subject: [PATCH 4/8] Fixed code duplication --- packages/app/src/Element/Bookmarks.tsx | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 10f8b381..a347c752 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -45,7 +45,11 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { .filter(b => (onlyPubkey === "all" ? true : b.pubkey === onlyPubkey)) .map(n => { switch (n.kind) { - case EventKind.TextNote: + case EventKind.Reaction: + case EventKind.Repost: + case EventKind.ZapReceipt: + return ; + default: return ( { options={{ showTime: false, showBookmarked: true, canUnbookmark: loginPubKey === pubkey }} /> ); - case EventKind.Reaction: - case EventKind.Repost: - case EventKind.ZapReceipt: - return ; } - return ( - - ); })}
); From 90842371ca86e3a89f0d349eceeb3d5a348aca05 Mon Sep 17 00:00:00 2001 From: vivganes Date: Fri, 7 Apr 2023 23:34:34 +0530 Subject: [PATCH 5/8] fix bugs and simplify --- packages/app/src/Element/Bookmarks.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index a347c752..2b2d9af8 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -20,7 +20,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { const [onlyPubkey, setOnlyPubkey] = useState("all"); const loginPubKey = useSelector((s: RootState) => s.login.publicKey); const ps = useMemo(() => { - return [...new Set(bookmarks.map(ev => ev.pubkey))]; + return [...new Set(bookmarks.filter(ev => ev.kind === EventKind.TextNote).map(ev => ev.pubkey))]; }, [bookmarks]); function renderOption(p: HexKey) { @@ -45,11 +45,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { .filter(b => (onlyPubkey === "all" ? true : b.pubkey === onlyPubkey)) .map(n => { switch (n.kind) { - case EventKind.Reaction: - case EventKind.Repost: - case EventKind.ZapReceipt: - return ; - default: + case EventKind.TextNote: return ( { options={{ showTime: false, showBookmarked: true, canUnbookmark: loginPubKey === pubkey }} /> ); + default: + return null; } })}
From b68693d7c22bda9d45a5f052e0f7a1557d5f4a2c Mon Sep 17 00:00:00 2001 From: vivganes Date: Fri, 7 Apr 2023 23:40:14 +0530 Subject: [PATCH 6/8] fix warning --- packages/app/src/Element/Bookmarks.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 2b2d9af8..157d1c58 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -8,8 +8,6 @@ import { RootState } from "State/Store"; import { UserCache } from "Cache/UserCache"; import messages from "./messages"; -import NoteReaction from "./NoteReaction"; - interface BookmarksProps { pubkey: HexKey; bookmarks: readonly TaggedRawEvent[]; From f61630619a636cd614adedd65fcdabef393c9fd5 Mon Sep 17 00:00:00 2001 From: vivganes Date: Sat, 8 Apr 2023 15:05:34 +0530 Subject: [PATCH 7/8] filtering moved to ProfilePage --- packages/app/src/Element/Bookmarks.tsx | 23 +++++++++-------------- packages/app/src/Pages/ProfilePage.tsx | 8 +++++++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 157d1c58..5ce8f5bc 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -18,7 +18,7 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { const [onlyPubkey, setOnlyPubkey] = useState("all"); const loginPubKey = useSelector((s: RootState) => s.login.publicKey); const ps = useMemo(() => { - return [...new Set(bookmarks.filter(ev => ev.kind === EventKind.TextNote).map(ev => ev.pubkey))]; + return [...new Set(bookmarks.map(ev => ev.pubkey))]; }, [bookmarks]); function renderOption(p: HexKey) { @@ -42,19 +42,14 @@ const Bookmarks = ({ pubkey, bookmarks, related }: BookmarksProps) => { {bookmarks .filter(b => (onlyPubkey === "all" ? true : b.pubkey === onlyPubkey)) .map(n => { - switch (n.kind) { - case EventKind.TextNote: - return ( - - ); - default: - return null; - } + return ( + + ); })} ); diff --git a/packages/app/src/Pages/ProfilePage.tsx b/packages/app/src/Pages/ProfilePage.tsx index 970c8904..3acee76a 100644 --- a/packages/app/src/Pages/ProfilePage.tsx +++ b/packages/app/src/Pages/ProfilePage.tsx @@ -91,7 +91,13 @@ function RelaysTab({ id }: { id: HexKey }) { function BookMarksTab({ id }: { id: HexKey }) { const bookmarks = useBookmarkFeed(id); - return ; + return ( + e.kind === EventKind.TextNote)} + related={bookmarks.filter(e => e.kind !== EventKind.TextNote)} + /> + ); } export default function ProfilePage() { From c1a022d7951f538aee7525f79fc0aaa328db7639 Mon Sep 17 00:00:00 2001 From: vivganes Date: Sat, 8 Apr 2023 15:07:54 +0530 Subject: [PATCH 8/8] fix warnings --- packages/app/src/Element/Bookmarks.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/Element/Bookmarks.tsx b/packages/app/src/Element/Bookmarks.tsx index 5ce8f5bc..f74d6dbb 100644 --- a/packages/app/src/Element/Bookmarks.tsx +++ b/packages/app/src/Element/Bookmarks.tsx @@ -1,7 +1,7 @@ import { useState, useMemo, ChangeEvent } from "react"; import { useSelector } from "react-redux"; import { FormattedMessage } from "react-intl"; -import { EventKind, HexKey, TaggedRawEvent } from "@snort/nostr"; +import { HexKey, TaggedRawEvent } from "@snort/nostr"; import Note from "Element/Note"; import { RootState } from "State/Store";