Merge branch 'main' into infinite-scroll

This commit is contained in:
Xylight committed 2024-07-05 18:16:22 -07:00
commit c8efc4c44b
6 files changed
+21 -16

No files matched your search

+1 -1
View File
@@ -136,7 +136,7 @@ Want your instance added here? Make a GitHub issue or make a PR! (this is for ge
| [phtn.app (Official)](https://phtn.app) | 🇺🇸 US West | [photon@xylight.dev](mailto:photon@xylight.dev) | | [phtn.app (Official)](https://phtn.app) | 🇺🇸 US West | [photon@xylight.dev](mailto:photon@xylight.dev) |
| [ph.opnxng.com](https://ph.opnxng.com) | 🇸🇬 Singapore | [about.opnxng.com](https://about.opnxng.com) | | [ph.opnxng.com](https://ph.opnxng.com) | 🇸🇬 Singapore | [about.opnxng.com](https://about.opnxng.com) |
| [photon.thesanewriter.com](https://photon.thesanewriter.com) | 🇺🇸 US East | [thesanewriter@lemmy.thesanewriter.com](mailto:thesanewriter@lemmy.thesanewriter.com) | | [photon.thesanewriter.com](https://photon.thesanewriter.com) | 🇺🇸 US East | [thesanewriter@lemmy.thesanewriter.com](mailto:thesanewriter@lemmy.thesanewriter.com) |
| [p.darrennathanael.com](https://p.darrennathanael.com) | 🇺🇸 US East | [noc@darrennathanael.com](mailto:noc@darrennathanael.com) | | [p.darrennathanael.com](https://p.darrennathanael.com) | 🇮🇩 ID West | [noc@darrennathanael.com](mailto:noc@darrennathanael.com) |
| [p.lemmy.ohaa.xyz](https://p.lemmy.ohaa.xyz) | 🇦🇹 Austria | (???) | | [p.lemmy.ohaa.xyz](https://p.lemmy.ohaa.xyz) | 🇦🇹 Austria | (???) |
| [~~photon.zhenyapav.com~~ (Has not updated since v1.9.2)](https://photon.zhenyapav.com) | 🇮🇸 Iceland | [zhenyapav@zhenyapav.com](mailto:zhenyapav@zhenyapav.com) | | [~~photon.zhenyapav.com~~ (Has not updated since v1.9.2)](https://photon.zhenyapav.com) | 🇮🇸 Iceland | [zhenyapav@zhenyapav.com](mailto:zhenyapav@zhenyapav.com) |
| [~~ph.buckodr.ink~~ (Has not updated since v1.21.1)](https://ph.buckodr.ink) | 🇺🇸 US East | [admin@buckodr.ink](mailto:admin@buckodr.ink) | | [~~ph.buckodr.ink~~ (Has not updated since v1.21.1)](https://ph.buckodr.ink) | 🇺🇸 US East | [admin@buckodr.ink](mailto:admin@buckodr.ink) |
@@ -80,7 +80,7 @@
}} }}
class="absolute bottom-0 left-0 text-sm m-2 text-left" class="absolute bottom-0 left-0 text-sm m-2 text-left"
size="sm" size="sm"
rounding="pill" rounding="lg"
alignment="left" alignment="left"
> >
{#if showAltText} {#if showAltText}
@@ -102,7 +102,7 @@
{:else if type == 'embed' && post.url} {:else if type == 'embed' && post.url}
<PostLink <PostLink
url={post.url} url={post.url}
thumbnail_url={post.thumbnail_url} thumbnail_url={view != 'list' ? post.thumbnail_url : undefined}
nsfw={post.nsfw} nsfw={post.nsfw}
embed_description={post.embed_description} embed_description={post.embed_description}
embed_title={post.embed_title} embed_title={post.embed_title}
@@ -17,13 +17,16 @@
export let type: MediaType = 'none' export let type: MediaType = 'none'
</script> </script>
{#if view == 'compact' || (view == 'list' && (!post.embed_title || type == 'iframe') && type != 'none')} {#if view == 'compact' || (view == 'list' && type != 'none')}
<div <div
class="w-24 sm:w-32 h-24 relative group/media {$$props.class ?? ''}" class="w-24 sm:w-32 h-24 relative group/media {$$props.class ?? ''}"
style={$$props.style ?? ''} style={$$props.style ?? ''}
> >
{#if post.alt_text} {#if post.alt_text}
<Popover openOnHover placement="bottom-end"> <Popover
openOnHover
placement={$userSettings.leftAlign ? 'bottom-start' : 'bottom-end'}
>
<Material <Material
slot="target" slot="target"
padding="none" padding="none"
@@ -24,9 +24,7 @@
on:click={async () => { on:click={async () => {
switching = true switching = true
if ($profile?.id == prof.id) { if ($profile?.id != prof.id) {
await setUserID(-1)
} else {
await setUserID(prof.id) await setUserID(prof.id)
} }
+10 -6
View File
@@ -23,6 +23,7 @@
import { import {
ArrowLeftOnRectangle, ArrowLeftOnRectangle,
ArrowRightOnRectangle, ArrowRightOnRectangle,
ArrowsRightLeft,
ArrowUturnLeft, ArrowUturnLeft,
BugAnt, BugAnt,
Check, Check,
@@ -184,21 +185,24 @@
? 'Switch' ? 'Switch'
: 'Current'} : 'Current'}
on:click={async () => { on:click={async () => {
if (profile.id == $currentProfile?.id) setUserID(-1) if (profile.id != $currentProfile?.id) {
else {
switching = profile.id switching = profile.id
await setUserID(profile.id) await setUserID(profile.id)
switching = -69 switching = -69
} }
}} }}
size="square-md" size="square-md"
color={profile.id == $currentProfile?.id ? 'primary' : 'secondary'} color={profile.id == $currentProfile?.id ? 'primary' : 'ghost'}
loading={switching == profile.id} loading={switching == profile.id}
disabled={switching == profile.id} disabled={switching == profile.id}
> >
{#if profile.id == $currentProfile?.id} <svelte:fragment slot="prefix">
<Icon src={Check} mini size="16" /> {#if profile.id == $currentProfile?.id}
{/if} <Icon src={Check} mini size="16" />
{:else}
<Icon src={ArrowsRightLeft} size="16" mini />
{/if}
</svelte:fragment>
</Button> </Button>
<Menu placement="bottom-end"> <Menu placement="bottom-end">
<Button size="square-md" slot="target"> <Button size="square-md" slot="target">
+2 -2
View File
@@ -107,8 +107,8 @@
size="square-md" size="square-md"
slot="target" slot="target"
disabled={$userSettings.dock.pins disabled={$userSettings.dock.pins
.map((p) => p.url) ?.map((p) => p.url)
.includes(pin.url)} ?.includes(pin.url)}
on:click={() => { on:click={() => {
$userSettings.dock.pins = [ $userSettings.dock.pins = [
...($userSettings.dock.pins ?? []), ...($userSettings.dock.pins ?? []),