refactor: switch posts to barrel export

This commit is contained in:
James Xylight committed 2025-09-07 10:20:04 -07:00
1 parent 0281e6f56a
commit bb30a86dc4
47 files changed
+424 -528

No files matched your search

@@ -1,12 +1,12 @@
<script lang="ts">
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { t } from '$lib/i18n/translations'
import type { CommentView } from '$lib/client/types'
import { Button, Material } from 'mono-svelte'
import { ArrowUturnUp, Icon } from 'svelte-hero-icons'
import type { ClassValue } from 'svelte/elements'
import { PostMeta } from '../post'
interface Props {
comment: CommentView
@@ -22,9 +22,9 @@
interface Props extends HTMLAttributes<HTMLDivElement> {
site: SiteView
taglines?: Tagline[] | undefined
admins?: PersonView[] | undefined
version?: string | undefined
taglines?: Tagline[]
admins?: PersonView[]
version?: string
class?: ClassValue
}
@@ -5,7 +5,6 @@
import MultiSelect from '$lib/components/input/Switch.svelte'
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
import { removalTemplate } from '$lib/components/lemmy/moderation/moderation.js'
import Post from '$lib/components/lemmy/post/Post.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { t } from '$lib/i18n/translations'
import { getClient } from '$lib/client/lemmy.svelte'
@@ -18,6 +17,7 @@
import { Fire, Icon, Trash } from 'svelte-hero-icons'
import { amMod, isAdmin } from './moderation'
import { errorMessage } from '$lib/lemmy/error'
import { Post } from '../post'
interface Props {
open: boolean
@@ -3,7 +3,6 @@
import { profile } from '$lib/auth.svelte.js'
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
import Post from '$lib/components/lemmy/post/Post.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { t } from '$lib/i18n/translations'
import { getClient } from '$lib/client/lemmy.svelte'
@@ -15,6 +14,7 @@
import { Button, Modal, toast } from 'mono-svelte'
import PrivateMessage from '../inbox/PrivateMessage.svelte'
import { errorMessage } from '$lib/lemmy/error'
import { Post } from '../post'
interface Props {
open: boolean
+10 -9
View File
@@ -1,18 +1,19 @@
<script lang="ts">
import { profile } from '$lib/auth.svelte'
import PostActions from '$lib/components/lemmy/post/actions/PostActions.svelte'
import { mediaType } from '$lib/components/lemmy/post/helpers.js'
import PostMedia from '$lib/components/lemmy/post/media/PostMedia.svelte'
import PostMediaCompact from '$lib/components/lemmy/post/media/PostMediaCompact.svelte'
import PostMeta, {
parseTags,
type Tag,
} from '$lib/components/lemmy/post/PostMeta.svelte'
import { publishedToDate } from '$lib/components/util/date.js'
import { settings, type View } from '$lib/settings.svelte.js'
import type { PostView } from '$lib/client/types'
import type { ClassValue } from 'svelte/elements'
import PostBody from './PostBody.svelte'
import {
type Tag,
PostMeta,
PostActions,
PostMedia,
PostBody,
parseTags,
mediaType,
PostMediaCompact,
} from '.'
function getTagRule(tags: Tag[]): 'blur-sm' | 'hide' | undefined {
const tagContent = tags.map((t) => t.content.toLowerCase())
@@ -54,9 +54,11 @@ dark:from-zinc-400 dark:via-zinc-400 bg-clip-text z-0 max-h-36`
onclick={() => (expanded = !expanded)}
size="square-sm"
color="tertiary"
class="text-black dark:text-white absolute z-10 isolate pointer-events-auto bottom-0 {expanded
? 'bg-slate-200/50 dark:bg-zinc-900 border shadow-md'
: ''} left-1/2 -translate-x-1/2 mb-4"
class={[
'text-black dark:text-white absolute z-10 isolate pointer-events-auto bottom-0',
'left-1/2 -translate-x-1/2 mb-4',
expanded && 'bg-slate-200/50 dark:bg-zinc-900 shadow-md',
]}
title="Expand"
>
<Icon
@@ -1,6 +1,6 @@
<script lang="ts">
import type { PostView } from '$lib/client/types'
import Post from './Post.svelte'
import { Post } from '.'
interface Props {
post: PostView
+83 -77
View File
@@ -1,4 +1,12 @@
<script lang="ts" module>
<script lang="ts" module> type BadgeType =
| 'nsfw'
| 'saved'
| 'featured'
| 'deleted'
| 'removed'
| 'locked'
| 'moderator'
| 'admin'
export interface Tag {
content: string
color?: string
@@ -11,6 +19,64 @@
['CW', { content: 'CW', color: '#ff000040' }],
])
const badgeToData: Map<
BadgeType,
{
icon: IconSource
color: 'red-subtle' | 'yellow-subtle' | 'green-subtle'
label: string
}
> = new Map([
[
'nsfw',
{
icon: ExclamationTriangle,
color: 'red-subtle',
label: t.get('post.badges.nsfw'),
},
],
[
'saved',
{
icon: Bookmark,
color: 'yellow-subtle',
label: t.get('post.badges.saved'),
},
],
[
'featured',
{
icon: Megaphone,
color: 'green-subtle',
label: t.get('post.badges.featured'),
},
],
[
'removed',
{
icon: Trash,
color: 'green-subtle',
label: t.get('post.badges.removed'),
},
],
[
'deleted',
{
icon: Trash,
color: 'red-subtle',
label: t.get('post.badges.deleted'),
},
],
[
'locked',
{
icon: LockClosed,
color: 'yellow-subtle',
label: t.get('post.badges.locked'),
},
],
])
export const parseTags = (
title?: string,
): { tags: Tag[]; title?: string } => {
@@ -43,6 +109,8 @@
</script>
<script lang="ts">
import { profile } from '$lib/auth.svelte'
import type { Community, Person, SubscribedType } from '$lib/client/types'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import Markdown from '$lib/components/markdown/Markdown.svelte'
import Avatar from '$lib/components/ui/Avatar.svelte'
@@ -51,10 +119,8 @@
formatRelativeDate,
} from '$lib/components/util/RelativeDate.svelte'
import { t } from '$lib/i18n/translations'
import { instance } from '$lib/instance.svelte'
import { settings, type View } from '$lib/settings.svelte'
import type { Community, Person, SubscribedType } from '$lib/client/types'
import { Badge, modal, Popover } from 'mono-svelte'
import { Badge, Material, modal, Popover } from 'mono-svelte'
import {
Bookmark,
ExclamationTriangle,
@@ -68,7 +134,6 @@
Trash,
type IconSource,
} from 'svelte-hero-icons'
import Material from 'mono-svelte/materials/Material.svelte'
import { CommunityLink } from '../community'
interface Props {
@@ -83,16 +148,7 @@
edited?: string
view?: View
// Badges
badges?: {
nsfw: boolean
saved: boolean
featured: boolean
deleted: boolean
removed: boolean
locked: boolean
moderator: boolean
admin: boolean
}
badges?: Record<BadgeType, boolean>
tags?: Tag[]
style?: string
titleClass?: string
@@ -274,66 +330,17 @@
</a>
{/each}
{/if}
{#if badges.nsfw}
<Badge label={$t('post.badges.nsfw')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={ExclamationTriangle} size="14" micro />
{/snippet}
{$t('post.badges.nsfw')}
{#each Object.keys(badges)
// filter by ones that are true
.filter(i => badges[i as BadgeType] == true)
// get from predetermined map
.map(i => badgeToData.get(i as BadgeType))
// remove null
.filter(i => i != undefined) as badge}
<Badge label={badge.label} color={badge.color} allowIconOnly>{#snippet icon()}
<Icon src={badge.icon} micro size="14" />{/snippet}{badge.label}
</Badge>
{/if}
{#if badges.saved}
<Badge
label={$t('post.badges.saved')}
color="yellow-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={Bookmark} micro size="14" />
{/snippet}
{$t('post.badges.saved')}
</Badge>
{/if}
{#if badges.locked}
<Badge
label={$t('post.badges.locked')}
color="yellow-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={LockClosed} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.locked')}</span>
</Badge>
{/if}
{#if badges.removed}
<Badge label={$t('post.badges.removed')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={Trash} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.removed')}</span>
</Badge>
{/if}
{#if badges.deleted}
<Badge label={$t('post.badges.deleted')} color="red-subtle" allowIconOnly>
{#snippet icon()}
<Icon src={Trash} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.deleted')}</span>
</Badge>
{/if}
{#if badges.featured}
<Badge
label={$t('post.badges.featured')}
color="green-subtle"
allowIconOnly
>
{#snippet icon()}
<Icon src={Megaphone} micro size="14" />
{/snippet}
<span class="max-md:hidden">{$t('post.badges.featured')}</span>
</Badge>
{/if}
{/each}
{@render extraBadges?.()}
</div>
</header>
@@ -341,8 +348,7 @@
{@const useAttachedUrl = settings.posts.titleOpensUrl && postUrl}
<h3
class={[
'max-sm:m-0!',
'font-medium',
'font-medium max-sm:mt-0!',
titleClass,
settings.markReadPosts && read && 'text-slate-600 dark:text-zinc-400',
view == 'compact' ? 'text-base' : 'text-lg',
@@ -352,7 +358,7 @@
<a
href={useAttachedUrl
? postUrl
: `/post/${encodeURIComponent(instance.data)}/${id}`}
: `/post/${encodeURIComponent(profile.current.intsance)}/${id}`}
target={useAttachedUrl
? '_blank'
: undefined}
@@ -22,7 +22,7 @@
ShieldCheck,
} from 'svelte-hero-icons'
import { postLink } from '../helpers'
import PostVote from '../PostVote.svelte'
import { PostVote } from '..'
let saving = $state(false)
let editing = $state(false)
@@ -1,11 +1,11 @@
<script lang="ts">
import Post from '$lib/components/lemmy/post/Post.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import { settings } from '$lib/settings.svelte.js'
import type { PostView } from '$lib/client/types'
import { Button } from 'mono-svelte'
import type { Snippet } from 'svelte'
import { ArchiveBox, Icon, Plus } from 'svelte-hero-icons'
import { Post } from '..'
interface Props {
posts: PostView[]
@@ -1,6 +1,5 @@
<script lang="ts">
import { browser } from '$app/environment'
import Post from '$lib/components/lemmy/post/Post.svelte'
import VirtualList from '$lib/components/render/VirtualList.svelte'
import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
@@ -26,6 +25,7 @@
import { expoOut } from 'svelte/easing'
import { SvelteSet } from 'svelte/reactivity'
import { fly } from 'svelte/transition'
import { Post } from '..'
interface Props {
posts: PostView[]
@@ -1,49 +0,0 @@
import { settings } from '$lib/settings.svelte'
import type { PostView } from '$lib/client/types'
import { SvelteMap, SvelteSet } from 'svelte/reactivity'
export type PostViewWithCrossposts = PostView & {
withCrossposts: true
crossposts: PostView[]
}
export type PostViewWithoutCrossposts = PostView & { withCrossposts?: false }
export const combineCrossposts = (
posts: PostView[],
): (PostViewWithCrossposts | PostViewWithoutCrossposts)[] => {
const urlMap = new SvelteMap<
string,
PostViewWithCrossposts | PostViewWithoutCrossposts
>()
const results: (PostViewWithCrossposts | PostViewWithoutCrossposts)[] = []
const seenUrls = new SvelteSet<string>()
posts?.forEach((post) => {
if (
!post ||
(settings.hidePosts.deleted && post.post.deleted) ||
(settings.hidePosts.removed && post.post.removed)
)
return
if (!post?.post?.url) {
results.push(post)
return
}
const existing = urlMap.get(post.post.url)
if (existing) {
existing.withCrossposts = true
if (existing.withCrossposts) {
existing.crossposts = [...(existing.crossposts || []), post]
}
urlMap.set(post.post.url, existing)
} else {
urlMap.set(post.post.url, post)
results.push(post)
}
seenUrls.add(post.post.url)
})
return results
}
+18 -15
View File
@@ -1,8 +1,12 @@
import { instance } from '$lib/instance.svelte'
import { profile } from '$lib/auth.svelte'
import { client } from '$lib/client/lemmy.svelte'
import { isImage, isVideo } from '$lib/ui/image'
import { canParseUrl, findClosestNumber } from '$lib/util.svelte'
import type { CommentView, PersonView, Post } from '$lib/client/types'
import {
canParseUrl,
findClosestNumber,
isImage,
isVideo,
} from '$lib/util.svelte'
export const isCommentMutable = (comment: CommentView, me: PersonView) =>
me.person.id == comment.creator.id
@@ -57,24 +61,23 @@ export const isYoutubeLink = (url?: string): RegExpMatchArray | null => {
return url?.match?.(YOUTUBE_REGEX)
}
export const postLink = (post: Post) =>
`/post/${encodeURIComponent(instance.data)}/${post.id}`
export function postLink(post: Post) {
return `/post/${encodeURIComponent(profile.current.instance)}/${post.id}`
}
export type MediaType = 'video' | 'image' | 'iframe' | 'embed' | 'none'
export type IframeType = 'youtube' | 'video' | 'none'
export const mediaType = (url?: string): MediaType => {
if (url) {
if (isImage(url)) return 'image'
if (isVideo(url)) return 'iframe'
if (isYoutubeLink(url)) return 'iframe'
if (canParseUrl(url)) return 'embed'
return 'none'
}
export function mediaType(url?: string): MediaType {
if (!url) return 'none'
if (isImage(url)) return 'image'
if (isVideo(url)) return 'iframe'
if (isYoutubeLink(url)) return 'iframe'
if (canParseUrl(url)) return 'embed'
return 'none'
}
export const iframeType = (url: string): IframeType => {
export function iframeType(url: string): IframeType {
if (isVideo(url)) return 'video'
if (isYoutubeLink(url)) return 'youtube'
return 'none'
+23
View File
@@ -0,0 +1,23 @@
export { default as Post } from './Post.svelte'
export { default as PostBody } from './PostBody.svelte'
export { default as PostItem } from './PostItem.svelte'
export { default as PostMeta } from './PostMeta.svelte'
export { default as PostVote } from './PostVote.svelte'
export { default as PostMedia } from './media/PostMedia.svelte'
export { default as PostMediaCompact } from './media/PostMediaCompact.svelte'
export { default as PostImage } from './media/PostImage.svelte'
export { default as PostIframe } from './media/PostIframe.svelte'
export { default as PostLink } from './link/PostLink.svelte'
export { default as VirtualFeed } from './feed/VirtualFeed.svelte'
export { default as PostFeed } from './feed/PostFeed.svelte'
export { default as PostForm } from './form/PostForm.svelte'
export { default as PostActions } from './actions/PostActions.svelte'
export {
type Tag,
parseTags,
textToTag,
default as PostsMeta,
} from './PostMeta.svelte'
export * from './helpers'
@@ -14,7 +14,6 @@
let { post, blur = false }: Props = $props()
let imageLoaded: boolean | null = $state(null)
onMount(() => {
imageLoaded = false
})
@@ -1,13 +1,13 @@
<script lang="ts">
import {
iframeType,
type MediaType,
} from '$lib/components/lemmy/post/helpers.js'
import PostLink from '$lib/components/lemmy/post/link/PostLink.svelte'
import { settings, type View } from '$lib/settings.svelte.js'
import type { Post } from '$lib/client/types'
import PostIframe from './PostIframe.svelte'
import PostImage from './PostImage.svelte'
import {
PostImage,
PostIframe,
PostLink,
type MediaType,
iframeType,
} from '..'
interface Props {
view?: View
@@ -1,15 +1,10 @@
<script lang="ts">
import {
bestImageURL,
postLink,
type MediaType,
} from '$lib/components/lemmy/post/helpers.js'
import { bestImageURL, postLink, type MediaType } from '..'
import { showImage } from '$lib/components/ui/ExpandableImage.svelte'
import { t } from '$lib/i18n/translations'
import { settings, type View } from '$lib/settings.svelte.js'
import type { Post } from '$lib/client/types'
import { modal } from 'mono-svelte'
import Button from 'mono-svelte/button/Button.svelte'
import { modal, Button } from 'mono-svelte'
import {
DocumentText,
ExclamationTriangle,