From 651b62adf7647dc1f4c959d3c8dd1a096d618ddb Mon Sep 17 00:00:00 2001 From: Martti Malmi Date: Sat, 11 Mar 2023 11:39:12 +0200 Subject: [PATCH] rm old indexes --- src/js/nostr/Events.ts | 27 --------------------------- src/js/nostr/SocialNetwork.ts | 18 +----------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/src/js/nostr/Events.ts b/src/js/nostr/Events.ts index 6800dbc2..3b40feca 100644 --- a/src/js/nostr/Events.ts +++ b/src/js/nostr/Events.ts @@ -52,8 +52,6 @@ const Events = { deletedEvents: new Set(), directMessagesByUser: new Map(), likesByUser: new Map(), - postsByUser: new Map(), - postsAndRepliesByUser: new Map(), latestNotificationByTargetAndKind: new Map(), notifications: new SortedLimitedEventSet(MAX_LATEST_MSGS), zapsByNote: new Map(), @@ -82,10 +80,6 @@ const Events = { console.log('error inserting event', e); } } - if (!this.postsAndRepliesByUser.has(event.pubkey)) { - this.postsAndRepliesByUser.set(event.pubkey, new SortedLimitedEventSet(MAX_MSGS_BY_USER)); - } - this.postsAndRepliesByUser.get(event.pubkey)?.add(event); this.latestNotesAndRepliesByEveryone.add(event); @@ -144,11 +138,6 @@ const Events = { } this.threadRepliesByMessageId.get(id)?.add(event.id); } - } else { - if (!this.postsByUser.has(event.pubkey)) { - this.postsByUser.set(event.pubkey, new SortedLimitedEventSet(MAX_MSGS_BY_USER)); - } - this.postsByUser.get(event.pubkey)?.add(event); } }, deleteRepostedMsgsFromFeeds(event: Event, feeds: SortedLimitedEventSet[]) { @@ -365,7 +354,6 @@ const Events = { // only we or the author can delete if (deletedEvent && [event.pubkey, myPub].includes(deletedEvent.pubkey)) { this.cache.delete(id); - this.postsAndRepliesByUser.get(event.pubkey)?.delete(id); this.latestNotesByFollows.delete(id); this.latestNotesByEveryone.delete(id); } @@ -852,21 +840,6 @@ const Events = { cb(this.latestNotesByKeywords.get(keyword)?.eventIds); return PubSub.subscribe([filter], callback); }, - getPostsAndRepliesByUser(address: string, cb?: (messageIds: string[]) => void): Unsubscribe { - // TODO subscribe on view profile and unsub on leave profile - const callback = () => { - cb?.(this.postsAndRepliesByUser.get(address)?.eventIds); - }; - this.postsAndRepliesByUser.has(address) && callback(); - return PubSub.subscribe([{ kinds: [1, 5, 7], authors: [address] }], callback); - }, - getPostsByUser(address: string, cb?: (messageIds: string[]) => void): Unsubscribe { - const callback = () => { - cb?.(this.postsByUser.get(address)?.eventIds); - }; - this.postsByUser.has(address) && callback(); - return PubSub.subscribe([{ kinds: [1, 5, 7], authors: [address] }], callback); - }, getLikesByUser(address: string, cb?: (messageIds: string[]) => void): Unsubscribe { const callback = () => { cb?.(this.likesByUser.get(address)?.eventIds); diff --git a/src/js/nostr/SocialNetwork.ts b/src/js/nostr/SocialNetwork.ts index 65cb9953..14657393 100644 --- a/src/js/nostr/SocialNetwork.ts +++ b/src/js/nostr/SocialNetwork.ts @@ -121,25 +121,9 @@ export default { } } - // if new follow, move all their posts to followedByUser - if (follower === myPub && !this.followedByUser.get(myPub).has(followedUser)) { - const posts = Events.postsByUser.get(followedUser); - if (posts) { - posts.eventIds.forEach((eventId) => { - const event = Events.cache.get(eventId); - if (event) { - const replyingTo = Events.getNoteReplyingTo(event); - if (!replyingTo) { - Events.latestNotesByFollows.add(event); - } - Events.latestNotesAndRepliesByFollows.add(event); - } - }); - } - } this.followedByUser.get(follower)?.add(followedUser); if (follower === myPub) { - Events.getPostsAndRepliesByUser(followedUser); + PubSub.subscribe([{ kinds: [1, 5, 7], authors: [followedUser] }]); } if (followedUser === myPub) { if (this.followersByUser.get(followedUser)?.size === 1) {