Compare commits
3
Commits
a9bf3497fe
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2429eb9ec | ||
|
|
8e7c5be4c8 | ||
|
|
302700ef66 |
No files matched your search
@@ -1,5 +1,6 @@
|
||||
import type { Reroute } from '@sveltejs/kit'
|
||||
import { SINGLE_COMMUNITY } from '$lib/app/single'
|
||||
import { resolvePrettyPath } from '$lib/app/slug'
|
||||
|
||||
/**
|
||||
* Single-community mode: serve the community page for "/" and for every route that would
|
||||
@@ -9,6 +10,9 @@ import { SINGLE_COMMUNITY } from '$lib/app/single'
|
||||
export const reroute: Reroute = ({ url }) => {
|
||||
if (!SINGLE_COMMUNITY) return
|
||||
const path = url.pathname
|
||||
// Pretty post URLs: /p/<code>/<slug> -> /post/<instance>/<id>.
|
||||
const post = resolvePrettyPath(path)
|
||||
if (post) return post
|
||||
const home = `/c/${SINGLE_COMMUNITY}`
|
||||
if (path === '/' || path === '/communities' || path.startsWith('/explore')) return home
|
||||
const other = path.match(/^\/c\/([^/]+)\/?$/)
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
import { env } from '$env/dynamic/public'
|
||||
import { SINGLE_COMMUNITY } from '$lib/app/single'
|
||||
|
||||
/**
|
||||
* Pretty post URLs for single-community mode: /p/<code>/<title-slug>.
|
||||
*
|
||||
* <code> is the post id run through a reversible 32-bit mix and written in base36, so it is
|
||||
* unique per post, short, and does not expose the raw sequential id. Only the code is used to
|
||||
* find the post; the slug is decoration, so a renamed post keeps working links.
|
||||
*/
|
||||
|
||||
const MASK = 0xffffffff
|
||||
const MUL = 0x2c1b3c6d // odd, so it has an inverse mod 2^32
|
||||
const MUL_INV = inverse(MUL)
|
||||
const XOR = 0x5bd1e995
|
||||
const MIN = 36 ** 5 // pad codes to at least 6 characters
|
||||
|
||||
function inverse(a: number): number {
|
||||
// Newton's iteration for the multiplicative inverse mod 2^32.
|
||||
let x = a
|
||||
for (let i = 0; i < 5; i++) x = Math.imul(x, 2 - Math.imul(a, x)) >>> 0
|
||||
return x >>> 0
|
||||
}
|
||||
|
||||
export function encodeId(id: number): string {
|
||||
const mixed = Math.imul((id ^ XOR) >>> 0, MUL) >>> 0
|
||||
return (mixed + MIN).toString(36)
|
||||
}
|
||||
|
||||
export function decodeId(code: string): number | undefined {
|
||||
if (!/^[0-9a-z]{6,8}$/.test(code)) return undefined
|
||||
const n = parseInt(code, 36) - MIN
|
||||
if (n < 0 || n > MASK) return undefined
|
||||
const id = ((Math.imul(n >>> 0, MUL_INV) >>> 0) ^ XOR) >>> 0
|
||||
return id > 0 && id < 2 ** 31 ? id : undefined
|
||||
}
|
||||
|
||||
export function slugify(title: string, max = 60): string {
|
||||
const slug = title
|
||||
.toLowerCase()
|
||||
.replace(/[æ]/g, 'ae')
|
||||
.replace(/[øœ]/g, 'oe')
|
||||
.replace(/ß/g, 'ss')
|
||||
.replace(/[đð]/g, 'd')
|
||||
.replace(/þ/g, 'th')
|
||||
.replace(/ł/g, 'l')
|
||||
.normalize('NFKD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.replace(/&/g, ' and ')
|
||||
.replace(/[^a-z0-9]+/g, '-')
|
||||
.replace(/^-+|-+$/g, '')
|
||||
if (slug.length <= max) return slug || 'post'
|
||||
const cut = slug.slice(0, max)
|
||||
return cut.slice(0, cut.lastIndexOf('-') > 20 ? cut.lastIndexOf('-') : max)
|
||||
}
|
||||
|
||||
export const prettyPostUrls = Boolean(SINGLE_COMMUNITY)
|
||||
|
||||
export function prettyPostPath(id: number, title?: string): string {
|
||||
return `/p/${encodeId(id)}/${slugify(title ?? '')}`
|
||||
}
|
||||
|
||||
/** Internal route for a pretty path, or undefined when the path is not one. */
|
||||
export function resolvePrettyPath(path: string): string | undefined {
|
||||
const m = path.match(/^\/p\/([0-9a-z]+)(?:\/[^/]*)?\/?$/)
|
||||
if (!m) return undefined
|
||||
const id = decodeId(m[1])
|
||||
if (!id) return undefined
|
||||
const instance = (env.PUBLIC_INSTANCE_URL || '').toLowerCase()
|
||||
return `/post/${encodeURIComponent(instance)}/${id}`
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
<script lang="ts" module>
|
||||
import { SINGLE_COMMUNITY } from '$lib/app/single'
|
||||
import { client, getClient } from '$lib/api/client.svelte'
|
||||
import type { CommunityModeratorView, CommunityView } from '$lib/api/types'
|
||||
import { profile } from '$lib/app/auth'
|
||||
@@ -177,10 +178,12 @@
|
||||
avatarCircle={false}
|
||||
>
|
||||
{#snippet nameDetail()}
|
||||
!{fullCommunityName(
|
||||
community_view.community.name,
|
||||
community_view.community.actor_id,
|
||||
)}
|
||||
{#if !SINGLE_COMMUNITY}
|
||||
!{fullCommunityName(
|
||||
community_view.community.name,
|
||||
community_view.community.actor_id,
|
||||
)}
|
||||
{/if}
|
||||
{/snippet}
|
||||
</EntityHeader>
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts" module>
|
||||
import { SINGLE_COMMUNITY } from '$lib/app/single'
|
||||
import { prettyPostPath, prettyPostUrls } from '$lib/app/slug'
|
||||
import type { Community, Person, SubscribedType } from '$lib/api/types'
|
||||
import { profile } from '$lib/app/auth'
|
||||
import { t } from '$lib/app/i18n'
|
||||
@@ -371,7 +372,9 @@
|
||||
<a
|
||||
href={useAttachedUrl
|
||||
? postUrl
|
||||
: `/post/${encodeURIComponent(profile.current.instance)}/${id}`}
|
||||
: prettyPostUrls
|
||||
? prettyPostPath(id, title)
|
||||
: `/post/${encodeURIComponent(profile.current.instance)}/${id}`}
|
||||
target={useAttachedUrl ? '_blank' : undefined}
|
||||
rel={useAttachedUrl ? 'noopener noreferrer' : undefined}
|
||||
class="inline-block hover:underline hover:text-primary-900 dark:hover:text-primary-100 transition-colors"
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/state'
|
||||
import { prettyPostPath, prettyPostUrls } from '$lib/app/slug'
|
||||
import type { PostView } from '$lib/api/types'
|
||||
import { profile } from '$lib/app/auth'
|
||||
import { t } from '$lib/app/i18n'
|
||||
@@ -62,7 +63,9 @@
|
||||
function share(global: boolean = true, url?: string) {
|
||||
const link =
|
||||
url ??
|
||||
(global
|
||||
(prettyPostUrls
|
||||
? `${page.url.origin}${prettyPostPath(post.post.id, post.post.name)}`
|
||||
: global
|
||||
? post.post.ap_id
|
||||
: `${instanceToURL(profile.current.instance)}/post/${post.post.id}`)
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { env } from '$env/dynamic/public'
|
||||
import { prettyPostPath, prettyPostUrls } from '$lib/app/slug'
|
||||
import { client } from '$lib/api/client.svelte'
|
||||
import type { CommentView, PersonView, Post } from '$lib/api/types'
|
||||
import { profile } from '$lib/app/auth'
|
||||
@@ -74,6 +75,7 @@ export const isYoutubeLink = (url?: string): RegExpMatchArray | null => {
|
||||
}
|
||||
|
||||
export function postLink(post: Post) {
|
||||
if (prettyPostUrls) return prettyPostPath(post.id, post.name)
|
||||
return `/post/${encodeURIComponent(profile.current.instance)}/${post.id}`
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { resolve } from '$app/paths'
|
||||
import { env } from '$env/dynamic/public'
|
||||
import { profile } from '$lib/app/auth'
|
||||
import { error, redirect } from '@sveltejs/kit'
|
||||
|
||||
@@ -7,7 +8,9 @@ export function load({ params }) {
|
||||
redirect(
|
||||
302,
|
||||
resolve(`/post/[instance]/[id=integer]`, {
|
||||
instance: encodeURIComponent(profile.current.instance.toLowerCase()),
|
||||
instance: encodeURIComponent(
|
||||
(env.PUBLIC_INSTANCE_URL || profile.current.instance).toLowerCase(),
|
||||
),
|
||||
id: params.instance,
|
||||
}),
|
||||
)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { page } from '$app/state'
|
||||
import { replaceState } from '$app/navigation'
|
||||
import { prettyPostPath, prettyPostUrls } from '$lib/app/slug'
|
||||
import { client } from '$lib/api/client.svelte'
|
||||
import { profile } from '$lib/app/auth'
|
||||
import { t } from '$lib/app/i18n'
|
||||
@@ -28,6 +30,18 @@
|
||||
|
||||
let { data } = $props()
|
||||
|
||||
// Single-community mode: show the pretty /p/<code>/<slug> address for this post, also when
|
||||
// the reader arrived through an old /post/... link.
|
||||
let prettyPath = $derived(
|
||||
prettyPostUrls
|
||||
? prettyPostPath(data.data.value.post.post.id, data.data.value.post.post.name)
|
||||
: undefined,
|
||||
)
|
||||
$effect(() => {
|
||||
if (prettyPath && page.url.pathname != prettyPath)
|
||||
replaceState(prettyPath + page.url.search + page.url.hash, page.state)
|
||||
})
|
||||
|
||||
onMount(() => {
|
||||
data.data.value.meta.then((i) => data.data.value.post == i.post_view)
|
||||
|
||||
@@ -92,7 +106,12 @@
|
||||
{#if !data.data.value.post.post.local}
|
||||
<meta name="robots" content="noindex, follow" />
|
||||
{/if}
|
||||
<link rel="canonical" href={data.data.value.post.post.ap_id} />
|
||||
<link
|
||||
rel="canonical"
|
||||
href={prettyPath
|
||||
? `${page.url.origin}${prettyPath}`
|
||||
: data.data.value.post.post.ap_id}
|
||||
/>
|
||||
{#if data.data.value.post.post.body}
|
||||
<meta
|
||||
property="description"
|
||||
@@ -107,7 +126,10 @@
|
||||
content={data.data.value.post.post.body.slice(0, 500)}
|
||||
/>
|
||||
{/if}
|
||||
<meta property="og:url" content={page.url.toString()} />
|
||||
<meta
|
||||
property="og:url"
|
||||
content={prettyPath ? `${page.url.origin}${prettyPath}` : page.url.toString()}
|
||||
/>
|
||||
{#if mediaType(data.data.value.post.post.url) == 'image'}
|
||||
<meta property="og:image" content={data.data.value.post.post.url} />
|
||||
<meta property="twitter:card" content={data.data.value.post.post.url} />
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import { browser } from '$app/environment'
|
||||
import { goto } from '$app/navigation'
|
||||
import { env } from '$env/dynamic/public'
|
||||
import { resolve } from '$app/paths'
|
||||
import { client } from '$lib/api/client.svelte'
|
||||
import { PiefedClient } from '$lib/api/piefed/adapter.js'
|
||||
@@ -51,7 +53,11 @@ async function findInFeed(id: '/' | '/c/[name]' | '/f/[id]', postId: string) {
|
||||
}
|
||||
|
||||
export async function load({ params, url, route }) {
|
||||
if (profile.current.instance != params.instance) {
|
||||
// On the server profile.current.instance is the internal API address (PUBLIC_INTERNAL_INSTANCE),
|
||||
// and goto() cannot run there; compare against the public instance and only redirect in the
|
||||
// browser.
|
||||
const here = env.PUBLIC_INSTANCE_URL?.toLowerCase() || profile.current.instance
|
||||
if (browser && here != params.instance && profile.current.instance != params.instance) {
|
||||
goto(resolve('/post/[instance]/[id=integer]/confirm', params), {
|
||||
replaceState: true,
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user