diff --git a/src/app.css b/src/app.css index 9916ff0a..c0a85c58 100644 --- a/src/app.css +++ b/src/app.css @@ -1,4 +1,4 @@ -@import 'tailwindcss'; +@import "tailwindcss"; @config "../tailwind.config.js"; @@ -131,7 +131,7 @@ } @utility content-padding-y { - @apply pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12; + @apply pt-4 pb-4 sm:pt-8 sm:pb-8 md:pt-12 md:pb-12; } @utility content-sizing { @@ -139,7 +139,7 @@ } @utility content { - @apply m-auto w-full max-w-3xl px-4 sm:px-8 md:px-12 pt-4 sm:pt-8 md:pt-12 pb-4 sm:pb-8 md:pb-12; + @apply m-auto w-full max-w-3xl px-4 pt-4 pb-4 sm:px-8 sm:pt-8 sm:pb-8 md:px-12 md:pt-12 md:pb-12; } @utility heading { diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte index b4aec6fd..96208aee 100644 --- a/src/app/components/PrimaryNav.svelte +++ b/src/app/components/PrimaryNav.svelte @@ -62,8 +62,7 @@ {@render children?.()} -
+
diff --git a/src/app/core/sync.ts b/src/app/core/sync.ts index 84eee092..af1651a7 100644 --- a/src/app/core/sync.ts +++ b/src/app/core/sync.ts @@ -1,7 +1,6 @@ import {page} from "$app/stores" import type {Unsubscriber} from "svelte/store" -import {get} from "svelte/store" -import {last, call, ifLet, assoc, chunk, sleep, WEEK, ago} from "@welshman/lib" +import {last, call, ifLet, assoc, chunk, WEEK, ago} from "@welshman/lib" import {PollResponse} from "nostr-tools/kinds" import {merged} from "@welshman/store" import { @@ -27,7 +26,6 @@ import {request, requestOne, Difference, DifferenceEvent} from "@welshman/net" import { pubkey, loadRelay, - userFollowList, userRelayList, userMessagingRelayList, loadRelayList, @@ -50,7 +48,6 @@ import { loadGroupList, userSpaceUrls, userGroupList, - bootstrapPubkeys, decodeRelay, getSpaceUrlsFromGroupList, getSpaceRoomsFromGroupList, @@ -252,29 +249,6 @@ const syncUserData = () => { loadFeedsForPubkey(pubkey) } - const syncFollowList = async (signal: AbortSignal) => { - for (const pubkeys of chunk(10, get(bootstrapPubkeys))) { - if (signal.aborted) return - - // This isn't urgent, avoid clogging other stuff up - await sleep(1000) - - if (signal.aborted) return - - await Promise.all( - pubkeys.flatMap(pk => [ - loadRelayList(pk), - loadGroupList(pk), - loadProfile(pk), - loadFollowList(pk), - loadMuteList(pk), - ]), - ) - } - } - - let bootstrapFollowController = new AbortController() - const unsubscribeGroupList = merged([userGroupList]).subscribe(([$userGroupList]) => { syncGroupList($userGroupList) }) @@ -283,18 +257,10 @@ const syncUserData = () => { syncRelayList($userRelayList) }) - const unsubscribeFollows = merged([userFollowList]).subscribe(() => { - bootstrapFollowController.abort() - bootstrapFollowController = new AbortController() - void syncFollowList(bootstrapFollowController.signal) - }) - return () => { - bootstrapFollowController.abort() unsubscribersByKey.forEach(call) unsubscribeGroupList() unsubscribeRelayList() - unsubscribeFollows() } }