From 927d04b74ef34effa41ba95ba9e1cbfc2af0c4d2 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Mon, 20 Feb 2023 09:08:37 -0600
Subject: [PATCH] Add follows feed, limit how many relays we publish replies
 to.

---
 src/agent/relays.ts            | 11 ++++++-----
 src/app/index.ts               |  2 +-
 src/partials/SideNav.svelte    |  2 +-
 src/partials/Tabs.svelte       |  2 +-
 src/routes/NotFound.svelte     |  2 +-
 src/routes/Notes.svelte        |  7 +++++--
 src/views/ConnectUser.svelte   |  4 ++--
 src/views/notes/Follows.svelte | 12 ++++++++++++
 8 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 src/views/notes/Follows.svelte

diff --git a/src/agent/relays.ts b/src/agent/relays.ts
index b831bc8f..43e1c536 100644
--- a/src/agent/relays.ts
+++ b/src/agent/relays.ts
@@ -107,15 +107,16 @@ export const getRelayForEventHint = event =>
 export const getRelayForPersonHint = (pubkey, event) =>
   first(getPubkeyWriteRelays(pubkey)) || getRelayForEventHint(event)
 
-// If we're replying or reacting to an event, we want the author to know,
-// as well as anyone else who is tagged in the original event or the reply.
-// Get everyone's read relays. We also want to advertise our content to
-// our followers, so write to our write relays as well.
+// If we're replying or reacting to an event, we want the author to know, as well as
+// anyone else who is tagged in the original event or the reply. Get everyone's read
+// relays. Limit how many per pubkey we publish to though. We also want to advertise
+// our content to our followers, so write to our write relays as well.
 export const getEventPublishRelays = event => {
   const tags = Tags.from(event)
   const pubkeys = tags.type("p").values().all().concat(event.pubkey)
+  const relayChunks = pubkeys.map(pubkey => getPubkeyReadRelays(pubkey).slice(0, 3))
 
-  return getAllPubkeyReadRelays(pubkeys).concat(getUserWriteRelays())
+  return aggregateScores(relayChunks).concat(getUserWriteRelays())
 }
 
 
diff --git a/src/app/index.ts b/src/app/index.ts
index 8960c3cf..caa6a23f 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -37,7 +37,7 @@ export const login = ({privkey, pubkey}: {privkey?: string, pubkey?: string}) =>
 export const signup = privkey => {
   keys.setPrivateKey(privkey)
 
-  navigate('/notes/network')
+  navigate('/notes/follows')
 }
 
 export const renderNote = (note, {showEntire = false}) => {
diff --git a/src/partials/SideNav.svelte b/src/partials/SideNav.svelte
index 5e502cc2..fb0ef7a0 100644
--- a/src/partials/SideNav.svelte
+++ b/src/partials/SideNav.svelte
@@ -40,7 +40,7 @@
     </a>
   </li>
   <li class="cursor-pointer">
-    <a class="block px-4 py-2 hover:bg-accent transition-all" href="/notes/network">
+    <a class="block px-4 py-2 hover:bg-accent transition-all" href="/notes/follows">
       <i class="fa-solid fa-tag mr-2" /> Notes
     </a>
   </li>
diff --git a/src/partials/Tabs.svelte b/src/partials/Tabs.svelte
index b6006e28..d69961e8 100644
--- a/src/partials/Tabs.svelte
+++ b/src/partials/Tabs.svelte
@@ -7,7 +7,7 @@
   export let setActiveTab
 </script>
 
-<div class="border-b border-solid border-dark flex pt-2" in:fly={{y: 20}}>
+<div class="border-b border-solid border-dark flex pt-2 overflow-auto" in:fly={{y: 20}}>
   {#each tabs as tab}
   <button
     class="cursor-pointer hover:border-b border-solid border-medium px-8 py-4"
diff --git a/src/routes/NotFound.svelte b/src/routes/NotFound.svelte
index 23a6b87b..f2981592 100644
--- a/src/routes/NotFound.svelte
+++ b/src/routes/NotFound.svelte
@@ -3,5 +3,5 @@
   import {navigate} from 'svelte-routing'
   import user from 'src/agent/user'
 
-  onMount(() => navigate(user.getProfile() ? '/notes/network' : '/login'))
+  onMount(() => navigate(user.getProfile() ? '/notes/follows' : '/login'))
 </script>
diff --git a/src/routes/Notes.svelte b/src/routes/Notes.svelte
index 997798b8..ecaa0d8e 100644
--- a/src/routes/Notes.svelte
+++ b/src/routes/Notes.svelte
@@ -4,6 +4,7 @@
   import Content from "src/partials/Content.svelte"
   import NewNoteButton from "src/partials/NewNoteButton.svelte"
   import Tabs from "src/partials/Tabs.svelte"
+  import Follows from "src/views/notes/Follows.svelte"
   import Network from "src/views/notes/Network.svelte"
   import Popular from "src/views/notes/Popular.svelte"
   import user from 'src/agent/user'
@@ -21,8 +22,10 @@
   </Content>
   {/if}
   <div>
-    <Tabs tabs={['network', 'popular']} {activeTab} {setActiveTab} />
-    {#if activeTab === 'network'}
+    <Tabs tabs={['follows', 'network', 'popular']} {activeTab} {setActiveTab} />
+    {#if activeTab === 'follows'}
+    <Follows />
+    {:else if activeTab === 'network'}
     <Network />
     {:else}
     <Popular />
diff --git a/src/views/ConnectUser.svelte b/src/views/ConnectUser.svelte
index 6e05dc72..f047f9c1 100644
--- a/src/views/ConnectUser.svelte
+++ b/src/views/ConnectUser.svelte
@@ -47,7 +47,7 @@
           sleep(3000),
         ])
 
-        navigate('/notes/network')
+        navigate('/notes/follows')
       } else {
         await sleep(1000)
 
@@ -57,7 +57,7 @@
   }
 
   const skip = () => {
-    navigate('/notes/network')
+    navigate('/notes/follows')
   }
 
   searchSample()
diff --git a/src/views/notes/Follows.svelte b/src/views/notes/Follows.svelte
new file mode 100644
index 00000000..d091c147
--- /dev/null
+++ b/src/views/notes/Follows.svelte
@@ -0,0 +1,12 @@
+<script>
+  import {shuffle} from 'src/util/misc'
+  import Notes from "src/partials/Notes.svelte"
+  import {getUserFollows} from 'src/agent/social'
+  import {getAllPubkeyWriteRelays} from 'src/agent/relays'
+
+  const authors = shuffle(getUserFollows()).slice(0, 256)
+  const relays = getAllPubkeyWriteRelays(authors)
+  const filter = {kinds: [1, 7], authors}
+</script>
+
+<Notes {relays} {filter} />