diff --git a/packages/app/src/Element/FollowListBase.tsx b/packages/app/src/Element/FollowListBase.tsx index 8465f83d..122f6c4d 100644 --- a/packages/app/src/Element/FollowListBase.tsx +++ b/packages/app/src/Element/FollowListBase.tsx @@ -13,8 +13,9 @@ export interface FollowListBaseProps { title?: ReactNode | string; showFollowAll?: boolean; showAbout?: boolean; + className?: string; } -export default function FollowListBase({ pubkeys, title, showFollowAll, showAbout }: FollowListBaseProps) { +export default function FollowListBase({ pubkeys, title, showFollowAll, showAbout, className }: FollowListBaseProps) { const publisher = useEventPublisher(); const { follows, relays } = useLogin(); @@ -26,7 +27,7 @@ export default function FollowListBase({ pubkeys, title, showFollowAll, showAbou } return ( - <> +
{(showFollowAll ?? true) && (
{title}
@@ -38,6 +39,6 @@ export default function FollowListBase({ pubkeys, title, showFollowAll, showAbou {pubkeys?.map(a => ( ))} - +
); } diff --git a/packages/app/src/Element/Note.css b/packages/app/src/Element/Note.css index b20a6ece..bd9157a7 100644 --- a/packages/app/src/Element/Note.css +++ b/packages/app/src/Element/Note.css @@ -59,6 +59,8 @@ .note-quote { border: 1px solid var(--gray); + border-radius: 10px; + padding: 5px; } .note-quote.note > .body { diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx index 889f453c..273de2ea 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Note.tsx @@ -31,6 +31,7 @@ import useLogin from "Hooks/useLogin"; import { setBookmarked, setPinned } from "Login"; import { NostrFileElement } from "Element/NostrFileHeader"; import ZapstrEmbed from "Element/ZapstrEmbed"; +import PubkeyList from "Element/PubkeyList"; import messages from "./messages"; @@ -74,14 +75,19 @@ const HiddenNote = ({ children }: { children: React.ReactNode }) => { }; export default function Note(props: NoteProps) { - const { data: ev, related, highlight, options: opt, ignoreModeration = false } = props; + const { data: ev, related, highlight, options: opt, ignoreModeration = false, className } = props; if (ev.kind === EventKind.FileHeader) { return ; } - if (ev.kind === 31337) { + if (ev.kind === EventKind.ZapstrTrack) { return ; } + if (ev.kind === EventKind.PubkeyLists) { + return ; + } + + const baseClassName = `note card${className ? ` ${className}` : ""}`; const navigate = useNavigate(); const [showReactions, setShowReactions] = useState(false); const deletions = useMemo(() => getReactions(related, ev.id, EventKind.Deletion), [related]); @@ -90,7 +96,6 @@ export default function Note(props: NoteProps) { const { ref, inView, entry } = useInView({ triggerOnce: true }); const [extendable, setExtendable] = useState(false); const [showMore, setShowMore] = useState(false); - const baseClassName = `note card ${props.className ? props.className : ""}`; const login = useLogin(); const { pinned, bookmarked } = login; const publisher = useEventPublisher(); diff --git a/packages/app/src/Element/PubkeyList.tsx b/packages/app/src/Element/PubkeyList.tsx new file mode 100644 index 00000000..df415ab2 --- /dev/null +++ b/packages/app/src/Element/PubkeyList.tsx @@ -0,0 +1,8 @@ +import { RawEvent } from "@snort/nostr"; +import { dedupe } from "Util"; +import FollowListBase from "./FollowListBase"; + +export default function PubkeyList({ ev, className }: { ev: RawEvent; className?: string }) { + const ids = dedupe(ev.tags.filter(a => a[0] === "p").map(a => a[1])); + return ; +} diff --git a/packages/app/src/Element/Thread.tsx b/packages/app/src/Element/Thread.tsx index f6c53836..8e650e31 100644 --- a/packages/app/src/Element/Thread.tsx +++ b/packages/app/src/Element/Thread.tsx @@ -305,7 +305,7 @@ export default function Thread() { const brokenChains = Array.from(chains?.keys()).filter(a => !thread.data?.some(b => b.id === a)); function renderRoot(note: TaggedRawEvent) { - const className = `thread-root ${isSingleNote ? "thread-root-single" : ""}`; + const className = `thread-root${isSingleNote ? " thread-root-single" : ""}`; if (note) { return (