From 7c2340d7fbcbd99ee7e19ae5e5ef677250d46096 Mon Sep 17 00:00:00 2001 From: Kieran Date: Tue, 4 Jul 2023 11:33:40 +0100 Subject: [PATCH] fix note collections --- packages/app/src/Feed/FollowersFeed.ts | 4 ++-- packages/app/src/Feed/FollowsFeed.ts | 4 ++-- packages/app/src/Feed/MuteList.ts | 15 ++------------- packages/app/src/Feed/RelaysFeedFollows.tsx | 4 ++-- packages/app/src/Hooks/useNotelistSubscription.ts | 15 ++------------- packages/system/src/profile-cache.ts | 6 +++--- 6 files changed, 13 insertions(+), 35 deletions(-) diff --git a/packages/app/src/Feed/FollowersFeed.ts b/packages/app/src/Feed/FollowersFeed.ts index 03c5e09..b755285 100644 --- a/packages/app/src/Feed/FollowersFeed.ts +++ b/packages/app/src/Feed/FollowersFeed.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { HexKey, EventKind, PubkeyReplaceableNoteStore, RequestBuilder } from "@snort/system"; +import { HexKey, EventKind, NoteCollection, RequestBuilder } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; import { System } from "index"; @@ -11,7 +11,7 @@ export default function useFollowersFeed(pubkey?: HexKey) { return b; }, [pubkey]); - const followersFeed = useRequestBuilder(System, PubkeyReplaceableNoteStore, sub); + const followersFeed = useRequestBuilder(System, NoteCollection, sub); const followers = useMemo(() => { const contactLists = followersFeed.data?.filter( diff --git a/packages/app/src/Feed/FollowsFeed.ts b/packages/app/src/Feed/FollowsFeed.ts index 9807818..f19ee01 100644 --- a/packages/app/src/Feed/FollowsFeed.ts +++ b/packages/app/src/Feed/FollowsFeed.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { HexKey, TaggedRawEvent, EventKind, PubkeyReplaceableNoteStore, RequestBuilder } from "@snort/system"; +import { HexKey, TaggedRawEvent, EventKind, NoteCollection, RequestBuilder } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; import useLogin from "Hooks/useLogin"; @@ -16,7 +16,7 @@ export default function useFollowsFeed(pubkey?: HexKey) { return b; }, [isMe, pubkey]); - const contactFeed = useRequestBuilder(System, PubkeyReplaceableNoteStore, sub); + const contactFeed = useRequestBuilder(System, NoteCollection, sub); return useMemo(() => { if (isMe) { return follows.item; diff --git a/packages/app/src/Feed/MuteList.ts b/packages/app/src/Feed/MuteList.ts index 4dfc77b..95c6f00 100644 --- a/packages/app/src/Feed/MuteList.ts +++ b/packages/app/src/Feed/MuteList.ts @@ -1,12 +1,5 @@ import { useMemo } from "react"; -import { - HexKey, - TaggedRawEvent, - Lists, - EventKind, - ParameterizedReplaceableNoteStore, - RequestBuilder, -} from "@snort/system"; +import { HexKey, TaggedRawEvent, Lists, EventKind, NoteCollection, RequestBuilder } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; import { getNewest } from "SnortUtils"; @@ -24,11 +17,7 @@ export default function useMutedFeed(pubkey?: HexKey) { return b; }, [pubkey]); - const mutedFeed = useRequestBuilder( - System, - ParameterizedReplaceableNoteStore, - sub - ); + const mutedFeed = useRequestBuilder(System, NoteCollection, sub); const mutedList = useMemo(() => { if (pubkey && mutedFeed.data) { diff --git a/packages/app/src/Feed/RelaysFeedFollows.tsx b/packages/app/src/Feed/RelaysFeedFollows.tsx index 57dc824..5820ef8 100644 --- a/packages/app/src/Feed/RelaysFeedFollows.tsx +++ b/packages/app/src/Feed/RelaysFeedFollows.tsx @@ -5,7 +5,7 @@ import { TaggedRawEvent, RelaySettings, EventKind, - PubkeyReplaceableNoteStore, + NoteCollection, RequestBuilder, } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; @@ -80,7 +80,7 @@ export default function useRelaysFeedFollows(pubkeys: HexKey[]): Array(System, PubkeyReplaceableNoteStore, sub); + const relays = useRequestBuilder(System, NoteCollection, sub); const notesRelays = relays.data?.filter(a => a.kind === EventKind.Relays) ?? []; const notesContactLists = relays.data?.filter(a => a.kind === EventKind.ContactList) ?? []; return useMemo(() => { diff --git a/packages/app/src/Hooks/useNotelistSubscription.ts b/packages/app/src/Hooks/useNotelistSubscription.ts index 2916bcc..4053724 100644 --- a/packages/app/src/Hooks/useNotelistSubscription.ts +++ b/packages/app/src/Hooks/useNotelistSubscription.ts @@ -1,12 +1,5 @@ import { useMemo } from "react"; -import { - HexKey, - Lists, - EventKind, - FlatNoteStore, - ParameterizedReplaceableNoteStore, - RequestBuilder, -} from "@snort/system"; +import { HexKey, Lists, EventKind, FlatNoteStore, NoteCollection, RequestBuilder } from "@snort/system"; import { useRequestBuilder } from "@snort/system-react"; import useLogin from "Hooks/useLogin"; @@ -24,11 +17,7 @@ export default function useNotelistSubscription(pubkey: HexKey | undefined, l: L return rb; }, [pubkey]); - const listStore = useRequestBuilder( - System, - ParameterizedReplaceableNoteStore, - sub - ); + const listStore = useRequestBuilder(System, NoteCollection, sub); const etags = useMemo(() => { if (isMe) return defaultIds; // there should only be a single event here because we only load 1 pubkey diff --git a/packages/system/src/profile-cache.ts b/packages/system/src/profile-cache.ts index 647b120..4e45aa8 100644 --- a/packages/system/src/profile-cache.ts +++ b/packages/system/src/profile-cache.ts @@ -1,7 +1,7 @@ import debug from "debug"; import { unixNowMs, FeedCache } from "@snort/shared"; -import { EventKind, HexKey, SystemInterface, TaggedRawEvent, PubkeyReplaceableNoteStore, RequestBuilder } from "."; +import { EventKind, HexKey, SystemInterface, TaggedRawEvent, NoteCollection, RequestBuilder } from "."; import { ProfileCacheExpire } from "./const"; import { mapEventToProfile, MetadataCache } from "./cache"; @@ -94,8 +94,8 @@ export class ProfileLoaderService { MetadataRelays.forEach(r => fMissing.relay(r)); } const newProfiles = new Set(); - const q = this.#system.Query(PubkeyReplaceableNoteStore, sub); - const feed = (q?.feed as PubkeyReplaceableNoteStore) ?? new PubkeyReplaceableNoteStore(); + const q = this.#system.Query(NoteCollection, sub); + const feed = (q?.feed as NoteCollection) ?? new NoteCollection(); // never release this callback, it will stop firing anyway after eose const releaseOnEvent = feed.onEvent(async e => { for (const pe of e) {