Merge branch 'main' into new-theme-handler

This commit is contained in:
Xylight committed 2024-07-25 10:43:20 -07:00
commit 6fd970320b
14 files changed
+125 -52

No files matched your search

BIN
View File
Binary file not shown.
+27 -5
View File
@@ -19,6 +19,7 @@ import {
writable, writable,
type Readable, type Readable,
type Writable, type Writable,
type Updater,
} from 'svelte/store' } from 'svelte/store'
import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js' import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js'
import { browser } from '$app/environment' import { browser } from '$app/environment'
@@ -102,9 +103,31 @@ let fetchUser = {
prevProfile: -1, prevProfile: -1,
} }
export let profile: Readable<Profile> = derived( function profileStore(
profileData, data: Writable<ProfileData>,
(pd, set, update) => { fn: (
values: ProfileData,
set: (value: Profile) => void,
update: (fn: Updater<Profile>) => void
) => any
) {
const derive: Readable<Profile> = derived(data, fn)
const { subscribe } = derive
return {
subscribe,
set: (value: Profile) => {
data.update((data) => {
let index = data.profiles.findIndex((t) => t.id == value.id)
data.profiles[index] = value
return data
})
},
}
}
export let profile: Readable<Profile> & { set: (v: Profile) => void } =
profileStore(profileData, (pd, set, update) => {
const profile = const profile =
pd.profiles.find((p) => p.id == pd.profile) ?? getDefaultProfile() pd.profiles.find((p) => p.id == pd.profile) ?? getDefaultProfile()
@@ -154,8 +177,7 @@ export let profile: Readable<Profile> = derived(
fetchUser.loading = false fetchUser.loading = false
} }
} }
} })
)
export let notifications = writable<Notifications>({ export let notifications = writable<Notifications>({
applications: 0, applications: 0,
@@ -75,6 +75,15 @@
}) })
if ($profile.user) { if ($profile.user) {
const c = $profile.user.moderates
.map((m) => m.community.id)
.indexOf(res.community_view.community.id)
if (c != -1) {
$profile.user.moderates[c] = {
community: res.community_view.community,
moderator: $profile.user.local_user_view.person,
}
} else {
$profile.user = { $profile.user = {
...$profile.user, ...$profile.user,
moderates: [ moderates: [
@@ -85,6 +94,7 @@
}, },
], ],
} }
}
addSubscription(res.community_view.community, true) addSubscription(res.community_view.community, true)
} }
@@ -106,7 +116,10 @@
} }
</script> </script>
<form on:submit|preventDefault={submit} class="flex flex-col gap-4 h-full"> <form
on:submit|preventDefault={submit}
class="flex flex-col gap-4 h-full w-full"
>
<slot name="formtitle"> <slot name="formtitle">
<Header>{$t('routes.createCommunity')}</Header> <Header>{$t('routes.createCommunity')}</Header>
</slot> </slot>
@@ -15,9 +15,9 @@
export let navigate: boolean = true export let navigate: boolean = true
export let changeDefault: boolean = false export let changeDefault: boolean = false
let sort: string = selected.startsWith('Top') ? 'TopAll' : selected let sort: string = selected?.startsWith('Top') ? 'TopAll' : selected
$: if (selected) { $: if (selected) {
sort = selected.startsWith('Top') ? 'TopAll' : selected sort = selected?.startsWith('Top') ? 'TopAll' : selected
} }
const setSelected = () => (selected = sort) const setSelected = () => (selected = sort)
$: changeDefault $: changeDefault
@@ -148,7 +148,7 @@
<Button <Button
size="sm" size="sm"
href="/post/{getInstance()}/{post.post.id}" href="/post/{getInstance()}/{post.post.id}"
class="text-inherit h-full px-3" class="!text-inherit h-full px-3"
color="ghost" color="ghost"
rounding="pill" rounding="pill"
target={$userSettings.openLinksInNewTab ? '_blank' : ''} target={$userSettings.openLinksInNewTab ? '_blank' : ''}
+21 -4
View File
@@ -19,7 +19,10 @@
For embed-type posts. Displays embed card or a compact link. For embed-type posts. Displays embed card or a compact link.
--> -->
{#if embed_title && !compact} {#if embed_title && !compact}
<Material color="distinct" class="flex flex-col-reverse sm:flex-row overflow-hidden gap-4"> <Material
color="distinct"
class="flex flex-col-reverse sm:flex-row overflow-hidden gap-4"
>
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
{#if richURL} {#if richURL}
<Link <Link
@@ -52,14 +55,28 @@
target="_blank" target="_blank"
class="-m-4 mb-auto sm:-mb-4 sm:ml-auto flex-shrink-0 sm:w-1/3 sm:max-w-60" class="-m-4 mb-auto sm:-mb-4 sm:ml-auto flex-shrink-0 sm:w-1/3 sm:max-w-60"
> >
<picture>
<source
srcset={optimizeImageURL(thumbnail_url, 256)}
media="(max-width: 256px)"
/>
<source
srcset={optimizeImageURL(thumbnail_url, 512)}
media="(max-width: 512px)"
/>
<source
srcset={optimizeImageURL(thumbnail_url, 1024)}
media="(max-width: 1024px)"
/>
<img <img
src={optimizeImageURL(thumbnail_url, 256)} src={optimizeImageURL(thumbnail_url, -1)}
class="w-full h-full object-cover bg-slate-200 dark:bg-zinc-800" class="object-cover w-full sm:max-w-96 h-48 sm:h-72 bg-slate-200 dark:bg-zinc-800"
width={600} width={600}
height={400} height={400}
alt={embed_title} alt={embed_title}
class:blur-3xl={nsfw} class:blur-3xl={nsfw}
/> />
</picture>
</a> </a>
{/if} {/if}
</Material> </Material>
@@ -92,7 +109,7 @@
<a href={url} target="_blank"> <a href={url} target="_blank">
<img <img
src={optimizeImageURL(thumbnail_url, 256)} src={optimizeImageURL(thumbnail_url, 256)}
class="rounded-md max-w-[300px] w-full h-auto aspect-video object-cover bg-slate-200 dark:bg-zinc-800" class="rounded-md max-w-72 w-full h-auto aspect-video object-cover bg-slate-200 dark:bg-zinc-800"
width={600} width={600}
height={400} height={400}
alt={embed_title ?? 'Embed prevented alt text'} alt={embed_title ?? 'Embed prevented alt text'}
+6 -16
View File
@@ -15,18 +15,7 @@
<script lang="ts"> <script lang="ts">
import FormattedNumber from '$lib/components/util/FormattedNumber.svelte' import FormattedNumber from '$lib/components/util/FormattedNumber.svelte'
import type { Post } from 'lemmy-js-client' import type { Post } from 'lemmy-js-client'
import { import { ChevronDown, ChevronUp, Icon } from 'svelte-hero-icons'
ArrowDown,
ArrowDownCircle,
ArrowUp,
ArrowUpCircle,
ChevronDown,
ChevronUp,
HandThumbDown,
HandThumbUp,
Icon,
Key,
} from 'svelte-hero-icons'
import { profile } from '$lib/auth.js' import { profile } from '$lib/auth.js'
import { vote as voteItem } from '$lib/lemmy/contentview.js' import { vote as voteItem } from '$lib/lemmy/contentview.js'
import { Button, Popover, buttonColor, toast } from 'mono-svelte' import { Button, Popover, buttonColor, toast } from 'mono-svelte'
@@ -63,12 +52,13 @@
<div <div
class="{buttonColor.ghost} rounded-full h-full font-medium flex items-center *:p-2 class="{buttonColor.ghost} rounded-full h-full font-medium flex items-center *:p-2
hover:bg-white hover:dark:bg-zinc-900 overflow-hidden transition-colors flex-shrink-0 hover:bg-white hover:dark:bg-zinc-900 overflow-hidden transition-colors flex-shrink-0
{vote != 0 ? '' : '!text-inherit'} !text-inherit
{loading ? 'animate-pulse opacity-75 pointer-events-none' : ''}" {loading ? 'animate-pulse opacity-75 pointer-events-none' : ''}"
> >
<button <button
on:click={() => castVote(vote == 1 ? 0 : 1)} on:click={() => castVote(vote == 1 ? 0 : 1)}
class="flex items-center gap-1 {buttonColor.ghost} transition-colors border-0 class="flex items-center gap-0.5 {buttonColor.ghost} transition-colors border-0
{vote == 1 ? shouldShowVoteColor(vote, 'upvotes') : ''}" {vote == 1 ? shouldShowVoteColor(vote, 'upvotes') : '!text-inherit'}"
> >
<Icon src={ChevronUp} size="20" micro /> <Icon src={ChevronUp} size="20" micro />
<span class="grid text-sm"> <span class="grid text-sm">
@@ -89,8 +79,8 @@
></div> ></div>
<button <button
on:click={() => castVote(vote == -1 ? 0 : -1)} on:click={() => castVote(vote == -1 ? 0 : -1)}
class="flex items-center flex-row-reverse gap-1 {buttonColor.ghost} transition-colors border-0 class="flex items-center flex-row-reverse gap-0.5 {buttonColor.ghost} transition-colors border-0
{vote == -1 ? shouldShowVoteColor(vote, 'downvotes') : ''}" {vote == -1 ? shouldShowVoteColor(vote, 'downvotes') : '!text-inherit'}"
> >
<Icon src={ChevronDown} size="20" micro /> <Icon src={ChevronDown} size="20" micro />
<span class="grid text-sm"> <span class="grid text-sm">
+6
View File
@@ -360,6 +360,12 @@
"title": "Reset Theme", "title": "Reset Theme",
"description": "This will reset all of your colors to the default. It is recommended to export your theme before this." "description": "This will reset all of your colors to the default. It is recommended to export your theme before this."
} }
},
"community": {
"settings": {
"team": "Team",
"settings": "Settings"
}
} }
}, },
"cards": { "cards": {
+10 -1
View File
@@ -51,7 +51,16 @@ export async function postFeed(args: {
instance: get(instance), instance: get(instance),
}) })
return get(postFeeds)[args.id].data return (
get(postFeeds)[args.id]?.data ?? {
...args.request,
posts: posts,
cursor: {
next: posts.next_page,
},
type_: args.request.type_,
}
)
} }
export function getPostFeed(feeds: Map<PostFeedID, PostFeed>, id: PostFeedID) { export function getPostFeed(feeds: Map<PostFeedID, PostFeed>, id: PostFeedID) {
+13 -10
View File
@@ -22,20 +22,23 @@ export const addSubscription = (
community: Community, community: Community,
subscribe: boolean = true subscribe: boolean = true
) => { ) => {
const pd = get(profileData) const p = get(profile)
const p = pd.profiles.find((p) => p.id == pd.profile)
if (!p?.user) return if (!p.user) return
if (subscribe) { const index = p.user.follows.map((f) => f.community.id).indexOf(community.id)
profileData.set(pd)
if (subscribe && index == -1) {
p.user.follows.push({
// @ts-ignore
follower: p.user.follows[0]?.follower,
community: community,
})
} else { } else {
p.user.follows.splice( p.user.follows.splice(index, 1)
p.user.follows.findIndex((i) => i.community.id == community.id),
1
)
profileData.set(pd)
} }
profile.set(p)
} }
export const addAdmin = async (handle: string, added: boolean, jwt: string) => export const addAdmin = async (handle: string, added: boolean, jwt: string) =>
+2
View File
@@ -244,10 +244,12 @@
{$t('common.debug')} {$t('common.debug')}
</MenuButton> </MenuButton>
{/if} {/if}
{#if !LINKED_INSTANCE_URL || profile.user}
<MenuButton on:click={() => action(profile)} color="danger-subtle"> <MenuButton on:click={() => action(profile)} color="danger-subtle">
<Icon slot="prefix" src={ArrowRightOnRectangle} size="16" mini /> <Icon slot="prefix" src={ArrowRightOnRectangle} size="16" mini />
{$t('account.logout')} {$t('account.logout')}
</MenuButton> </MenuButton>
{/if}
</Menu> </Menu>
</div> </div>
{/each} {/each}
+20 -9
View File
@@ -2,6 +2,9 @@
import { goto } from '$app/navigation' import { goto } from '$app/navigation'
import { page } from '$app/stores' import { page } from '$app/stores'
import MultiSelect from '$lib/components/input/Switch.svelte' 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 { t } from '$lib/translations.js'
import { fullCommunityName } from '$lib/util.js' import { fullCommunityName } from '$lib/util.js'
import type { PageData } from './$types.js' import type { PageData } from './$types.js'
@@ -14,14 +17,22 @@
</script> </script>
<div class="flex flex-col gap-4 h-full"> <div class="flex flex-col gap-4 h-full">
<MultiSelect <div
headless class="sticky mx-auto z-50 max-w-full min-w-0 flex items-center gap-2"
options={[`${communityUrl}/settings`, `${communityUrl}/settings/team`]} style="top: max(1.5rem, {$contentPadding.top}px);"
optionNames={['Settings', 'Team']} >
selected={$page.url.pathname} <Tabs
on:select={(e) => { routes={[
goto(e.detail) {
}} href: `${communityUrl}/settings`,
/> name: $t('routes.community.settings.settings'),
},
{
href: `${communityUrl}/team`,
name: $t('routes.community.settings.team'),
},
]}
></Tabs>
</div>
<slot /> <slot />
</div> </div>
+1 -3
View File
@@ -2,6 +2,4 @@
import CommunityForm from '$lib/components/lemmy/community/CommunityForm.svelte' import CommunityForm from '$lib/components/lemmy/community/CommunityForm.svelte'
</script> </script>
<div class=" max-w-2xl mx-auto"> <CommunityForm />
<CommunityForm />
</div>
+2
View File
@@ -143,10 +143,12 @@
<Icon src={QuestionMarkCircle} mini size="16" /> <Icon src={QuestionMarkCircle} mini size="16" />
{$t('form.forgotpassword')} {$t('form.forgotpassword')}
</Button> </Button>
{#if !LINKED_INSTANCE_URL}
<Button color="tertiary" href="/login/guest"> <Button color="tertiary" href="/login/guest">
<Icon src={UserCircle} mini size="16" /> <Icon src={UserCircle} mini size="16" />
{$t('account.guest')} {$t('account.guest')}
</Button> </Button>
{/if}
</div> </div>
</form> </form>
</div> </div>