misc: change $site to a $state
This commit is contained in:
85 files changed
+153
-140
No files matched your search
@@ -4,8 +4,8 @@ import {
|
||||
} from '$lib/components/lemmy/moderation/moderation.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { site } from './lemmy'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { site } from './lemmy.svelte'
|
||||
import { instanceToURL, moveItem } from '$lib/util.svelte'
|
||||
import {
|
||||
type GetSiteResponse,
|
||||
@@ -118,7 +118,7 @@ export let profile = new CurrentProfile()
|
||||
async function fetchUserData(profile: CurrentProfile) {
|
||||
instance.set(profile.data.instance)
|
||||
if (profile.data.jwt) {
|
||||
site.set(undefined)
|
||||
site.data = undefined
|
||||
notifications.set({ applications: 0, inbox: 0, reports: 0 })
|
||||
|
||||
const res = await userFromJwt(profile.data.jwt, profile.data.instance)
|
||||
@@ -129,7 +129,7 @@ async function fetchUserData(profile: CurrentProfile) {
|
||||
type: 'error',
|
||||
})
|
||||
|
||||
site.set(res?.site)
|
||||
site.data = res?.site
|
||||
profile.data.user = res?.user
|
||||
if (profile.data.user) {
|
||||
profile.data.avatar = res?.user?.local_user_view.person.avatar
|
||||
@@ -137,10 +137,10 @@ async function fetchUserData(profile: CurrentProfile) {
|
||||
}
|
||||
} else {
|
||||
if (browser) {
|
||||
site.set(undefined)
|
||||
site.data = undefined
|
||||
client({ instanceURL: profile.data.instance })
|
||||
.getSite()
|
||||
.then((res) => site.set(res))
|
||||
.then((res) => (site.data = res))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { Community, CommunityView, ListingType } from 'lemmy-js-client'
|
||||
import { MenuButton, Search } from 'mono-svelte'
|
||||
import type { SearchProps } from 'mono-svelte/search/Search.svelte'
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import CommentActions from '$lib/components/lemmy/comment/CommentActions.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { Disclosure, toast } from 'mono-svelte'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { Button, Modal } from 'mono-svelte'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import type { CommentResponse } from 'lemmy-js-client'
|
||||
import { getClient, site } from '$lib/lemmy.js'
|
||||
import { getClient, site } from '$lib/lemmy.svelte.js'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
@@ -113,7 +113,7 @@
|
||||
</Button>
|
||||
{/snippet}
|
||||
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<MenuButton
|
||||
class="min-h-[16px] py-0"
|
||||
onclick={() => (language = undefined)}
|
||||
@@ -121,7 +121,7 @@
|
||||
<Icon src={XMark} size="16" micro />
|
||||
{$t('form.post.unset')}
|
||||
</MenuButton>
|
||||
{#each $site?.all_languages as languageOption}
|
||||
{#each site.data?.all_languages as languageOption}
|
||||
<MenuButton
|
||||
class="min-h-[16px] py-0"
|
||||
onclick={() => {
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
ChevronUp,
|
||||
Icon,
|
||||
} from 'svelte-hero-icons'
|
||||
import { getClient, site } from '$lib/lemmy'
|
||||
import { getClient, site } from '$lib/lemmy.svelte'
|
||||
import { settings } from '$lib/settings.svelte'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { page } from '$app/state'
|
||||
import { onMount, setContext } from 'svelte'
|
||||
import { Icon, ArrowDownCircle } from 'svelte-hero-icons'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { CommentView, Post } from 'lemmy-js-client'
|
||||
import { fly } from 'svelte/transition'
|
||||
import { toast } from 'mono-svelte'
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
modal,
|
||||
action,
|
||||
} from 'mono-svelte'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { addSubscription } from '$lib/lemmy/user.js'
|
||||
import { fullCommunityName } from '$lib/util.svelte.js'
|
||||
import type { CommunityModeratorView, CommunityView } from 'lemmy-js-client'
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
|
||||
import { Badge, ImageInput, MenuButton, Switch, toast } from 'mono-svelte'
|
||||
import { client, getClient, site } from '$lib/lemmy.js'
|
||||
import { client, getClient, site } from '$lib/lemmy.svelte.js'
|
||||
import { addSubscription } from '$lib/lemmy/user.js'
|
||||
import { Button, Checkbox, TextInput } from 'mono-svelte'
|
||||
import { uploadImage } from '$lib/util.svelte.js'
|
||||
@@ -238,7 +238,7 @@
|
||||
<div class="space-y-1">
|
||||
<SectionTitle>{$t('form.profile.languages.title')}</SectionTitle>
|
||||
<Material rounding="xl" color="uniform" class="dark:bg-zinc-950">
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<div class="flex gap-2 flex-wrap flex-row">
|
||||
<Menu class="gap-px">
|
||||
{#snippet target()}
|
||||
@@ -249,7 +249,7 @@
|
||||
</Badge>
|
||||
</button>
|
||||
{/snippet}
|
||||
{#each $site.all_languages.filter((l) => !formData.languages?.includes(l.id)) as language, index}
|
||||
{#each site.data.all_languages.filter((l) => !formData.languages?.includes(l.id)) as language, index}
|
||||
<MenuButton
|
||||
class="min-h-[16px] py-0"
|
||||
onclick={() => {
|
||||
@@ -264,7 +264,7 @@
|
||||
{/each}
|
||||
</Menu>
|
||||
{#each formData.languages ?? [] as languageId, index}
|
||||
{@const language = $site.all_languages.find(
|
||||
{@const language = site.data.all_languages.find(
|
||||
(l) => l.id == languageId,
|
||||
)}
|
||||
<button
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { t } from '$lib/translations'
|
||||
import type { Person } from 'lemmy-js-client'
|
||||
import { Button, Modal, toast } from 'mono-svelte'
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import type { Community, Person, PersonView } from 'lemmy-js-client'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { Button, Checkbox, Modal, TextInput } from 'mono-svelte'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { getClient } from '$lib/lemmy'
|
||||
import { getClient } from '$lib/lemmy.svelte'
|
||||
import type { CommentView, PostView } from 'lemmy-js-client'
|
||||
import { amMod, ban, isAdmin, remove } from './moderation'
|
||||
import {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import { Select, Switch, toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { isCommentView, isPostView } from '$lib/lemmy/item.js'
|
||||
import type { CommentView, PostView } from 'lemmy-js-client'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type {
|
||||
CommentView,
|
||||
PostView,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import type { SubmissionView } from '$lib/lemmy/contentview.js'
|
||||
import type {
|
||||
Comment,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { PostView } from 'lemmy-js-client'
|
||||
import PostVote from './PostVote.svelte'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import {
|
||||
ArrowsUpDown,
|
||||
ArrowTopRightOnSquare,
|
||||
@@ -419,7 +419,7 @@
|
||||
</MenuButton>
|
||||
{/if}
|
||||
{#if profile.data.user?.local_user_view.person.id != post.creator.id}
|
||||
{#if feature('hidePosts', $site?.version)}
|
||||
{#if feature('hidePosts', site.data?.version)}
|
||||
<MenuButton
|
||||
onclick={async () => {
|
||||
if (!profile.data?.jwt) return
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { vote as voteItem } from '$lib/lemmy/contentview.js'
|
||||
import { Button, Popover, buttonColor, toast } from 'mono-svelte'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import { fade, fly } from 'svelte/transition'
|
||||
import { backOut } from 'svelte/easing'
|
||||
import { t } from '$lib/translations'
|
||||
@@ -106,7 +106,7 @@
|
||||
</span>
|
||||
{/if}
|
||||
</button>
|
||||
{#if $site?.site_view.local_site.enable_downvotes ?? true}
|
||||
{#if site.data?.site_view.local_site.enable_downvotes ?? true}
|
||||
<button
|
||||
onclick={() => castVote(vote == -1 ? 0 : -1)}
|
||||
class="flex items-center flex-row-reverse gap-0.5 transition-colors
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
} from '@tanstack/svelte-virtual'
|
||||
import { afterNavigate, beforeNavigate } from '$app/navigation'
|
||||
import { combineCrossposts } from './crosspost.svelte'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import {
|
||||
postFeeds,
|
||||
type PostFeed,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { run, preventDefault } from 'svelte/legacy'
|
||||
|
||||
import { createEventDispatcher, onDestroy, onMount } from 'svelte'
|
||||
import { client, site } from '$lib/lemmy.js'
|
||||
import { client, site } from '$lib/lemmy.svelte.js'
|
||||
import type { Community, Post, PostView } from 'lemmy-js-client'
|
||||
import { Select, Spinner, Switch, toast } from 'mono-svelte'
|
||||
import {
|
||||
@@ -433,7 +433,7 @@
|
||||
{/if}
|
||||
<Switch bind:checked={data.nsfw}>{$t('form.post.nsfw')}</Switch>
|
||||
{#if data.language_id !== undefined}
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<Select
|
||||
class="w-max"
|
||||
label={$t('settings.app.lang.title')}
|
||||
@@ -443,7 +443,7 @@
|
||||
<Icon src={XMark} size="16" micro />
|
||||
{$t('form.post.unset')}
|
||||
</Option>
|
||||
{#each $site?.all_languages as language}
|
||||
{#each site.data?.all_languages as language}
|
||||
<Option value={language.id.toString()}>{language.name}</Option>
|
||||
{/each}
|
||||
</Select>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import type { View } from '$lib/settings.svelte'
|
||||
import { isImage, isVideo } from '$lib/ui/image'
|
||||
import { canParseUrl, findClosestNumber } from '$lib/util.svelte'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<script lang="ts">
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { Community, ListingType, Person } from 'lemmy-js-client'
|
||||
import { MenuButton, Search } from 'mono-svelte'
|
||||
import { createEventDispatcher } from 'svelte'
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
isAdmin,
|
||||
} from '$lib/components/lemmy/moderation/moderation.js'
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import { Button, Menu, MenuButton, MenuDivider, Spinner } from 'mono-svelte'
|
||||
import {
|
||||
GlobeAlt,
|
||||
@@ -57,10 +57,10 @@
|
||||
>
|
||||
{#snippet customIcon()}
|
||||
{#if LINKED_INSTANCE_URL}
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<Avatar
|
||||
alt={$site.site_view.site.name}
|
||||
url={$site.site_view.site.icon}
|
||||
alt={site.data.site_view.site.name}
|
||||
url={site.data.site_view.site.icon}
|
||||
width={32}
|
||||
circle={false}
|
||||
/>
|
||||
@@ -135,7 +135,7 @@
|
||||
href="/create/community"
|
||||
disabled={!profile.data?.jwt ||
|
||||
!profile.data?.user ||
|
||||
($site?.site_view.local_site.community_creation_admin_only &&
|
||||
(site.data?.site_view.local_site.community_creation_admin_only &&
|
||||
!isAdmin(profile.data.user))}
|
||||
>
|
||||
{#snippet prefix()}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
} from 'svelte-hero-icons'
|
||||
import { colorScheme } from '$lib/ui/colors'
|
||||
import { settings } from '$lib/settings.svelte'
|
||||
import { site } from '$lib/lemmy'
|
||||
import { site } from '$lib/lemmy.svelte'
|
||||
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
@@ -53,12 +53,12 @@
|
||||
|
||||
{#if showInstance}
|
||||
<Modal bind:open={showInstance} title="Instance">
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<SiteCard
|
||||
site={$site.site_view}
|
||||
admins={$site.admins}
|
||||
taglines={$site.taglines}
|
||||
version={$site.version}
|
||||
site={site.data.site_view}
|
||||
admins={site.data.admins}
|
||||
taglines={site.data.taglines}
|
||||
version={site.data.version}
|
||||
/>
|
||||
{:else}
|
||||
<Spinner />
|
||||
|
||||
@@ -6,7 +6,19 @@ import { instanceToURL } from '$lib/util.svelte'
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { toast } from 'mono-svelte'
|
||||
|
||||
export const site = writable<GetSiteResponse | undefined>(undefined)
|
||||
class SiteData {
|
||||
#data = $state<GetSiteResponse>()
|
||||
|
||||
get data() {
|
||||
return this.#data
|
||||
}
|
||||
|
||||
set data(value) {
|
||||
this.#data = value
|
||||
}
|
||||
}
|
||||
|
||||
export const site = new SiteData()
|
||||
|
||||
const isURL = (input: RequestInfo | URL): input is URL =>
|
||||
typeof input == 'object' && 'searchParams' in input
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { isComment, isCommentView, isPostView } from '$lib/lemmy/item.js'
|
||||
import type {
|
||||
CommentView,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { Result } from '$lib/lemmy/item.js'
|
||||
import type {
|
||||
Comment,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { browser } from '$app/environment'
|
||||
import { instance } from '$lib/instance'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import type {
|
||||
GetPosts,
|
||||
GetPostsResponse,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile, profileData, type Profile } from '$lib/auth.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { trycatch } from '$lib/util.svelte'
|
||||
import type { Community, MyUserInfo, PersonView } from 'lemmy-js-client'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
@@ -5,8 +5,8 @@ import { get } from 'svelte/store'
|
||||
import type { SubscribedType } from 'lemmy-js-client'
|
||||
import { page } from '$app/state'
|
||||
import { feature } from '$lib/version.js'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { site } from './lemmy'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { site } from './lemmy.svelte'
|
||||
import { t } from './translations'
|
||||
|
||||
// Despite the name, this will round up
|
||||
@@ -127,7 +127,7 @@ export async function uploadImage(
|
||||
const formData = new FormData()
|
||||
formData.append('images[]', image)
|
||||
|
||||
if (feature('unproxiedImageUpload', get(site)?.version)) {
|
||||
if (feature('unproxiedImageUpload', site.data?.version)) {
|
||||
const res = await client({ auth: jwt, instanceURL: instance }).uploadImage({
|
||||
image: image,
|
||||
})
|
||||
|
||||
+13
-10
@@ -26,7 +26,7 @@
|
||||
import { Forward, Icon } from 'svelte-hero-icons'
|
||||
import Shell from '$lib/components/ui/layout/Shell.svelte'
|
||||
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte'
|
||||
import { LINKED_INSTANCE_URL } from '$lib/instance'
|
||||
import { locale } from '$lib/translations'
|
||||
@@ -91,8 +91,8 @@
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
{#if $site?.site_view}
|
||||
<title>{$site?.site_view.site.name}</title>
|
||||
{#if site.data?.site_view}
|
||||
<title>{site.data?.site_view.site.name}</title>
|
||||
<meta
|
||||
name="theme-color"
|
||||
content={rgbToHex(
|
||||
@@ -102,8 +102,11 @@
|
||||
)}
|
||||
/>
|
||||
{#if LINKED_INSTANCE_URL}
|
||||
<link rel="icon" href={$site?.site_view?.site.icon} />
|
||||
<meta name="description" content={$site?.site_view?.site.description} />
|
||||
<link rel="icon" href={site.data?.site_view?.site.icon} />
|
||||
<meta
|
||||
name="description"
|
||||
content={site.data?.site_view?.site.description}
|
||||
/>
|
||||
{:else}
|
||||
<meta name="description" content="A sleek client for Lemmy" />
|
||||
{/if}
|
||||
@@ -150,12 +153,12 @@
|
||||
{#if page.data.slots?.sidebar?.component}
|
||||
{@const SvelteComponent = page.data.slots.sidebar.component}
|
||||
<SvelteComponent {...page.data.slots.sidebar.props} />
|
||||
{:else if $site}
|
||||
{:else if site.data}
|
||||
<SiteCard
|
||||
site={$site.site_view}
|
||||
taglines={$site.taglines}
|
||||
admins={$site.admins}
|
||||
version={$site.version}
|
||||
site={site.data.site_view}
|
||||
taglines={site.data.taglines}
|
||||
admins={site.data.admins}
|
||||
version={site.data.version}
|
||||
/>
|
||||
{:else}
|
||||
<div class="h-64 w-full grid place-items-center">
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import ViewSelect from '$lib/components/lemmy/dropdowns/ViewSelect.svelte'
|
||||
import { searchParam } from '$lib/util.svelte.js'
|
||||
import { ArrowRight, ChartBar, Icon } from 'svelte-hero-icons'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import Location from '$lib/components/lemmy/dropdowns/Location.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { t } from '$lib/translations.js'
|
||||
@@ -77,7 +77,7 @@
|
||||
<Icon src={ChartBar} size="16" mini />
|
||||
{$t('routes.frontpage.footer', {
|
||||
// @ts-ignore
|
||||
users: $site?.site_view?.counts?.users_active_day ?? '??',
|
||||
users: site.data?.site_view?.counts?.users_active_day ?? '??',
|
||||
})}
|
||||
</span>
|
||||
</Pageination>
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { settings } from '$lib/settings.svelte'
|
||||
import type { GetPostsResponse, ListingType, SortType } from 'lemmy-js-client'
|
||||
import { get, writable } from 'svelte/store'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { error, redirect } from '@sveltejs/kit'
|
||||
|
||||
export const ssr = false
|
||||
|
||||
@@ -1,18 +1,16 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { get } from 'svelte/store'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { site as siteStore } from '$lib/lemmy'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { site as siteStore } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load({ fetch }) {
|
||||
let site = get(siteStore)
|
||||
let site = siteStore
|
||||
|
||||
if (!site) {
|
||||
if (!site.data) {
|
||||
const res = await getClient(undefined, fetch).getSite()
|
||||
|
||||
site = res
|
||||
site.data = res
|
||||
}
|
||||
|
||||
return {
|
||||
site: site,
|
||||
site: site.data,
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
export async function load({ data, fetch, url }) {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
||||
import { Material, toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type {
|
||||
ApproveRegistrationApplication,
|
||||
RegistrationApplicationView,
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
Switch,
|
||||
toast,
|
||||
} from 'mono-svelte'
|
||||
import { getClient, site } from '$lib/lemmy.js'
|
||||
import { getClient, site } from '$lib/lemmy.svelte.js'
|
||||
import type { EditSite } from 'lemmy-js-client'
|
||||
import type { PageData } from './$types.js'
|
||||
import { Button, Checkbox, Select, TextInput } from 'mono-svelte'
|
||||
@@ -246,7 +246,7 @@
|
||||
<SectionTitle>{$t('form.profile.languages.title')}</SectionTitle>
|
||||
<p>{$t('form.profile.languages.description')}</p>
|
||||
<Material rounding="xl" color="uniform" class="dark:bg-zinc-950">
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<div class="flex gap-2 flex-wrap flex-row">
|
||||
<Menu class="gap-px">
|
||||
{#snippet target()}
|
||||
@@ -257,7 +257,7 @@
|
||||
</Badge>
|
||||
</button>
|
||||
{/snippet}
|
||||
{#each $site.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index}
|
||||
{#each site.data.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index}
|
||||
<MenuButton
|
||||
class="min-h-[16px] py-0"
|
||||
onclick={() => {
|
||||
@@ -269,7 +269,7 @@
|
||||
{/each}
|
||||
</Menu>
|
||||
{#each formData.discussion_languages ?? [] as languageId, index}
|
||||
{@const language = $site.all_languages.find(
|
||||
{@const language = site.data.all_languages.find(
|
||||
(l) => l.id == languageId,
|
||||
)}
|
||||
<button
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { t } from '$lib/translations.js'
|
||||
import { trycatch } from '$lib/util.svelte.js'
|
||||
import type { Instance } from 'lemmy-js-client'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
export async function load({ fetch, parent }) {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { Tagline } from 'lemmy-js-client'
|
||||
import { Button } from 'mono-svelte'
|
||||
import { Icon, Plus, QuestionMarkCircle, Trash } from 'svelte-hero-icons'
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { instance } from '$lib/instance.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { addAdmin } from '$lib/lemmy/user.js'
|
||||
import { removeItem, trycatch } from '$lib/util.svelte.js'
|
||||
import { Button, TextInput } from 'mono-svelte'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load(req: any) {
|
||||
const community = await getClient(undefined, req.fetch).getCommunity({
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { t } from '$lib/translations.js'
|
||||
import { settings } from '$lib/settings.svelte.js'
|
||||
import { site } from '$lib/lemmy.js'
|
||||
import { site } from '$lib/lemmy.svelte.js'
|
||||
import { resumables } from '$lib/lemmy/item'
|
||||
import CommunityHeader from '$lib/components/lemmy/community/CommunityHeader.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
@@ -141,7 +141,7 @@
|
||||
<Icon src={ChartBar} size="16" mini />
|
||||
{$t('routes.frontpage.footer', {
|
||||
// @ts-ignore
|
||||
users: $site?.site_view.counts.users_active_day ?? '??',
|
||||
users: site.data?.site_view.counts.users_active_day ?? '??',
|
||||
})}
|
||||
</span>
|
||||
</Pageination>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import type { PageData } from './$types.js'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { flip } from 'svelte/animate'
|
||||
import { Button, TextInput } from 'mono-svelte'
|
||||
import { t } from '$lib/translations.js'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { redirect } from '@sveltejs/kit'
|
||||
|
||||
export async function load({ params, fetch }) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { LINKED_INSTANCE_URL } from '$lib/instance.js'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import {
|
||||
type ListCommunitiesResponse,
|
||||
type ListingType,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { CommunityView, SubscribedType } from 'lemmy-js-client'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export const load = ({ url }) => {
|
||||
return { crosspost: Boolean(url.searchParams.get('crosspost')) ?? false }
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
Icon,
|
||||
Inbox,
|
||||
} from 'svelte-hero-icons'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/state'
|
||||
import Pageination from '$lib/components/ui/Pageination.svelte'
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import {
|
||||
generalizeCommentReply,
|
||||
generalizePersonMention,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { notifications, profile } from '$lib/auth.svelte.js'
|
||||
import {
|
||||
ArrowUturnLeft,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { awaitIfServer } from '$lib/promise.js'
|
||||
|
||||
export async function load({ fetch, url }) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
import { backOut, expoOut } from 'svelte/easing'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import { errorMessage } from '$lib/lemmy/error'
|
||||
import type { PrivateMessageResponse } from 'lemmy-js-client'
|
||||
import { flip } from 'svelte/animate'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { awaitIfServer } from '$lib/promise.js'
|
||||
|
||||
export async function load({ fetch, params }) {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load({ fetch }) {
|
||||
return (await getClient(undefined, fetch).getFederatedInstances())
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { site } from '$lib/lemmy'
|
||||
import { site } from '$lib/lemmy.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import { Button, Modal, Spinner } from 'mono-svelte'
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
</script>
|
||||
|
||||
<div class="flex flex-row w-full">
|
||||
{#if $site}
|
||||
{#if site.data}
|
||||
<div class="flex flex-col flex-1 gap-4">
|
||||
<Header pageHeader>{$t('routes.legal.title')}</Header>
|
||||
<Markdown
|
||||
source={$site.site_view.local_site.legal_information ??
|
||||
source={site.data.site_view.local_site.legal_information ??
|
||||
$t('routes.legal.noLegal')}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
mayBeIncompatible,
|
||||
site,
|
||||
validateInstance,
|
||||
} from '$lib/lemmy.js'
|
||||
} from '$lib/lemmy.svelte.js'
|
||||
import { Button, TextInput } from 'mono-svelte'
|
||||
import {
|
||||
Icon,
|
||||
@@ -98,7 +98,7 @@
|
||||
<div class="flex flex-col">
|
||||
{@render children?.()}
|
||||
<Header>{$t('account.login')}</Header>
|
||||
{#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace('v', ''))}
|
||||
{#if site.data && mayBeIncompatible(MINIMUM_VERSION, site.data.version.replace('v', ''))}
|
||||
<Note>
|
||||
{$t('account.versionGate', {
|
||||
//@ts-ignore
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<script lang="ts">
|
||||
import { preventDefault } from 'svelte/legacy'
|
||||
|
||||
import { site, validateInstance } from '$lib/lemmy.js'
|
||||
import { site, validateInstance } from '$lib/lemmy.svelte.js'
|
||||
import { Button, Note, TextInput, toast } from 'mono-svelte'
|
||||
import { MINIMUM_VERSION } from '$lib/version'
|
||||
import { mayBeIncompatible } from '$lib/lemmy'
|
||||
import { mayBeIncompatible } from '$lib/lemmy.svelte'
|
||||
import { DOMAIN_REGEX_FORMS } from '$lib/util.svelte'
|
||||
import { profile, profileData, type Profile } from '$lib/auth.svelte'
|
||||
import { LINKED_INSTANCE_URL } from '$lib/instance'
|
||||
@@ -54,7 +54,7 @@
|
||||
<div class="flex flex-col gap-2">
|
||||
{@render children?.()}
|
||||
<Header>{$t('account.addGuest')}</Header>
|
||||
{#if $site && mayBeIncompatible(MINIMUM_VERSION, $site.version.replace('v', ''))}
|
||||
{#if site.data && mayBeIncompatible(MINIMUM_VERSION, site.data.version.replace('v', ''))}
|
||||
<Note>
|
||||
{$t('account.versionGate', {
|
||||
//@ts-ignore
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
LINKED_INSTANCE_URL,
|
||||
instance as currentInstance,
|
||||
} from '$lib/instance.js'
|
||||
import { getClient, validateInstance } from '$lib/lemmy.js'
|
||||
import { getClient, validateInstance } from '$lib/lemmy.svelte.js'
|
||||
import { t } from '$lib/translations'
|
||||
import { Button, TextInput, toast } from 'mono-svelte'
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { isAdmin } from '$lib/components/lemmy/moderation/moderation.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import {
|
||||
generalizeCommentReport,
|
||||
generalizePostReport,
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import { Material, toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { isCommentReport, isPostReport } from '$lib/lemmy/item.js'
|
||||
import type {
|
||||
CommentReportView,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type {
|
||||
AdminPurgeCommentView,
|
||||
AdminPurgeCommunityView,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
LINKED_INSTANCE_URL,
|
||||
instance as currentInstance,
|
||||
} from '$lib/instance.js'
|
||||
import { getClient, validateInstance } from '$lib/lemmy.js'
|
||||
import { getClient, validateInstance } from '$lib/lemmy.svelte.js'
|
||||
import { t } from '$lib/translations'
|
||||
import { Button, TextInput, toast } from 'mono-svelte'
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { buildCommentsTree } from '$lib/components/lemmy/comment/comments.svelte.js'
|
||||
import { isImage } from '$lib/ui/image.js'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import CommentForm from '$lib/components/lemmy/comment/CommentForm.svelte'
|
||||
import { onMount } from 'svelte'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { awaitIfServer } from '$lib/promise.js'
|
||||
import { SSR_ENABLED, settings } from '$lib/settings.svelte'
|
||||
import type { GetComments } from 'lemmy-js-client'
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
import type { PageData } from './$types.js'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { profile } from '$lib/auth.svelte.js'
|
||||
import { Check, Icon, Trash, XMark } from 'svelte-hero-icons'
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/state'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { t } from '$lib/translations.js'
|
||||
import { qr } from '@svelte-put/qr/svg'
|
||||
import { Button, Material, TextInput, toast } from 'mono-svelte'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { preventDefault } from 'svelte/legacy'
|
||||
|
||||
import { deleteProfile, profile, setUser } from '$lib/auth.svelte'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import { instance as currentInstance } from '$lib/instance'
|
||||
import { t } from '$lib/translations'
|
||||
import { Button, TextInput, toast } from 'mono-svelte'
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
import { goto } from '$app/navigation'
|
||||
import { profileData, setUserID } from '$lib/auth.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import {
|
||||
Button,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { Checkbox, Material } from 'mono-svelte'
|
||||
import { Icon, Key } from 'svelte-hero-icons'
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load({ fetch, parent }) {
|
||||
const user = await parent()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
removeToast,
|
||||
toast,
|
||||
} from 'mono-svelte'
|
||||
import { getClient, site } from '$lib/lemmy.js'
|
||||
import { getClient, site } from '$lib/lemmy.svelte.js'
|
||||
import type { SaveUserSettings } from 'lemmy-js-client'
|
||||
import { Button, Switch, TextInput } from 'mono-svelte'
|
||||
import { uploadImage } from '$lib/util.svelte.js'
|
||||
@@ -129,7 +129,7 @@
|
||||
<SectionTitle>{$t('form.profile.languages.title')}</SectionTitle>
|
||||
<p>{$t('form.profile.languages.description')}</p>
|
||||
<Material rounding="xl" color="uniform" class="dark:bg-zinc-950">
|
||||
{#if $site && formData.discussion_languages}
|
||||
{#if site.data && formData.discussion_languages}
|
||||
<div class="flex gap-2 flex-wrap flex-row">
|
||||
<Menu class="gap-px">
|
||||
{#snippet target()}
|
||||
@@ -140,7 +140,7 @@
|
||||
</Badge>
|
||||
</button>
|
||||
{/snippet}
|
||||
{#each $site.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index}
|
||||
{#each site.data.all_languages.filter((l) => !formData.discussion_languages?.includes(l.id)) as language, index}
|
||||
<MenuButton
|
||||
class="min-h-[16px] py-0"
|
||||
onclick={() => {
|
||||
@@ -152,7 +152,7 @@
|
||||
{/each}
|
||||
</Menu>
|
||||
{#each formData.discussion_languages as languageId, index}
|
||||
{@const language = $site.all_languages.find(
|
||||
{@const language = site.data.all_languages.find(
|
||||
(l) => l.id == languageId,
|
||||
)}
|
||||
<button
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
|
||||
import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
|
||||
import { site } from '$lib/lemmy'
|
||||
import { site } from '$lib/lemmy.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import { feature } from '$lib/version'
|
||||
import { Button, Menu, MenuButton } from 'mono-svelte'
|
||||
@@ -62,7 +62,7 @@
|
||||
},
|
||||
]}
|
||||
/>
|
||||
{#if feature('mediaAndVotes', $site?.version)}
|
||||
{#if feature('mediaAndVotes', site.data?.version)}
|
||||
<Menu class="flex-1" placement="bottom-end">
|
||||
{#snippet target()}
|
||||
<Button
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type { SortType } from 'lemmy-js-client'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load({ fetch, url }) {
|
||||
const { jwt } = profile.data
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import { publishedToDate } from '$lib/components/util/date'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { instance } from '$lib/instance'
|
||||
import { client } from '$lib/lemmy'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
import { instanceToURL } from '$lib/util.svelte'
|
||||
import type { LocalImage } from 'lemmy-js-client'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type { SortType } from 'lemmy-js-client'
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { client } from '$lib/lemmy.js'
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { postFeed } from '$lib/lemmy/postfeed.js'
|
||||
import { error } from '@sveltejs/kit'
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { CommentView, ListingType, PostView } from 'lemmy-js-client'
|
||||
|
||||
function getSavedItemPublished(item: PostView | CommentView) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { profile } from '$lib/auth.svelte'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type {
|
||||
CommentView,
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
import { goto } from '$app/navigation'
|
||||
import { Badge, Material, Spinner, toast } from 'mono-svelte'
|
||||
import { DEFAULT_INSTANCE_URL } from '$lib/instance.js'
|
||||
import { validateInstance } from '$lib/lemmy.js'
|
||||
import { validateInstance } from '$lib/lemmy.svelte.js'
|
||||
import { Button, TextInput } from 'mono-svelte'
|
||||
import { onMount } from 'svelte'
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { Checkbox, Material, Spinner, toast } from 'mono-svelte'
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { GetCaptchaResponse } from 'lemmy-js-client'
|
||||
import { Button, TextInput } from 'mono-svelte'
|
||||
import {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
|
||||
export async function load({ params, fetch }) {
|
||||
const site = await getClient(params.instance, fetch).getSite()
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
import { page } from '$app/state'
|
||||
import { goto } from '$app/navigation'
|
||||
import { isCommentView } from '$lib/lemmy/item.js'
|
||||
import { client, getClient } from '$lib/lemmy.js'
|
||||
import { client, getClient } from '$lib/lemmy.svelte.js'
|
||||
import { isBlocked } from '$lib/lemmy/user.js'
|
||||
import { Menu, MenuButton, removeToast, toast } from 'mono-svelte'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { getItemPublished } from '$lib/lemmy/item.js'
|
||||
import type { SortType } from 'lemmy-js-client'
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getClient } from '$lib/lemmy.js'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { error } from '@sveltejs/kit'
|
||||
|
||||
export async function load({ fetch, params }) {
|
||||
|
||||
Reference in new issue
Block a user