impr: switch to refactored feed handler (#654)
* impr: use refactored feed handler for main & community * refactor: re-add post preloading to feed handler * fix: remove unused setting & improve consistency of postmedia compact
This commit is contained in:
1 parent
2d01124bbf
commit
9460eec7e1
26 files changed
+489
-467
No files matched your search
@@ -0,0 +1,98 @@
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import type {
|
||||
CommentReportView,
|
||||
CommentView,
|
||||
Person,
|
||||
PostReportView,
|
||||
PostView,
|
||||
PrivateMessage,
|
||||
PrivateMessageReportView,
|
||||
} from '$lib/client/types'
|
||||
|
||||
interface CommentReport {
|
||||
type: 'comment'
|
||||
item: CommentView
|
||||
}
|
||||
|
||||
interface PostReport {
|
||||
type: 'post'
|
||||
item: PostView
|
||||
}
|
||||
|
||||
interface PrivateMessageReport {
|
||||
type: 'message'
|
||||
item: PrivateMessage
|
||||
reportee: Person
|
||||
}
|
||||
|
||||
interface BaseReport {
|
||||
creator: Person
|
||||
reason: string
|
||||
reportee?: Person
|
||||
timestamp: Date
|
||||
resolved: boolean
|
||||
id: number
|
||||
resolver?: Person
|
||||
}
|
||||
|
||||
export const generalizeCommentReport = (
|
||||
report: CommentReportView,
|
||||
): ReportView => ({
|
||||
creator: report.creator,
|
||||
item: {
|
||||
...report,
|
||||
subscribed: 'NotSubscribed',
|
||||
saved: false,
|
||||
creator_blocked: false,
|
||||
creator: report.comment_creator,
|
||||
banned_from_community: false,
|
||||
},
|
||||
reason: report.comment_report.reason,
|
||||
type: 'comment',
|
||||
timestamp: publishedToDate(report.comment_report.published),
|
||||
resolved: report.comment_report.resolved,
|
||||
id: report.comment_report.id,
|
||||
resolver: report.resolver,
|
||||
})
|
||||
|
||||
export const generalizePostReport = (report: PostReportView): ReportView => ({
|
||||
creator: report.creator,
|
||||
item: {
|
||||
...report,
|
||||
unread_comments: 0,
|
||||
saved: false,
|
||||
creator_blocked: false,
|
||||
read: false,
|
||||
subscribed: 'NotSubscribed',
|
||||
creator: report.post_creator,
|
||||
banned_from_community: false,
|
||||
},
|
||||
reason: report.post_report.reason,
|
||||
type: 'post',
|
||||
timestamp: publishedToDate(report.post_report.published),
|
||||
resolved: report.post_report.resolved,
|
||||
id: report.post_report.id,
|
||||
resolver: report.resolver,
|
||||
})
|
||||
|
||||
export const generalizePrivateMessageReport = (
|
||||
report: PrivateMessageReportView,
|
||||
): ReportView => ({
|
||||
creator: report.creator,
|
||||
item: report.private_message,
|
||||
reason: report.private_message_report.reason,
|
||||
type: 'message',
|
||||
reportee: report.private_message_creator,
|
||||
timestamp: publishedToDate(report.private_message_report.published),
|
||||
resolved: report.private_message_report.resolved,
|
||||
id: report.private_message_report.id,
|
||||
resolver: report.resolver,
|
||||
})
|
||||
|
||||
export type Report =
|
||||
| CommentReportView
|
||||
| PostReportView
|
||||
| PrivateMessageReportView
|
||||
|
||||
export type ReportView = BaseReport &
|
||||
(CommentReport | PostReport | PrivateMessageReport)
|
||||
@@ -78,6 +78,7 @@
|
||||
type IconSource,
|
||||
} from 'svelte-hero-icons'
|
||||
import { CommunityLink } from '../community'
|
||||
import { SvelteMap } from 'svelte/reactivity'
|
||||
|
||||
interface Props {
|
||||
community?: Community
|
||||
@@ -134,7 +135,7 @@
|
||||
color: 'red-subtle' | 'yellow-subtle' | 'green-subtle'
|
||||
label: string
|
||||
}
|
||||
> = new Map([
|
||||
> = new SvelteMap([
|
||||
[
|
||||
'nsfw',
|
||||
{
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
<Spinner width={20} />
|
||||
</div>
|
||||
{:then { default: PostActionsMenu }}
|
||||
<PostActionsMenu {post} {onhide} bind:editing />
|
||||
<PostActionsMenu bind:post {onhide} bind:editing />
|
||||
{/await}
|
||||
{/if}
|
||||
{/snippet}
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
editing: boolean
|
||||
}
|
||||
|
||||
let { post, onhide, editing = $bindable() }: Props = $props()
|
||||
let { post = $bindable(), onhide, editing = $bindable() }: Props = $props()
|
||||
|
||||
function share(global: boolean = true) {
|
||||
const link = global
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
<script lang="ts">
|
||||
import { browser } from '$app/environment'
|
||||
import { client } from '$lib/client/lemmy.svelte'
|
||||
import type { GetPosts } from '$lib/client/types'
|
||||
import VirtualList from '$lib/components/render/VirtualList.svelte'
|
||||
import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import { client } from '$lib/client/lemmy.svelte'
|
||||
import {
|
||||
postFeeds,
|
||||
type PostFeed,
|
||||
type PostFeedID,
|
||||
} from '$lib/lemmy/postfeed.svelte'
|
||||
import { settings } from '$lib/settings.svelte.js'
|
||||
import type { PostView } from '$lib/client/types'
|
||||
import type { PostView } from 'lemmy-js-client'
|
||||
import { Button } from 'mono-svelte'
|
||||
import { onDestroy, onMount, untrack } from 'svelte'
|
||||
import {
|
||||
@@ -29,17 +25,19 @@
|
||||
|
||||
interface Props {
|
||||
posts: PostView[]
|
||||
params: GetPosts
|
||||
virtualList?: { itemHeights: (number | null)[] }
|
||||
lastSeen?: number
|
||||
community?: boolean
|
||||
feedId: PostFeedID
|
||||
feedData: PostFeed['data']
|
||||
children?: import('svelte').Snippet
|
||||
}
|
||||
|
||||
let {
|
||||
posts = $bindable(),
|
||||
params = $bindable(),
|
||||
virtualList = $bindable(),
|
||||
lastSeen = $bindable(0),
|
||||
community = false,
|
||||
feedId,
|
||||
feedData = $bindable(),
|
||||
children,
|
||||
}: Props = $props()
|
||||
|
||||
@@ -53,9 +51,7 @@
|
||||
let hasMore = $state(true)
|
||||
|
||||
const abortLoad = new AbortController()
|
||||
let seenIds = new SvelteSet<number>(
|
||||
feedData.posts.posts.map((post) => post.post.id),
|
||||
)
|
||||
let seenIds = new SvelteSet<number>(posts.map((post) => post.post.id))
|
||||
|
||||
async function loadMore() {
|
||||
if (!hasMore || loading) return
|
||||
@@ -67,19 +63,7 @@
|
||||
func: (input, init) =>
|
||||
fetch(input, { ...init, signal: abortLoad.signal }),
|
||||
})
|
||||
.getPosts({
|
||||
page_cursor: feedData.cursor.next,
|
||||
disliked_only: feedData.disliked_only,
|
||||
liked_only: feedData.liked_only,
|
||||
community_id: feedData.community_id,
|
||||
community_name: feedData.community_name,
|
||||
limit: feedData.limit,
|
||||
page: feedData.page,
|
||||
saved_only: feedData.saved_only,
|
||||
show_hidden: feedData.show_hidden,
|
||||
sort: feedData.sort,
|
||||
type_: feedData.type_,
|
||||
})
|
||||
.getPosts(params)
|
||||
.catch((e) => {
|
||||
throw new Error(e)
|
||||
})
|
||||
@@ -88,8 +72,9 @@
|
||||
|
||||
hasMore = newPosts.posts.length != 0
|
||||
|
||||
feedData.cursor.next = newPosts.next_page
|
||||
feedData.posts.posts.push(
|
||||
params.page_cursor = newPosts.next_page
|
||||
|
||||
posts.push(
|
||||
...newPosts.posts.filter((post) => {
|
||||
if (seenIds.has(post.post.id)) return false
|
||||
seenIds.add(post.post.id)
|
||||
@@ -97,8 +82,6 @@
|
||||
}),
|
||||
)
|
||||
|
||||
postFeeds.value[feedId].data = feedData
|
||||
|
||||
loading = false
|
||||
} catch (e) {
|
||||
error = e
|
||||
@@ -115,7 +98,7 @@
|
||||
|
||||
if (!id) return
|
||||
|
||||
postFeeds.value[feedId].lastSeen = Number(id)
|
||||
lastSeen = Number(id)
|
||||
|
||||
observer.unobserve(element)
|
||||
})
|
||||
@@ -158,8 +141,8 @@
|
||||
$effect(() => {
|
||||
if (listComp) {
|
||||
untrack(() => {
|
||||
if (postFeeds.value[feedId].lastSeen != 0) {
|
||||
listComp?.scrollToIndex(postFeeds.value[feedId].lastSeen, true)
|
||||
if (lastSeen != 0) {
|
||||
listComp?.scrollToIndex(lastSeen, true)
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -199,7 +182,7 @@
|
||||
{initialOffset}
|
||||
overscan={3}
|
||||
estimatedHeight={settings.view == 'cozy' ? 500 : 150}
|
||||
bind:restore={postFeeds.value[feedId].clientData}
|
||||
bind:restore={virtualList}
|
||||
bind:this={listComp}
|
||||
>
|
||||
{#snippet item(row)}
|
||||
@@ -264,7 +247,7 @@
|
||||
<div style="border-top-width: 0">
|
||||
<EndPlaceholder>
|
||||
{$t('routes.frontpage.endFeed', {
|
||||
community_name: feedData.community_name ?? 'undefined',
|
||||
community_name: params.community_name ?? 'undefined',
|
||||
})}
|
||||
{#snippet action()}
|
||||
<Button color="tertiary" icon={ChevronDoubleUp}>
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
Language,
|
||||
Link,
|
||||
Photo,
|
||||
Plus,
|
||||
Sparkles,
|
||||
XMark,
|
||||
} from 'svelte-hero-icons'
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<div
|
||||
class={[
|
||||
'relative overflow-hidden rounded-2xl max-h-full h-full',
|
||||
'border border-slate-200 dark:border-zinc-800 hover-scale-effect',
|
||||
'border border-slate-200 dark:border-zinc-800 hover-scale-effect bg-slate-200 dark:bg-zinc-800',
|
||||
]}
|
||||
>
|
||||
{#if post.thumbnail_url || type == 'image'}
|
||||
|
||||
Reference in new issue
Block a user