diff --git a/packages/app/src/Feed/TimelineFeed.ts b/packages/app/src/Feed/TimelineFeed.ts index 9b8e439b..c08badba 100644 --- a/packages/app/src/Feed/TimelineFeed.ts +++ b/packages/app/src/Feed/TimelineFeed.ts @@ -133,7 +133,7 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel }, [options.relay]); const subNext = useMemo(() => { - const rb = new RequestBuilder(`timeline-related:${subject.type}`); + const rb = new RequestBuilder(`timeline-related:${subject.type}:${subject.discriminator}`); if (trackingEvents.length > 0) { rb.withFilter() .kinds( diff --git a/packages/app/src/index.tsx b/packages/app/src/index.tsx index e7f30e0a..b91d73f6 100644 --- a/packages/app/src/index.tsx +++ b/packages/app/src/index.tsx @@ -67,7 +67,7 @@ export const router = createBrowserRouter([ } for (const [k, v] of Object.entries(login.relays.item)) { - await System.ConnectToRelay(k, v); + System.ConnectToRelay(k, v); } try { if ("registerProtocolHandler" in window.navigator) { diff --git a/packages/system/src/Utils.ts b/packages/system/src/Utils.ts index 38c1938f..40651e49 100644 --- a/packages/system/src/Utils.ts +++ b/packages/system/src/Utils.ts @@ -73,12 +73,12 @@ export function reqFilterEq(a: FlatReqFilter | ReqFilter, b: FlatReqFilter | Req export function flatFilterEq(a: FlatReqFilter, b: FlatReqFilter): boolean { return a.ids === b.ids && a.kinds === b.kinds + && a["#e"] === b["#e"] && a.authors === b.authors && a.limit === b.limit && a.since === b.since && a.until === b.until && a.search === b.search - && a["#e"] === b["#e"] && a["#p"] === b["#p"] && a["#t"] === b["#t"] && a["#d"] === b["#d"]