From 322874dafa8e4c015f28c2ffcc717c3273f253ba Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 3 Jul 2024 11:21:02 -0700 Subject: [PATCH 01/60] feat: add basic infinite scroll --- bun.lockb | Bin 297774 -> 298160 bytes package.json | 1 + src/lib/components/lemmy/post/PostFeed.svelte | 3 +- src/routes/+page.svelte | 39 +++++++++++++----- src/routes/+page.ts | 35 ++++++++++------ .../post/[instance]/[id=integer]/+page.ts | 5 ++- 6 files changed, 57 insertions(+), 26 deletions(-) diff --git a/bun.lockb b/bun.lockb index 6592e57ead4119d60bd359a68afe322d46f16c0d..93edb82edc2abd01cd64d7da4e281d31d2fca447 100755 GIT binary patch delta 45157 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
YW@LpBz0HF_RP@mxxv7>MiN> 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 {:else} - {#each combinedPosts as post, index (post.post.id)} + {#each combinedPosts as post, index} {#if !($userSettings.hidePosts.deleted && post.post.deleted) && !($userSettings.hidePosts.removed && post.post.removed)}
  • diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index cbc17fb2..d08fc4bd 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,26 +1,37 @@
    @@ -34,7 +45,13 @@
    - + + +
    + +
    + +
    (undefined) export async function load({ url, fetch }) { const cursor = url.searchParams.get('cursor') as string | undefined @@ -18,14 +21,22 @@ export async function load({ url, fetch }) { const listingType: ListingType = (url.searchParams.get('type') as ListingType) || settings.defaultSort.feed - const posts = await getClient(undefined, fetch).getPosts({ - limit: 20, - page: page, - sort: sort, - type_: listingType, - page_cursor: cursor, - show_hidden: settings.posts.showHidden, - }) + const cached = get(_posts) + + const posts = + cached && url.searchParams.toString() == cached.params.toString() + ? cached.data + : await getClient(undefined, fetch).getPosts({ + limit: 20, + page: page, + sort: sort, + type_: listingType, + page_cursor: cursor, + show_hidden: settings.posts.showHidden, + }) + + if (!(cached && url.searchParams.toString() == cached.params.toString())) + _posts.set({ data: posts, params: url.searchParams }) try { return { diff --git a/src/routes/post/[instance]/[id=integer]/+page.ts b/src/routes/post/[instance]/[id=integer]/+page.ts index dc884fac..5c677460 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.ts +++ b/src/routes/post/[instance]/[id=integer]/+page.ts @@ -6,6 +6,7 @@ import { getClient } from '$lib/lemmy.js' import { awaitIfServer } from '$lib/promise.js' import { SSR_ENABLED, userSettings } from '$lib/settings.js' import { error } from '@sveltejs/kit' +import type { GetComments } from 'lemmy-js-client' import { get } from 'svelte/store' export async function load({ params, url, fetch }) { @@ -36,7 +37,7 @@ export async function load({ params, url, fetch }) { const sort = get(userSettings)?.defaultSort?.comments ?? 'Hot' - const commentParams: any = { + const commentParams: GetComments = { post_id: Number(params.id), type_: 'All', limit: 50, @@ -47,10 +48,10 @@ export async function load({ params, url, fetch }) { parent_id: parentId, } + const comments = getClient(params.instance, fetch).getComments(commentParams) const post = await getClient(params.instance.toLowerCase(), fetch).getPost({ id: Number(params.id), }) - const comments = getClient(params.instance, fetch).getComments(commentParams) return { thread: { From 92e6c9ef9f0a5b8ce07b0a852319bbbf00ec2713 Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 3 Jul 2024 12:11:28 -0700 Subject: [PATCH 02/60] misc: change preloading strategy --- .../lemmy/community/CommunityLink.svelte | 1 + src/lib/components/lemmy/post/PostMeta.svelte | 1 + src/lib/components/lemmy/user/UserLink.svelte | 1 + src/lib/components/util/VirtualList.svelte | 102 ++++++++++++++++++ src/routes/+page.svelte | 26 ++++- 5 files changed, 127 insertions(+), 4 deletions(-) create mode 100644 src/lib/components/util/VirtualList.svelte diff --git a/src/lib/components/lemmy/community/CommunityLink.svelte b/src/lib/components/lemmy/community/CommunityLink.svelte index 9e7366c1..19629901 100644 --- a/src/lib/components/lemmy/community/CommunityLink.svelte +++ b/src/lib/components/lemmy/community/CommunityLink.svelte @@ -16,6 +16,7 @@ class="items-center flex flex-row gap-2 hover:underline max-w-full min-w-0 {$$props.class || ''}" href="/c/{community.name}@{new URL(community.actor_id).hostname}" + data-sveltekit-preload-data="tap" > {#if avatar} diff --git a/src/lib/components/lemmy/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte index 1367826d..84ed0fae 100644 --- a/src/lib/components/lemmy/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -19,6 +19,7 @@ class="items-center flex flex-row gap-1 hover:underline max-w-full min-w-0 {$$props.class ?? ''}" href="/u/{user.name}@{new URL(user.actor_id).hostname}" + data-sveltekit-preload-data="tap" > {#if avatar} + import { onMount, afterUpdate } from 'svelte' + import type { SvelteComponent } from 'svelte' + + interface VisibleItem { + item: T + index: number + top: number + } + + export let items: any[] = [] + + let containerHeight = 0 + let scrollTop = 0 + let itemHeights: number[] = [] + let visibleItems: VisibleItem[] = [] + let totalHeight = 0 + let container: HTMLDivElement + + $: { + let currentOffset = 0 + let startIndex = 0 + let endIndex = items.length - 1 + + // Find the start index + for (let i = 0; i < items.length; i++) { + if (currentOffset + itemHeights[i] > scrollTop) { + startIndex = Math.max(0, i) + break + } + currentOffset += itemHeights[i] + } + + // Find the end index + currentOffset = 0 + for (let i = 0; i < items.length; i++) { + if (currentOffset > scrollTop + containerHeight) { + endIndex = Math.min(items.length - 1, i) + break + } + currentOffset += itemHeights[i] + } + + visibleItems = items.slice(startIndex, endIndex + 1).map((item, index) => ({ + item, + index: startIndex + index, + top: itemHeights.slice(0, startIndex + index).reduce((a, b) => a + b, 0), + })) + + console.log(visibleItems.length == items.length) + + totalHeight = itemHeights.reduce((a, b) => a + b, 0) + } + + function handleScroll(event: Event): void { + const target = event.target as HTMLDivElement + scrollTop = target.scrollTop + } + + function updateItemHeight(index: number, height: number): void { + if (itemHeights[index] !== height) { + itemHeights[index] = height + itemHeights = itemHeights + } + } + + onMount(() => { + containerHeight = container.clientHeight + // Force an update + items = items + }) + + afterUpdate(() => { + // Measure item heights after render + visibleItems.forEach(({ index }) => { + const element = container.querySelector( + `[data-index="${index}"]` + ) as HTMLDivElement + if (element) { + updateItemHeight(index, element.offsetHeight) + } + }) + }) + + + + +
    +
    + {#each visibleItems as { item, index, top }} +
    + +
    + {/each} +
    +
    diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index d08fc4bd..04dff8e8 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -16,17 +16,24 @@ export let data + const limit = 20 + let hasMore = data.posts.posts.length == limit + async function loadMore() { console.log('loading more') + if (!hasMore) return + const newPosts = await getClient().getPosts({ - limit: 20, + limit: limit, page: data.page, sort: data.sort, type_: data.listingType, page_cursor: data.cursor.next, }) + hasMore = newPosts.posts.length == limit + data.cursor.next = newPosts.next_page data.posts.posts = [...data.posts.posts, ...newPosts.posts] @@ -47,10 +54,15 @@
    -
    - +
    +
    +
    +
    +
    +
    +
    - +
    + + From 430eba300ab3d1752812c0b2e8575da5fc82976b Mon Sep 17 00:00:00 2001 From: Xylight Date: Wed, 3 Jul 2024 12:13:21 -0700 Subject: [PATCH 03/60] misc: change link design --- src/lib/components/lemmy/post/PostLink.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/components/lemmy/post/PostLink.svelte b/src/lib/components/lemmy/post/PostLink.svelte index 4615b953..1b89db92 100644 --- a/src/lib/components/lemmy/post/PostLink.svelte +++ b/src/lib/components/lemmy/post/PostLink.svelte @@ -1,6 +1,6 @@ + @@ -62,19 +61,24 @@ - {#if hasMore} -
    -
    -
    -
    -
    -
    + {#if $userSettings.infiniteScroll} + {#if hasMore} +
    +
    +
    +
    +
    +
    +
    -
    + {/if} + {/if} - -
    + -
    +
    From 6bc3c0bd94aa17dfa8bad39889dfe2426b3a6db4 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 7 Jul 2024 13:01:09 -0700 Subject: [PATCH 32/60] misc: appropriately size images --- src/lib/components/lemmy/post/helpers.ts | 6 +++--- src/lib/components/ui/Avatar.svelte | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index 46c131c7..c8e334c3 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -21,9 +21,9 @@ export const bestImageURL = ( return `${post.thumbnail_url}?thumbnail=512&format=webp` else if (compact && post.url) return `${post.url}?thumbnail=512&format=webp` - if (post.url) return `${post.url}?thumbnail=${width * 2}&format=webp` + if (post.url) return `${post.url}?thumbnail=${width}&format=webp` else if (post.thumbnail_url) - return `${post.thumbnail_url}?thumbnail=${width * 2}&format=webp` + return `${post.thumbnail_url}?thumbnail=${width}&format=webp` return post.url ?? '' } @@ -37,7 +37,7 @@ export const optimizeImageURL = ( url.searchParams.append('format', 'webp') url.searchParams.append( 'thumbnail', - findClosestNumber([128, 256, 512, 1024], width * 2).toString() + findClosestNumber([128, 256, 512, 728, 1024, 1536], width).toString() ) return url.toString() } catch (e) { diff --git a/src/lib/components/ui/Avatar.svelte b/src/lib/components/ui/Avatar.svelte index c4c0374a..d3dd35fa 100644 --- a/src/lib/components/ui/Avatar.svelte +++ b/src/lib/components/ui/Avatar.svelte @@ -3,7 +3,7 @@ import { createAvatar } from '@dicebear/core' import * as initials from '@dicebear/initials' - const sizes = [48, 64, 128, 256, 512] + const sizes = [16, 32, 48, 64, 128, 256, 512] export let url: string | undefined export let alt: string = '' @@ -21,7 +21,7 @@ urlObj.searchParams.append('format', 'webp') urlObj.searchParams.append( 'thumbnail', - findClosestNumber(sizes, (res || width) * 2).toString() + findClosestNumber(sizes, res || width).toString() ) return urlObj.toString() From 289ea0d34ed6547e6a2cbf6e92e837dee2dcaa87 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 7 Jul 2024 18:54:14 -0700 Subject: [PATCH 33/60] misc: swap thumbnail for resize for quality --- src/lib/components/lemmy/post/helpers.ts | 36 ++++++++++++++---------- src/lib/components/ui/Avatar.svelte | 2 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index c8e334c3..0bb7c385 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -12,18 +12,19 @@ export const bestImageURL = ( compact: boolean = true, width: number = 1024 ) => { - if (width > 1024) { - if (post.url) return `${post.url}?format=webp` - else if (post.thumbnail_url) return `${post.thumbnail_url}?format=webp` - } + let fetchWidth = + width > 1024 + ? // -1 disables a small thumbnail + -1 + : // set width to 512 if compact + compact + ? 512 + : // otherwise, just use the original width + width - if (compact && post.thumbnail_url) - return `${post.thumbnail_url}?thumbnail=512&format=webp` - else if (compact && post.url) return `${post.url}?thumbnail=512&format=webp` - - if (post.url) return `${post.url}?thumbnail=${width}&format=webp` - else if (post.thumbnail_url) - return `${post.thumbnail_url}?thumbnail=${width}&format=webp` + if (post.thumbnail_url) + return optimizeImageURL(post.thumbnail_url, fetchWidth) + else if (post.url) return optimizeImageURL(post.url, fetchWidth) return post.url ?? '' } @@ -34,11 +35,16 @@ export const optimizeImageURL = ( ): string => { try { const url = new URL(urlStr) + url.searchParams.append('format', 'webp') - url.searchParams.append( - 'thumbnail', - findClosestNumber([128, 256, 512, 728, 1024, 1536], width).toString() - ) + + if (width > 0) { + url.searchParams.append( + 'resize', + findClosestNumber([128, 256, 512, 728, 1024, 1536], width).toString() + ) + } + return url.toString() } catch (e) { console.log(e) diff --git a/src/lib/components/ui/Avatar.svelte b/src/lib/components/ui/Avatar.svelte index d3dd35fa..586b99dd 100644 --- a/src/lib/components/ui/Avatar.svelte +++ b/src/lib/components/ui/Avatar.svelte @@ -20,7 +20,7 @@ const urlObj = new URL(url) urlObj.searchParams.append('format', 'webp') urlObj.searchParams.append( - 'thumbnail', + 'resize', findClosestNumber(sizes, res || width).toString() ) From a14b5786ee837267cc74736da4c0d90cb6c064a3 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 7 Jul 2024 19:00:55 -0700 Subject: [PATCH 34/60] fix: subscribe error --- src/lib/lemmy/item.ts | 6 ------ src/lib/lemmy/user.ts | 21 +++++---------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/lib/lemmy/item.ts b/src/lib/lemmy/item.ts index b06b64b6..008a3e9d 100644 --- a/src/lib/lemmy/item.ts +++ b/src/lib/lemmy/item.ts @@ -96,10 +96,4 @@ export function addFavorite(item: Community, add: boolean = true) { } p.favorites = favs profileData.update(() => pd) - profile.update((p) => ({ - ...p, - favorites: favs, - id: p!.id, - instance: p!.instance, - })) } diff --git a/src/lib/lemmy/user.ts b/src/lib/lemmy/user.ts index 953aa6f3..3dab12e9 100644 --- a/src/lib/lemmy/user.ts +++ b/src/lib/lemmy/user.ts @@ -1,4 +1,4 @@ -import { profile, type Profile } from '$lib/auth.js' +import { profile, profileData, type Profile } from '$lib/auth.js' import { getClient } from '$lib/lemmy.js' import { trycatch } from '$lib/util.js' import type { Community, MyUserInfo, PersonView } from 'lemmy-js-client' @@ -22,30 +22,19 @@ export const addSubscription = ( community: Community, subscribe: boolean = true ) => { - const p = get(profile) + const pd = get(profileData) + const p = pd.profiles.find((p) => p.id == pd.profile) if (!p?.user) return if (subscribe) { - profile.set({ - ...p, - user: { - ...p.user, - follows: [ - ...p.user.follows, - { - community: community, - follower: p.user.local_user_view.person, - }, - ], - }, - }) + profileData.set(pd) } else { p.user.follows.splice( p.user.follows.findIndex((i) => i.community.id == community.id), 1 ) - profile.set(p) + profileData.set(pd) } } From c6c023689874287efdfccd7f56c7bc85cb0ac163 Mon Sep 17 00:00:00 2001 From: Xylight Date: Sun, 7 Jul 2024 19:02:43 -0700 Subject: [PATCH 35/60] misc: finally drop 0.18 support --- src/lib/lemmy.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 09298d49..e41f30e6 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -44,10 +44,7 @@ async function customFetch( } } - const url = toURL(input) - if (auth && url) url.searchParams.set('auth', auth) - - const res = await f(url ?? input, init) + const res = await f(input, init) if (!res.ok) error(res.status, await res.text()) return res } From eac513858c80c03ac1c2dba0138874d3b9c55539 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 8 Jul 2024 19:21:04 -0700 Subject: [PATCH 36/60] misc: switch back to thumbnail --- src/lib/components/lemmy/post/helpers.ts | 2 +- src/lib/components/ui/Avatar.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/lemmy/post/helpers.ts b/src/lib/components/lemmy/post/helpers.ts index 0bb7c385..07167990 100644 --- a/src/lib/components/lemmy/post/helpers.ts +++ b/src/lib/components/lemmy/post/helpers.ts @@ -40,7 +40,7 @@ export const optimizeImageURL = ( if (width > 0) { url.searchParams.append( - 'resize', + 'thumbnail', findClosestNumber([128, 256, 512, 728, 1024, 1536], width).toString() ) } diff --git a/src/lib/components/ui/Avatar.svelte b/src/lib/components/ui/Avatar.svelte index 586b99dd..d3dd35fa 100644 --- a/src/lib/components/ui/Avatar.svelte +++ b/src/lib/components/ui/Avatar.svelte @@ -20,7 +20,7 @@ const urlObj = new URL(url) urlObj.searchParams.append('format', 'webp') urlObj.searchParams.append( - 'resize', + 'thumbnail', findClosestNumber(sizes, res || width).toString() ) From 7fba8c1aed464db93b830537712e56e1f89308b8 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 8 Jul 2024 21:16:30 -0700 Subject: [PATCH 37/60] fix: duplicate posts --- src/routes/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 79d26c30..0f32cd93 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -54,7 +54,7 @@ let loading = false async function loadMore() { - if (!hasMore) return + if (!hasMore || loading) return try { loading = true From 408465ee1d5883ee3c309f40de94f43be057aebe Mon Sep 17 00:00:00 2001 From: binary yen Date: Sun, 7 Jul 2024 14:03:04 +0000 Subject: [PATCH 38/60] Added translation using Weblate (Chinese (Traditional)) --- src/lib/i18n/zh-Hant.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/lib/i18n/zh-Hant.json diff --git a/src/lib/i18n/zh-Hant.json b/src/lib/i18n/zh-Hant.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/lib/i18n/zh-Hant.json @@ -0,0 +1 @@ +{} From f9e0b5592e4c11ecac2868608a066b2fe3e6be2c Mon Sep 17 00:00:00 2001 From: Blisterexe Date: Sun, 7 Jul 2024 09:16:05 +0000 Subject: [PATCH 39/60] Translated using Weblate (French) Currently translated at 48.0% (234 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/fr/ --- src/lib/i18n/fr.json | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/lib/i18n/fr.json b/src/lib/i18n/fr.json index c34295c5..84428aeb 100644 --- a/src/lib/i18n/fr.json +++ b/src/lib/i18n/fr.json @@ -117,7 +117,8 @@ "generateTitle": "Generate le Titre", "uploadImage": "Ajouter une Image", "url": "URL", - "nsfw": "NSFW" + "nsfw": "NSFW", + "altText": "Équivalent textuel" }, "profile": { "displayName": "Nom affiché", @@ -171,7 +172,8 @@ "footer": "{{users:number}} En ligne {{users; 1:user; default:users;}}" }, "legal": { - "noLegal": "Cet instance n'a aucune information legale." + "noLegal": "Cet instance n'a aucune information legale.", + "title": "Légal" }, "profile": { "user": "Utilisateur", @@ -258,7 +260,7 @@ "federation": "Federation activée", "federationDebug": "mode de débogage de federation", "captcha": { - "enabled": "Activé" + "enabled": "CAPTCHA Activé" }, "title": "Configuration" }, @@ -290,7 +292,7 @@ "title": "Administrateurs", "empty": { "title": "Aucun administrateurs", - "description": "Il n'y a aucun administrateur de serveur, je sais pas comment vous avez fait cela." + "description": "Il n'y a aucun administrateur de serveur, je ne sais pas comment vous avez reussi a faire cela." } }, "federation": { @@ -303,7 +305,12 @@ "allow": "Whitelister", "allowplaceholder": "Whitelister une instance", "emptyBlock": { - "title": "Aucune instances blocqués" + "title": "Aucune instances bloqués", + "description": "Le bloc d'une instance cachera toutes nouvelles soumissions de cette instance." + }, + "emptyAllow": { + "title": "Aucunes instances sur la liste blanche", + "description": "Mettre une instance sur la liste blanche bloquera toutes les autres instances." } } }, @@ -334,7 +341,12 @@ }, "instances": "Instances", "translators": "Traducteurs", - "createCommunity": "Créer une communauté" + "createCommunity": "Créer une communauté", + "modlog": "Journal de modération", + "verifyEmail": { + "message": "Votre email a été verifié, vous pouvez maintenant fermer cette fenêtre.", + "error": "La vérification de l'email a échouée." + } }, "verifyEmail": { "message": "Votre e-mail est maintenant vérifié. Vous pouvez maintenant fermer cette fenetre.", @@ -355,5 +367,21 @@ "": "Dont translate the below!" } } + }, + "comment": { + "reply": "Répondre", + "actions": { + "link": "Copier le lien" + } + }, + "moderation": { + "report": "Créer un signalement", + "ban": { + "banning": "Bannir l'utilisateur", + "deleteData": "Suprimmer les données", + "warning": "Cette option supprimera TOUTES les publications de cet utilisateur.", + "expires": "Expire (UTC)", + "banFromCommunity": "Ban d'une communauté" + } } } From 5466c626085259ead602cb580a1ab559cb639d43 Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Sat, 6 Jul 2024 21:16:14 +0000 Subject: [PATCH 40/60] Translated using Weblate (Hebrew) Currently translated at 37.9% (185 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/he/ --- src/lib/i18n/he.json | 95 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 7 deletions(-) diff --git a/src/lib/i18n/he.json b/src/lib/i18n/he.json index a812a9ed..55e6927e 100644 --- a/src/lib/i18n/he.json +++ b/src/lib/i18n/he.json @@ -70,8 +70,11 @@ "verifyNewPassword": "אימות סיסמה חדשה", "deleteAccount": { "label": "מחיקת חשבון", - "deleteContent": "מחיקת תוכן" - } + "deleteContent": "מחיקת תוכן", + "warning": "פעולה זו תמחק את כל התוכן שלך." + }, + "scores": "הצגת הצבעות", + "showRead": "תצוגת פוסטים שנקראו" }, "confirmPassword": "אישור סיסמה", "post": { @@ -98,7 +101,8 @@ "title": "רישומים סגורים", "description": "בשרת זה הרישומים סגורים. נא למצוא שרת אחר.", "anotherInstance": "מציאת שרת אחר" - } + }, + "info": "השרת הוא היכן שחשבונך שמור, אך עדיין ניתן לגשת לתוכן משרתים נוספים." }, "email": "אימייל", "description": "תיאור", @@ -109,7 +113,8 @@ "forgotpassword": "שכחתי את הסיסמה", "submit": "שליחה", "edit": "עריכה", - "preview": "תצוגה מקדימה" + "preview": "תצוגה מקדימה", + "instance": "קישור לשרת" }, "profile": { "profile": "פרופיל", @@ -135,19 +140,95 @@ "accounts": "חשבונות", "communities": "קהילות", "search": { - "title": "חיפוש" + "title": "חיפוש", + "noResults": { + "title": "אין תוצאות", + "description": "אין תוצאות שתואמות את מילות המפתח שלך. מומלץ לעדכן את חיפושך.", + "alt": "חיפוש ברחבי הפדיורס" + } + }, + "admin": { + "config": { + "captcha": { + "enabled": "CAPTCHA מופעלת" + }, + "federation": "פדרציה מופעלת", + "title": "הגדרות", + "sidebar": "סרגל צידי", + "icon": "סמל", + "banner": "באנר", + "downvotesEnabled": "הפעלת הצבעות נגד", + "nsfwEnabled": "הפעלת תוכן למבוגרים", + "registration": { + "label": "מצב רישום", + "open": "פתוח", + "application": "חייב בקשה", + "closed": "סגור" + }, + "applicationQuestion": "שאלת בקשה", + "adminCommunityOnly": "רק מנהלים גבוהים יכולים ליצור קהילות", + "requireVerifyEmail": "חייב אימות על ידי אימייל", + "emailAdminsOnApplication": "שליחות אימייל למנהלים גבוהים בעת קבלת בקשות חדשות", + "emailAdminsOnReport": "שליחת אימייל למנהלים גבוהים בעת קבלת דיווחים חדשים", + "listingType": { + "label": "סוג רישום", + "all": "הכל", + "local": "מקומי" + }, + "private": "שרת פרטי", + "slurFilter": "סינון קללות regex", + "federationDebug": "מצב דיבוג פדרציה", + "hideModlogModNames": "הסתרת שמות מנהלים ביומן ההנהלה" + }, + "title": "מנהל גבוה" + }, + "saved": "שמורים", + "createPost": "יצירת פוסט", + "createCommunity": "יצירת קהילה", + "post": { + "commentCount": "תגובות", + "addComment": "הוספת תגובה", + "scrollToTop": "גלילה לתחילת העמוד", + "instanceWarning": "הפוסט הזה מבוקש משרת השונה משל חשבונך. פעולות רבות יכשלו.", + "remoteView": "תצוגה מרחוק", + "localView": "תצוגה מקומית", + "thread": { + "single": "מוצג שרשור בודד.", + "allComments": "כל התגובות", + "part": "מוצג חלק משרשור", + "context": "תצוגת הקשר" + } + }, + "inbox": { + "title": "דואר נכנס", + "markAsRead": "סימון הכל כנקרא", + "empty": { + "title": "אין הודעות חדשות", + "description": "הודעות, תגובות, ואזכורים יופיעו פה." + } + }, + "moderation": { + "title": "מנהל", + "empty": { + "title": "אין דיווחים חדשים", + "description": "כאשר תוכן מדווח, ניתן לפעול בנידון כאן." + }, + "reason": "סיבה", + "resolve": "פתירה", + "unresolve": "הסרת פתירה" } }, "nav": { "home": "בית", - "admin": "מנהל", + "admin": "מנהל גבוה", "moderation": "מנהל", "communities": "קהילות", "search": "חיפוש", "create": { "label": "יצירה", "community": "קהילה", - "logingate": "חובה עליך להתחבר כדי ליצור תוכן." + "logingate": "חובה עליך להתחבר כדי ליצור תוכן.", + "post": "פוסט" }, "menu": { "label": "פרופיל", From 241a143dd15850d13f79368f8c9ade7afcd73835 Mon Sep 17 00:00:00 2001 From: binary yen Date: Sun, 7 Jul 2024 14:06:51 +0000 Subject: [PATCH 41/60] Translated using Weblate (Chinese (Traditional)) Currently translated at 30.8% (150 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/zh_Hant/ --- src/lib/i18n/zh-Hant.json | 229 +++++++++++++++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 1 deletion(-) diff --git a/src/lib/i18n/zh-Hant.json b/src/lib/i18n/zh-Hant.json index 0967ef42..5ecb91be 100644 --- a/src/lib/i18n/zh-Hant.json +++ b/src/lib/i18n/zh-Hant.json @@ -1 +1,228 @@ -{} +{ + "profile": { + "inbox": "信箱", + "profile": "個人資料", + "saved": "保存", + "subscribed": "訂閱" + }, + "nav": { + "home": "首頁", + "moderation": "管理", + "admin": "設定", + "communities": "探索", + "search": "搜尋", + "create": { + "label": "新增", + "post": "貼文", + "community": "社群", + "logingate": "你需要登入,才能發文." + }, + "menu": { + "app": "App", + "settings": "設定", + "colorscheme": { + "label": "主題", + "system": "系統", + "dark": "暗黑", + "light": "光亮" + }, + "theme": "主題", + "about": "關於", + "source": "來源", + "instance": "站點", + "label": "個人資料" + } + }, + "account": { + "login": "登入", + "logout": "登出", + "accounts": "帳號", + "changeinstance": "變更站點", + "resetColor": "重設顏色", + "addGuest": "新增遊客", + "moveUp": "往上", + "moveDown": "往下", + "guest": "遊客", + "signup": "註冊" + }, + "filter": { + "location": { + "label": "範圍", + "all": "所有", + "subscribed": "已訂閱", + "moderator": "管理的", + "global": "全部", + "local": "本站" + }, + "sort": { + "label": "排序", + "hot": "熱門", + "top": { + "label": "最佳", + "time": { + "label": "時間", + "all": "所有", + "9months": "9月以來", + "6months": "6月以來", + "3months": "3月以來", + "month": "這月以來", + "week": "這周", + "day": "日", + "6hours": "6小時", + "hour": "這小時", + "12hours": "12小時" + } + }, + "new": "最新", + "old": "最舊", + "controversial": "最有爭議", + "scaled": "各版熱門", + "newcomments": "最新留言", + "mostcomments": "最多留言", + "active": "活躍" + }, + "view": { + "cozy": "可莉", + "list": "列表", + "compact": "緊湊", + "label": "顯示模式", + "legacy": "經典" + }, + "type": "類型", + "filter": "過濾", + "unread": "未讀", + "inbox": { + "messages": "私信", + "replies": "回覆", + "mentions": "標記" + } + }, + "form": { + "name": "名稱", + "instance": "站點網址", + "username": "使用者名稱", + "password": "密碼", + "confirmPassword": "確認密碼", + "forgotpassword": "忘記密碼", + "submit": "送出", + "edit": "編輯", + "preview": "預覽", + "post": { + "create": "發文", + "edit": "編輯貼文", + "community": "社群", + "title": "標題", + "url": "網址", + "body": "內文", + "nsfw": "限制級(NSFW)", + "altText": "替代文字", + "generateTitle": "代入標題", + "uploadImage": "上傳影像" + }, + "profile": { + "displayName": "顯示名稱", + "bio": "個人簡介", + "avatar": "大頭貼", + "banner": "背景橫幅", + "email": "Email", + "showNSFW": "顯示限制級(NSFW)內容", + "scores": "顯示讚數", + "bot": "機器人帳號", + "showRead": "顯示已讀貼文", + "currentPassword": "當前密碼", + "newPassword": "新密碼", + "verifyNewPassword": "確認密碼", + "showBots": "顯示機器人貼文" + }, + "signup": { + "title": "註冊" + }, + "2fa": "2FA兩步驗證碼" + }, + "routes": { + "saved": "保存", + "createPost": "發文", + "createCommunity": "創建社群", + "post": { + "crosspostCount": "轉貼", + "commentCount": "留言", + "addComment": "新增留言" + }, + "verifyEmail": { + "error": "無法驗證您的電子郵件。", + "message": "您的電子郵件已通過驗證。您現在可以關閉此視窗。" + }, + "passwordChange": { + "title": "更改密碼", + "description": "選擇您的新密碼。", + "instance": "您的帳戶託管在哪個實例上?" + }, + "resetLogin": { + "title": "重置密碼", + "description": "輸入您帳戶的電子郵件,將發送密碼重設連結。如果您的帳戶沒有電子郵件,請聯繫您的實例管理員。" + }, + "theme": { + "title": "主題", + "import": "匯入", + "export": "匯出", + "reset": "重設" + } + }, + "cards": { + "site": { + "about": "關於", + "stats": "統計", + "admins": "管理員" + }, + "community": { + "moderators": "管理員", + "subscribe": "訂閱", + "subscribed": "已訂閱", + "block": "封鎖", + "unblock": "取消封鎖", + "blockInstance": "封鎖站點", + "favorite": "最愛", + "unfavorite": "取消最愛", + "members": "訪客" + } + }, + "content": { + "all": "所有", + "users": "使用者" + }, + "post": { + "actions": { + "save": "保存", + "more": { + "crosspost": "轉貼" + } + }, + "badges": { + "nsfw": "限制級(NSFW)", + "featured": "置頂" + } + }, + "moderation": { + "report": "檢舉" + }, + "settings": { + "title": "設定", + "app": { + "lang": { + "auto": "自動", + "title": "語言" + } + }, + "lemmy": { + "nsfwBlur": { + "description": "模糊圖片並隱藏限制級(NSFW)帖文預覽。", + "title": "限制級(NSFW) 遮擋" + } + } + }, + "common": { + "next": "往後", + "back": "往前", + "refresh": "重整" + } +} From be07fcf3ca846cb1ff6fba17b4862410d21bec13 Mon Sep 17 00:00:00 2001 From: binary yen Date: Sun, 7 Jul 2024 16:11:13 +0000 Subject: [PATCH 42/60] Added translation using Weblate (Chinese (Simplified)) --- src/lib/i18n/zh-Hans.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/lib/i18n/zh-Hans.json diff --git a/src/lib/i18n/zh-Hans.json b/src/lib/i18n/zh-Hans.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/src/lib/i18n/zh-Hans.json @@ -0,0 +1 @@ +{} From dfb3f63bc223da42360e58d24b6708eaab0ae886 Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Sun, 7 Jul 2024 19:26:47 +0000 Subject: [PATCH 43/60] Deleted translation using Weblate (Cornish) --- src/lib/i18n/kw.json | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/lib/i18n/kw.json diff --git a/src/lib/i18n/kw.json b/src/lib/i18n/kw.json deleted file mode 100644 index 0967ef42..00000000 --- a/src/lib/i18n/kw.json +++ /dev/null @@ -1 +0,0 @@ -{} From cfcec79d6d2ca6e55290c41993c5cd21c26ad44e Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Sun, 7 Jul 2024 16:18:28 +0000 Subject: [PATCH 44/60] Translated using Weblate (Hebrew) Currently translated at 42.7% (208 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/he/ --- src/lib/i18n/he.json | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/lib/i18n/he.json b/src/lib/i18n/he.json index 55e6927e..83a19488 100644 --- a/src/lib/i18n/he.json +++ b/src/lib/i18n/he.json @@ -180,7 +180,44 @@ "federationDebug": "מצב דיבוג פדרציה", "hideModlogModNames": "הסתרת שמות מנהלים ביומן ההנהלה" }, - "title": "מנהל גבוה" + "title": "מנהל גבוה", + "applications": { + "title": "בקשות", + "empty": { + "title": "אין בקשות חדשות", + "description": "בקשות להצטרפות השרת יופיעו פה." + }, + "application": "בקשה", + "approved": "מאושרת", + "denied": "נדחתה", + "user": "משתמש", + "deny": "לדחות", + "approve": "לאשר", + "reason": "סיבה", + "modalTitle": "דחיית בקשה" + }, + "taglines": { + "title": "שורות תיוג", + "add": "הוספת שורת תיוג", + "empty": { + "title": "אין שורות תיוג", + "description": "שורת תיוג אקראית תופיע על כרטיס האתר כאשר משתמשים יבקרו בשרתך." + } + }, + "team": { + "title": "מנהלים גבוהים", + "empty": { + "title": "אין מנהלים גבוהים", + "description": "איכשהו אין מנהלים גבוהים לאתר זה. איך??" + } + }, + "federation": { + "title": "פדרציה", + "csv": "העלאת CSV", + "block": "חסימה", + "blockplaceholder": "חסימת שרת...", + "blocked": "שרתים חסומים" + } }, "saved": "שמורים", "createPost": "יצירת פוסט", From 044ead3610818d22681699207a55df165cb6b231 Mon Sep 17 00:00:00 2001 From: binary yen Date: Sun, 7 Jul 2024 16:11:49 +0000 Subject: [PATCH 45/60] Translated using Weblate (Chinese (Simplified)) Currently translated at 30.8% (150 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/zh_Hans/ --- src/lib/i18n/zh-Hans.json | 229 +++++++++++++++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 1 deletion(-) diff --git a/src/lib/i18n/zh-Hans.json b/src/lib/i18n/zh-Hans.json index 0967ef42..f6b4c888 100644 --- a/src/lib/i18n/zh-Hans.json +++ b/src/lib/i18n/zh-Hans.json @@ -1 +1,228 @@ -{} +{ + "form": { + "profile": { + "email": "Email", + "displayName": "顯示名稱", + "bio": "個人簡介", + "avatar": "大頭貼", + "banner": "背景橫幅", + "showNSFW": "顯示限制級(NSFW)內容", + "scores": "顯示讚數", + "bot": "機器人帳號", + "showBots": "顯示機器人貼文", + "showRead": "顯示已讀貼文", + "currentPassword": "當前密碼", + "newPassword": "新密碼", + "verifyNewPassword": "確認密碼" + }, + "username": "使用者名稱", + "name": "名稱", + "instance": "站點網址", + "password": "密碼", + "confirmPassword": "確認密碼", + "2fa": "2FA兩步驗證碼", + "forgotpassword": "忘記密碼", + "submit": "送出", + "edit": "編輯", + "preview": "預覽", + "post": { + "create": "發文", + "edit": "編輯貼文", + "community": "社群", + "title": "標題", + "url": "網址", + "body": "內文", + "nsfw": "限制級(NSFW)", + "generateTitle": "代入標題", + "uploadImage": "上傳影像", + "altText": "替代文字" + }, + "signup": { + "title": "註冊" + } + }, + "routes": { + "createPost": "發文", + "saved": "保存", + "createCommunity": "創建社群", + "post": { + "crosspostCount": "轉貼", + "commentCount": "留言", + "addComment": "新增留言" + }, + "verifyEmail": { + "message": "您的電子郵件已通過驗證。您現在可以關閉此視窗。", + "error": "無法驗證您的電子郵件。" + }, + "passwordChange": { + "title": "更改密碼", + "description": "選擇您的新密碼。", + "instance": "您的帳戶託管在哪個實例上?" + }, + "resetLogin": { + "title": "重置密碼", + "description": "輸入您帳戶的電子郵件,將發送密碼重設連結。如果您的帳戶沒有電子郵件,請聯繫您的實例管理員。" + }, + "theme": { + "title": "主題", + "import": "匯入", + "export": "匯出", + "reset": "重設" + } + }, + "common": { + "back": "往前", + "next": "往後", + "refresh": "重整" + }, + "profile": { + "profile": "個人資料", + "inbox": "信箱", + "saved": "保存", + "subscribed": "訂閱" + }, + "nav": { + "home": "首頁", + "admin": "設定", + "moderation": "管理", + "communities": "探索", + "search": "搜尋", + "create": { + "label": "新增", + "post": "貼文", + "community": "社群", + "logingate": "你需要登入,才能發文." + }, + "menu": { + "label": "個人資料", + "app": "App", + "settings": "設定", + "colorscheme": { + "label": "主題", + "system": "系統", + "dark": "暗黑", + "light": "光亮" + }, + "theme": "主題", + "about": "關於", + "source": "來源", + "instance": "站點" + } + }, + "account": { + "login": "登入", + "logout": "登出", + "signup": "註冊", + "accounts": "帳號", + "changeinstance": "變更站點", + "resetColor": "重設顏色", + "addGuest": "新增遊客", + "moveUp": "往上", + "moveDown": "往下", + "guest": "遊客" + }, + "filter": { + "location": { + "label": "範圍", + "all": "所有", + "local": "本站", + "subscribed": "已訂閱", + "moderator": "管理的", + "global": "全部" + }, + "sort": { + "label": "排序", + "active": "活躍", + "hot": "熱門", + "top": { + "label": "最佳", + "time": { + "label": "時間", + "all": "所有", + "9months": "9月以來", + "6months": "6月以來", + "3months": "3月以來", + "month": "這月以來", + "week": "這周", + "day": "日", + "12hours": "12小時", + "6hours": "6小時", + "hour": "這小時" + } + }, + "new": "最新", + "old": "最舊", + "controversial": "最有爭議", + "scaled": "各版熱門", + "mostcomments": "最多留言", + "newcomments": "最新留言" + }, + "view": { + "label": "顯示模式", + "cozy": "可莉", + "list": "列表", + "compact": "緊湊", + "legacy": "經典" + }, + "type": "類型", + "filter": "過濾", + "unread": "未讀", + "inbox": { + "messages": "私信", + "replies": "回覆", + "mentions": "標記" + } + }, + "cards": { + "site": { + "about": "關於", + "stats": "統計", + "admins": "管理員" + }, + "community": { + "members": "訪客", + "moderators": "管理員", + "subscribe": "訂閱", + "subscribed": "已訂閱", + "block": "封鎖", + "unblock": "取消封鎖", + "blockInstance": "封鎖站點", + "favorite": "最愛", + "unfavorite": "取消最愛" + } + }, + "content": { + "all": "所有", + "users": "使用者" + }, + "post": { + "actions": { + "save": "保存", + "more": { + "crosspost": "轉貼" + } + }, + "badges": { + "nsfw": "限制級(NSFW)", + "featured": "置頂" + } + }, + "moderation": { + "report": "檢舉" + }, + "settings": { + "title": "設定", + "app": { + "lang": { + "title": "語言", + "auto": "自動" + } + }, + "lemmy": { + "nsfwBlur": { + "title": "限制級(NSFW) 遮擋", + "description": "模糊圖片並隱藏限制級(NSFW)帖文預覽。" + } + } + } +} From 9cd4cf27ff559e4ea1b2e51be460d14c8910fb85 Mon Sep 17 00:00:00 2001 From: Blisterexe Date: Sun, 7 Jul 2024 16:23:36 +0000 Subject: [PATCH 46/60] Translated using Weblate (French) Currently translated at 52.1% (254 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/fr/ --- src/lib/i18n/fr.json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/lib/i18n/fr.json b/src/lib/i18n/fr.json index 84428aeb..318e6035 100644 --- a/src/lib/i18n/fr.json +++ b/src/lib/i18n/fr.json @@ -346,6 +346,26 @@ "verifyEmail": { "message": "Votre email a été verifié, vous pouvez maintenant fermer cette fenêtre.", "error": "La vérification de l'email a échouée." + }, + "passwordChange": { + "title": "Changer le mot de passe", + "description": "Choisissez votre nouveaux mot de passe.", + "instance": "Sur quelle instance est hostée votre compte?" + }, + "resetLogin": { + "title": "Réinitialiser le mot de passe", + "description": "Mettez l'email de vôtre compte, et un lien de réinitialision de mot de passe sera envoyé. Si vôtre compte n'a pas de email, vous devez contacter les administrateurs de votre instance." + }, + "theme": { + "import": "Importer", + "export": "Exporter", + "reset": "Réinitialiser", + "accent": "Couleur d'accentuation", + "resetWarning": { + "title": "Réinitialiser les paramètres d'apparence", + "description": "Ceci remettera a zéro toute la configuration de l'apparence, il est conseillé de l'exporter d'abord." + }, + "title": "Apparence" } }, "verifyEmail": { @@ -365,6 +385,9 @@ "app": { "lang": { "": "Dont translate the below!" + }, + "theming": { + "link": "Configuration d'apparence" } } }, @@ -383,5 +406,20 @@ "expires": "Expire (UTC)", "banFromCommunity": "Ban d'une communauté" } + }, + "cards": { + "site": { + "stats": "Statistiques", + "admins": "Administrateurs" + }, + "community": { + "members": "Membres", + "moderators": "Modérateurs", + "subscribe": "S'abonner", + "subscribed": "Abonné", + "modlog": "Journal de modération", + "block": "Bloquer", + "unblock": "Débloquer" + } } } From 0eb46c36963c2792defb0e64d3a42bbeed219e1b Mon Sep 17 00:00:00 2001 From: Weblate Admin Date: Tue, 9 Jul 2024 18:38:55 +0000 Subject: [PATCH 47/60] Translated using Weblate (Hebrew) Currently translated at 44.7% (218 of 487 strings) Translation: Photon/App Translate-URL: http://weblate.xylight.dev/projects/photon/test/he/ --- src/lib/i18n/he.json | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/lib/i18n/he.json b/src/lib/i18n/he.json index 83a19488..6d4e6d12 100644 --- a/src/lib/i18n/he.json +++ b/src/lib/i18n/he.json @@ -26,13 +26,15 @@ "12hours": "12 שעות", "6hours": "6 שעות", "hour": "שעה" - } + }, + "label": "הטובים ביותר" }, "new": "חדש", "old": "ישן", "controversial": "שנוי במחלוקת", "mostcomments": "תגובות", - "newcomments": "תגובות חדשות" + "newcomments": "תגובות חדשות", + "scaled": "מטפסים" }, "view": { "label": "פריסה", @@ -114,12 +116,14 @@ "submit": "שליחה", "edit": "עריכה", "preview": "תצוגה מקדימה", - "instance": "קישור לשרת" + "instance": "קישור לשרת", + "setup": "הגדרה" }, "profile": { "profile": "פרופיל", "inbox": "דואר נכנס", - "saved": "שמורים" + "saved": "שמורים", + "subscribed": "רשומים" }, "routes": { "frontpage": { @@ -134,7 +138,10 @@ }, "profile": { "user": "משתמש", - "settings": "הגדרות" + "settings": "הגדרות", + "credentials": "אימות", + "moderates": "מנהל/ת", + "favorites": "אהובים" }, "translators": "מתרגמים", "accounts": "חשבונות", @@ -145,7 +152,8 @@ "title": "אין תוצאות", "description": "אין תוצאות שתואמות את מילות המפתח שלך. מומלץ לעדכן את חיפושך.", "alt": "חיפוש ברחבי הפדיורס" - } + }, + "query": "חיפוש" }, "admin": { "config": { @@ -216,7 +224,8 @@ "csv": "העלאת CSV", "block": "חסימה", "blockplaceholder": "חסימת שרת...", - "blocked": "שרתים חסומים" + "blocked": "שרתים חסומים", + "allowed": "שרתים מורשים" } }, "saved": "שמורים", @@ -234,7 +243,8 @@ "allComments": "כל התגובות", "part": "מוצג חלק משרשור", "context": "תצוגת הקשר" - } + }, + "crosspostCount": "פוסטים משותפים" }, "inbox": { "title": "דואר נכנס", From 3e563ad1cccff05a7e6233c1ba0fc775ea5f6e7e Mon Sep 17 00:00:00 2001 From: Xylight Date: Tue, 9 Jul 2024 12:58:49 -0700 Subject: [PATCH 48/60] feat: add tag rules --- src/lib/components/lemmy/post/Post.svelte | 39 +++++++- src/lib/components/lemmy/post/PostMeta.svelte | 94 +++++++++++-------- .../lemmy/post/media/PostMedia.svelte | 3 +- src/lib/i18n/en.json | 4 + src/lib/settings.ts | 7 ++ .../post/[instance]/[id=integer]/+page.svelte | 1 + 6 files changed, 102 insertions(+), 46 deletions(-) diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index e8f9836a..7d459d40 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -5,7 +5,10 @@ import PostActions from '$lib/components/lemmy/post/PostActions.svelte' import { userSettings } from '$lib/settings.js' import PostLink from '$lib/components/lemmy/post/PostLink.svelte' - import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte' + import PostMeta, { + parseTags, + type Tag, + } from '$lib/components/lemmy/post/PostMeta.svelte' import { Badge, Material, toast } from 'mono-svelte' import Markdown from '$lib/components/markdown/Markdown.svelte' import ExpandableImage from '$lib/components/ui/ExpandableImage.svelte' @@ -34,6 +37,10 @@ export let view = $userSettings.view $: type = mediaType(post.post.url, view) + + $: tags = parseTags(post.post.name) + $: rule = getTagRule(tags.tags) + $: hideTitle = $userSettings.posts.deduplicateEmbed && post.post.embed_title == post.post.name && @@ -45,6 +52,19 @@ post.post.embed_description == post.post.body && view != 'compact' + function getTagRule(tags: Tag[]): 'blur' | 'hide' | undefined { + const tagContent = tags.map((t) => t.content.toLowerCase()) + + let rule: 'blur' | 'hide' | undefined + tagContent.forEach((tag) => { + if ($userSettings.tagRules?.[tag]) + rule = $userSettings.tagRules?.[tag] ?? rule + if (rule == 'hide') return rule + }) + + return rule + } + function onClick(e: any) { const event = e as MouseEvent const parent = document.getElementById(post.post.id.toString()) @@ -77,7 +97,8 @@ }} > @@ -107,13 +129,20 @@ style="grid-area:embed;" class={view == 'list' || view == 'compact' ? '' : 'contents'} > - + {#if rule != 'hide'} + + {/if} {#if view == 'list' || view == 'compact'} + export interface Tag { + content: string + color?: string + icon?: IconSource + } + + export const textToTag: Map = new Map([ + ['OC', { content: 'OC', color: '#03A8F240' }], + ['NSFL', { content: 'NSFL', color: '#ff000040' }], + ['CW', { content: 'CW', color: '#ff000040' }], + ]) + + export const parseTags = ( + title?: string + ): { tags: Tag[]; title?: string } => { + if (!title) return { tags: [] } + + let extracted: Tag[] = [] + + title = title.replace(/\[(.*?)\]/g, (match, content) => { + extracted.push( + textToTag.get(content) ?? { + content: content, + } + ) + return '' + }) + + return { + tags: extracted, + title: title, + } + } + + @@ -74,7 +75,7 @@ transition-opacity duration-300 object-contain mx-auto" width={512} height={300} - class:blur-3xl={post.nsfw && $userSettings.nsfwBlur} + class:blur-3xl={blur} alt={post.alt_text ?? ''} /> diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json index 0f409453..0dc284c1 100644 --- a/src/lib/i18n/en.json +++ b/src/lib/i18n/en.json @@ -636,6 +636,10 @@ "title": "Translation", "description": "The LibreTranslate instance to use for translation.", "instance": "Domain" + }, + "titleTags": { + "title": "Parse tags in title", + "description": "Take text in [brackets] and turn it into tags that you can click to search for." } }, "embeds": { diff --git a/src/lib/settings.ts b/src/lib/settings.ts index a452db39..d86ce9b0 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -91,6 +91,9 @@ interface Settings { language: string | null useRtl: boolean translator: string | undefined + tagRules: { + [key: string]: 'hide' | 'blur' + } } export const defaultSettings: Settings = { @@ -159,6 +162,10 @@ export const defaultSettings: Settings = { language: env.PUBLIC_LANGUAGE ?? null, useRtl: false, translator: env.PUBLIC_TRANSLATOR ?? undefined, + tagRules: { + cw: 'blur', + nsfl: 'blur', + }, } export const userSettings = writable(defaultSettings) diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index da241904..08bbe20e 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -190,6 +190,7 @@ moderator: post.post_view.creator_is_moderator, }} published={publishedToDate(post.post_view.post.published)} + bind:title={post.post_view.post.name} />