diff --git a/src/app/state.ts b/src/app/state.ts
index 4d25ddda..0596f712 100644
--- a/src/app/state.ts
+++ b/src/app/state.ts
@@ -19,7 +19,7 @@ import keys from "src/agent/keys"
import network from "src/agent/network"
import pool from "src/agent/pool"
import {getUserReadRelays, getUserRelays} from "src/agent/relays"
-import {getUserFollows, getUserNetwork} from "src/agent/social"
+import {getUserFollows, getUserNetwork, defaultFollows} from "src/agent/social"
import user from "src/agent/user"
// Routing
@@ -290,12 +290,14 @@ export const publishWithToast = (relays, thunk) =>
// Feeds
export const compileFilter = (filter: DynamicFilter): Filter => {
+ const getAuthors = pubkeys => shuffle(pubkeys.length > 0 ? pubkeys : defaultFollows).slice(0, 256)
+
if (filter.authors === "global") {
filter = omit(["authors"], filter)
} else if (filter.authors === "follows") {
- filter = {...filter, authors: shuffle(getUserFollows()).slice(0, 256)}
+ filter = {...filter, authors: getAuthors(getUserFollows())}
} else if (filter.authors === "network") {
- filter = {...filter, authors: shuffle(getUserNetwork()).slice(0, 256)}
+ filter = {...filter, authors: getAuthors(getUserNetwork())}
}
return filter
diff --git a/src/app/views/ChatList.svelte b/src/app/views/ChatList.svelte
index 731e11b0..7db4d890 100644
--- a/src/app/views/ChatList.svelte
+++ b/src/app/views/ChatList.svelte
@@ -10,14 +10,14 @@
import {watch} from "src/agent/db"
import user from "src/agent/user"
import network from "src/agent/network"
- import {getUserReadRelays} from "src/agent/relays"
+ import {getUserReadRelays, sampleRelays} from "src/agent/relays"
import {modal} from "src/partials/state"
let q = ""
let search
let results = []
- const {roomsJoined} = user
+ const {roomsJoined, canPublish} = user
const rooms = derived([watch("rooms", t => t.all()), roomsJoined], ([_rooms, _joined]) => {
const ids = new Set(_joined)
const [joined, other] = partition(r => ids.has(r.id), _rooms)
@@ -32,7 +32,7 @@
onMount(() => {
const sub = network.listen({
- relays: getUserReadRelays(),
+ relays: sampleRelays(getUserReadRelays()),
filter: [{kinds: [40, 41]}],
})
@@ -43,25 +43,27 @@
-
-
-
-
Your rooms
+ {#if $canPublish}
+
+
+
+
Your rooms
+
+
modal.push({type: "room/edit"})}>
+ Create Room
+
-
modal.push({type: "room/edit"})}>
- Create Room
-
-
- {#each $rooms.joined as room (room.id)}
-
- {:else}
-
You haven't yet joined any rooms.
- {/each}
-
-
-
-
Other rooms
-
+ {#each $rooms.joined as room (room.id)}
+
+ {:else}
+
You haven't yet joined any rooms.
+ {/each}
+
+
+
+
Other rooms
+
+ {/if}
diff --git a/src/app/views/ChatListItem.svelte b/src/app/views/ChatListItem.svelte
index fdcdb668..4e72870b 100644
--- a/src/app/views/ChatListItem.svelte
+++ b/src/app/views/ChatListItem.svelte
@@ -8,7 +8,7 @@
export let room
- const {roomsJoined} = user
+ const {roomsJoined, canPublish} = user
const enter = () => navigate(`/chat/${nip19.noteEncode(room.id)}`)
const join = () => user.joinRoom(room.id)
const leave = () => user.leaveRoom(room.id)
@@ -34,7 +34,7 @@
Leave
- {:else}
+ {:else if $canPublish}
Join
diff --git a/src/app/views/Feeds.svelte b/src/app/views/Feeds.svelte
index d9aae730..def71812 100644
--- a/src/app/views/Feeds.svelte
+++ b/src/app/views/Feeds.svelte
@@ -9,12 +9,16 @@
import Popover from "src/partials/Popover.svelte"
import Feed from "src/app/shared/Feed.svelte"
import user from "src/agent/user"
+ import {getUserFollows} from "src/agent/social"
- const {lists} = user
+ const {lists, canPublish} = user
let relays = null
- let filter = {kinds: [1, 1985], authors: "follows"} as DynamicFilter
let key = Math.random()
+ let filter = {
+ kinds: [1, 1985],
+ authors: getUserFollows().length > 0 ? "follows" : "network",
+ } as DynamicFilter
$: listsByName = indexBy(l => Tags.from(l).getMeta("d"), $lists)
@@ -60,36 +64,38 @@
{#key key}
- {#if $lists.length > 0}
-
-
-
- {#each $lists as e (e.id)}
- {@const meta = Tags.from(e).asMeta()}
+ {#if $canPublish}
+ {#if $lists.length > 0}
+
+
+
+ {#each $lists as e (e.id)}
+ {@const meta = Tags.from(e).asMeta()}
+
+ {/each}
- {/each}
-
-
-
- {:else}
-
+
+ {:else}
+
+ {/if}
{/if}