diff --git a/src/app/shared/FeedFormSaveAsList.svelte b/src/app/shared/FeedFormSaveAsList.svelte
index 5bac2480..b5822b1b 100644
--- a/src/app/shared/FeedFormSaveAsList.svelte
+++ b/src/app/shared/FeedFormSaveAsList.svelte
@@ -11,7 +11,21 @@
export let feed
export let onChange
- const list = (() => {
+ const openForm = () => {
+ formIsOpen = true
+ }
+
+ const closeForm = event => {
+ formIsOpen = false
+
+ if (event) {
+ onChange(makeListFeed({addresses: [getAddress(event)]}))
+ }
+ }
+
+ let formIsOpen = false
+
+ $: list = (() => {
if (isAuthorFeed(feed)) {
return makeList({kind: NAMED_PEOPLE, tags: feed.slice(1).map(mention)})
} else if (isMentionFeed(feed)) {
@@ -27,20 +41,6 @@
throw new Error(`Invalid feed type ${feed[0]} passed to FeedFormSaveAsList`)
}
})()
-
- const openForm = () => {
- formIsOpen = true
- }
-
- const closeForm = event => {
- formIsOpen = false
-
- if (event) {
- onChange(makeListFeed({addresses: [getAddress(event)]}))
- }
- }
-
- let formIsOpen = false
diff --git a/src/app/util/feeds.ts b/src/app/util/feeds.ts
index 3d4ada60..6984293a 100644
--- a/src/app/util/feeds.ts
+++ b/src/app/util/feeds.ts
@@ -97,7 +97,7 @@ export class FeedLoader {
await Promise.all(
Array.from(getRequestItems({relays, filters})).map(opts =>
- load({...opts, onEvent, tracker, signal, skipCache: true}),
+ load({...opts, onEvent, tracker, signal, skipCache: Boolean(relays)}),
),
)
},
diff --git a/src/util/misc.ts b/src/util/misc.ts
index d4abb737..435db549 100644
--- a/src/util/misc.ts
+++ b/src/util/misc.ts
@@ -362,14 +362,5 @@ export class SearchHelper {
export const fromCsv = s => (s || "").split(",").filter(identity)
-export const toSpliced = (xs: T[], start: number, deleteCount?: number, ...items: T[]) => {
- const copy = [...xs]
-
- if (deleteCount) {
- copy.splice(start, deleteCount, ...items)
- } else {
- copy.splice(start)
- }
-
- return copy
-}
+export const toSpliced = (xs: T[], start: number, deleteCount: number = 0, ...items: T[]) =>
+ [...xs.slice(0, start), ...items, ...xs.slice(start + deleteCount)]