doot/TAO
1
0
Fork 0
mirror of https://github.com/smolgrrr/TAO.git synced 2024-09-20 01:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

better thread filtering

Browse Source
This commit is contained in:
smolgrrr 2024-09-06 18:32:42 +10:00
parent 99337afedd
commit b005c94a1c
1 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
client/src/components/routes/Thread.tsx
View File

@ -8,6 +8,14 @@ import Placeholder from '../modals/Placeholder';
import PostCard from '../modals/PostCard'; import PostCard from '../modals/PostCard';
import { useFetchEvents } from '../../hooks/useFetchEvents'; import { useFetchEvents } from '../../hooks/useFetchEvents';
import ThreadPostModal from '../forms/ThreadPostModal'; import ThreadPostModal from '../forms/ThreadPostModal';
import { verifyPow } from '../../utils/mine';
type ProcessedEvent = {
postEvent: Event;
replies: Event[];
totalWork: number;
metadataEvent: Event | null;
};
const Thread = () => { const Thread = () => {
const { id } = useParams(); const { id } = useParams();
@ -60,12 +68,23 @@ const Thread = () => {
) )
const uniqReplyEvents = uniqBy(allEvents, "id"); const uniqReplyEvents = uniqBy(allEvents, "id");
const replyEvents = [...uniqReplyEvents] const replyEvents: ProcessedEvent[] = [...uniqReplyEvents]
.filter(event => .filter(event =>
event.kind === 1 &&
!earlierEvents.map(e => e.id).includes(event.id) && !earlierEvents.map(e => e.id).includes(event.id) &&
(OPEvent ? OPEvent.id !== event.id : true) (OPEvent ? OPEvent.id !== event.id : true)
).sort((a, b) => a.created_at - b.created_at); )
.map(event => {
const pow = verifyPow(event); // Calculate once and reuse
const replies = noteEvents.filter(e => e.tags.some(tag => tag[0] === 'e' && tag[1] === event.id));
const totalWork = Math.pow(2, pow) + replies.reduce((acc, reply) => {
const replyPow = reply.id.startsWith('0') ? verifyPow(reply) : 0;
return acc + Math.pow(2, replyPow);
}, 0);
const metadataEvent = metadataEvents.find((e) => e.pubkey === event.pubkey && e.kind === 0) || null; // Find the corresponding metadataEvent
return { postEvent: event, replies, totalWork, metadataEvent }; // Include metadataEvent in the returned object
})
.sort((a, b) => b.totalWork - a.totalWork || b.postEvent.created_at - a.postEvent.created_at);
return ( return (
<> <>
@ -76,7 +95,7 @@ const Thread = () => {
.sort((a, b) => a.created_at - b.created_at).map((event, index) => ( .sort((a, b) => a.created_at - b.created_at).map((event, index) => (
<PostCard key={event.id} event={event} metadata={metadataEvents.find((e) => e.pubkey === event.pubkey && e.kind === 0) || null} replies={uniqEvents.filter((e: Event) => e.tags.some((tag) => tag[0] === "e" && tag[1] === event.id))} /> <PostCard key={event.id} event={event} metadata={metadataEvents.find((e) => e.pubkey === event.pubkey && e.kind === 0) || null} replies={uniqEvents.filter((e: Event) => e.tags.some((tag) => tag[0] === "e" && tag[1] === event.id))} />
))} ))}
<PostCard key={OPEvent.id} event={OPEvent} metadata={metadataEvents.find((e) => e.pubkey === OPEvent.pubkey && e.kind === 0) || null} replies={replyEvents} type={'OP'}/> <PostCard key={OPEvent.id} event={OPEvent} metadata={metadataEvents.find((e) => e.pubkey === OPEvent.pubkey && e.kind === 0) || null} replies={replyEvents.map(event => event.replies).flat()} type={'OP'} />
</div> </div>
<ThreadPostModal OPEvent={OPEvent} /> <ThreadPostModal OPEvent={OPEvent} />
<div className="col-span-full h-0.5 bg-neutral-900 mb-2" /> {/* This is the white line separator */} <div className="col-span-full h-0.5 bg-neutral-900 mb-2" /> {/* This is the white line separator */}
@ -87,15 +106,15 @@ const Thread = () => {
</div> </div>
<div className="grid grid-cols-1 max-w-xl mx-auto gap-1"> <div className="grid grid-cols-1 max-w-xl mx-auto gap-1">
{replyEvents.slice(0, visibleReplyEvents) {replyEvents.slice(0, visibleReplyEvents)
.filter((event: Event) => (showAllReplies || event.id.startsWith('0')) && event.tags.some(tag => tag[0] === 'e' && tag[1] === OPEvent.id)) .filter((event) => (showAllReplies || event.totalWork > 1) && event.postEvent.tags.some(tag => tag[0] === 'e' && tag[1] === OPEvent.id))
.map((event: Event) => ( .map((event) => (
<div className={`w-11/12 ${event.tags.find(tag => tag[0] === 'e' && tag[1] !== OPEvent.id) ? 'ml-auto' : 'mr-auto'}`}> <div className={`w-11/12 ${event.postEvent.tags.find(tag => tag[0] === 'e' && tag[1] !== OPEvent.id) ? 'ml-auto' : 'mr-auto'}`}>
<PostCard <PostCard
key={event.id} key={event.postEvent.id}
event={event} event={event.postEvent}
metadata={metadataEvents.find((e) => e.pubkey === event.pubkey && e.kind === 0) || null} metadata={event.metadataEvent}
replies={replyEvents.filter((e: Event) => e.tags.some((tag) => tag[0] === "e" && tag[1] === event.id))} replies={event.replies}
repliedTo={repliedList(event)} repliedTo={repliedList(event.postEvent)}
/> />
</div> </div>
))} ))}