diff --git a/client/src/components/Header/Header.tsx b/client/src/components/Header/Header.tsx index 0042d65..0b434b1 100644 --- a/client/src/components/Header/Header.tsx +++ b/client/src/components/Header/Header.tsx @@ -4,7 +4,7 @@ import { export default function Header() { return ( -
+
diff --git a/client/src/components/Home.tsx b/client/src/components/Home.tsx index 28ec543..cad22c7 100644 --- a/client/src/components/Home.tsx +++ b/client/src/components/Home.tsx @@ -73,7 +73,7 @@ const Home = () => {
-
+
{sortedEvents.map((event) => ( { return ( -
+
diff --git a/client/src/components/Thread.tsx b/client/src/components/Thread.tsx index 188e3fc..aef7cdb 100644 --- a/client/src/components/Thread.tsx +++ b/client/src/components/Thread.tsx @@ -81,23 +81,29 @@ const Thread = () => { } const earlierEvents = uniqEvents - .filter(event => + .filter(event => event.kind === 1 && preOPEvents.includes(event.id) - ) - .sort((a, b) => (b.created_at as any) - (a.created_at as any)); + ).sort((a, b) => (b.created_at as any) - (a.created_at as any)); const toggleSort = () => { setSortByTime(prev => !prev); }; - const eventsSortedByTime = [...uniqEvents].slice(1).filter(event => event.kind === 1).sort((a, b) => a.created_at - b.created_at); + const eventsSortedByTime = [...uniqEvents].slice(1) + .filter(event => + event.kind === 1 && + !earlierEvents.map(e => e.id).includes(event.id) && + (OPEvent ? OPEvent.id !== event.id : true) + ).sort((a, b) => a.created_at - b.created_at); // Events sorted by PoW (assuming `getPow` returns a numerical representation of the PoW) const eventsSortedByPow = [...uniqEvents].slice(1) .filter((event) => getPow(event.id) > Number(filterDifficulty) && - event.kind === 1 + event.kind === 1 && + !earlierEvents.map(e => e.id).includes(event.id) && + (OPEvent ? OPEvent.id !== event.id : true) ).sort((a, b) => getPow(b.id) - getPow(a.id)); const displayedEvents = sortByTime ? eventsSortedByTime : eventsSortedByPow; diff --git a/client/src/utils/relays.ts b/client/src/utils/relays.ts index 480dc51..4b64e4c 100644 --- a/client/src/utils/relays.ts +++ b/client/src/utils/relays.ts @@ -97,4 +97,6 @@ addRelay('wss://nostr.bitcoiner.social'); addRelay('wss://nostr.mom'); addRelay('wss://relay.nostr.bg'); addRelay('wss://nos.lol'); -addRelay('wss://powrelay.xyz'); \ No newline at end of file +addRelay('wss://powrelay.xyz'); +addRelay('wss://relay.damus.io'); +addRelay('wss://nostr.mutinywallet.com'); \ No newline at end of file