fix: Fix lint errors (#559)
* cleanup: postactions styling * misc: fix first round of errors * pkg: remove vitest * fix: fix lint errors stage 2 * fix: fix lint errors stage 3 * fix: fix lint errors, stage 3 * misc: update eslint rules to warn for writable derived
This commit is contained in:
1 parent
1824245f13
commit
76c581123a
225 files changed
+1553
-2352
No files matched your search
@@ -1,28 +1,18 @@
|
||||
<script lang="ts">
|
||||
import InboxItem from './InboxItem.svelte'
|
||||
import {
|
||||
AdjustmentsHorizontal,
|
||||
ArrowPath,
|
||||
Bars3BottomRight,
|
||||
Check,
|
||||
Funnel,
|
||||
Icon,
|
||||
Inbox,
|
||||
} from 'svelte-hero-icons'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/state'
|
||||
import Pageination from '$lib/components/ui/Pageination.svelte'
|
||||
import { notifications, profile } from '$lib/auth.svelte.js'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
import { searchParam } from '$lib/util.svelte.js'
|
||||
import { Button, Select } from 'mono-svelte'
|
||||
import EndPlaceholder from '$lib/components/ui/EndPlaceholder.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
|
||||
import Pageination from '$lib/components/ui/Pageination.svelte'
|
||||
import Placeholder from '$lib/components/ui/Placeholder.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { Button } from 'mono-svelte'
|
||||
import { ArrowPath, Check, Icon, Inbox } from 'svelte-hero-icons'
|
||||
import { expoOut } from 'svelte/easing'
|
||||
import { fly } from 'svelte/transition'
|
||||
import InboxItem from './InboxItem.svelte'
|
||||
|
||||
let { data } = $props()
|
||||
|
||||
@@ -192,7 +182,7 @@ items-center px-2 w-max top-6 lg:top-22"
|
||||
!data.inbox || (data.inbox.value?.length ?? 0) < (data?.limit ?? 0)
|
||||
)}
|
||||
page={data.page}
|
||||
href={(page) => `?page=${page}`}
|
||||
href={page => `?page=${page}`}
|
||||
/>
|
||||
</Tabs>
|
||||
</div>
|
||||
|
||||
@@ -7,7 +7,6 @@ import {
|
||||
generalizePrivateMessage,
|
||||
} from '$lib/lemmy/inbox.js'
|
||||
import { ReactiveState } from '$lib/promise.svelte.js'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
type InboxFeedType = 'replies' | 'mentions' | 'messages' | 'all'
|
||||
|
||||
|
||||
@@ -1,32 +1,17 @@
|
||||
<script lang="ts">
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import { notifications, profile } from '$lib/auth.svelte.js'
|
||||
import {
|
||||
ArrowUturnLeft,
|
||||
ArrowUturnUp,
|
||||
AtSymbol,
|
||||
ChatBubbleOvalLeft,
|
||||
Check,
|
||||
Envelope,
|
||||
Icon,
|
||||
Eye,
|
||||
EyeSlash,
|
||||
} from 'svelte-hero-icons'
|
||||
import { Material } from 'mono-svelte'
|
||||
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
|
||||
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
|
||||
import { Button } from 'mono-svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import type { InboxItem } from '$lib/lemmy/inbox.js'
|
||||
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
|
||||
import PrivateMessage from '$lib/components/lemmy/inbox/PrivateMessage.svelte'
|
||||
import PrivateMessageModal from '$lib/components/lemmy/modal/PrivateMessageModal.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import Expandable from '$lib/components/ui/Expandable.svelte'
|
||||
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import Expandable from '$lib/components/ui/Expandable.svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import { getClient } from '$lib/lemmy.svelte.js'
|
||||
import type { InboxItem } from '$lib/lemmy/inbox.js'
|
||||
import { Button } from 'mono-svelte'
|
||||
import { Eye, EyeSlash, Icon } from 'svelte-hero-icons'
|
||||
|
||||
interface Props {
|
||||
item: InboxItem
|
||||
@@ -35,7 +20,6 @@
|
||||
let { item = $bindable() }: Props = $props()
|
||||
|
||||
let replying = $state(false)
|
||||
let reply = ''
|
||||
let loading = $state(false)
|
||||
|
||||
async function markAsRead(isRead: boolean) {
|
||||
@@ -90,19 +74,16 @@
|
||||
<div class="text-sm font-normal">
|
||||
{#if item.type == 'comment_reply'}
|
||||
{@html $t('routes.inbox.item.reply', {
|
||||
// @ts-ignore
|
||||
user: `<span class="font-medium">${item.creator.name}</span>`,
|
||||
post: `<span class="font-medium">${item.item.post.name}</span>`,
|
||||
})}
|
||||
{:else if item.type == 'person_mention'}
|
||||
{@html $t('routes.inbox.item.mention', {
|
||||
// @ts-ignore
|
||||
user: `<span class="font-medium">${item.creator.name}</span>`,
|
||||
post: `<span class="font-medium">${item.item.post.name}</span>`,
|
||||
})}
|
||||
{:else if item.type == 'private_message'}
|
||||
{@html $t('routes.inbox.item.message', {
|
||||
// @ts-ignore
|
||||
user: `<span class="font-medium">${item.item.creator.name}</span>`,
|
||||
recipient: `<span class="font-medium">${item.item.recipient.name}</span>`,
|
||||
})}
|
||||
@@ -118,7 +99,7 @@
|
||||
color={item.read ? 'secondary' : 'primary'}
|
||||
{loading}
|
||||
disabled={loading}
|
||||
onclick={(e) => {
|
||||
onclick={e => {
|
||||
e.stopPropagation()
|
||||
markAsRead(!item.read)
|
||||
}}
|
||||
@@ -152,7 +133,7 @@
|
||||
color={item.read ? 'secondary' : 'primary'}
|
||||
{loading}
|
||||
disabled={loading}
|
||||
onclick={(e) => {
|
||||
onclick={e => {
|
||||
e.stopPropagation()
|
||||
markAsRead(!item.read)
|
||||
}}
|
||||
@@ -192,15 +173,3 @@
|
||||
{/if}
|
||||
{/snippet}
|
||||
</Expandable>
|
||||
|
||||
<style>
|
||||
.meta {
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr auto;
|
||||
grid-template-rows: auto 1fr;
|
||||
column-gap: 0.5rem;
|
||||
grid-template-areas:
|
||||
'a b actions'
|
||||
'a title actions';
|
||||
}
|
||||
</style>
|
||||
@@ -4,11 +4,7 @@
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { publishedToDate } from '$lib/components/util/date.js'
|
||||
import { t } from '$lib/i18n/translations.js'
|
||||
import type {
|
||||
Person,
|
||||
PrivateMessageResponse,
|
||||
PrivateMessageView,
|
||||
} from 'lemmy-js-client'
|
||||
import type { Person, PrivateMessageView } from 'lemmy-js-client'
|
||||
import { Spinner } from 'mono-svelte'
|
||||
import { backOut } from 'svelte/easing'
|
||||
import { fly } from 'svelte/transition'
|
||||
@@ -23,7 +19,7 @@
|
||||
|
||||
function filterDuplicates<T, K>(array: T[], predicate: (item: T) => K): T[] {
|
||||
const seen = new Set()
|
||||
return array.filter((element) => {
|
||||
return array.filter(element => {
|
||||
const value = predicate(element)
|
||||
if (seen.has(value)) {
|
||||
return false
|
||||
@@ -37,9 +33,9 @@
|
||||
function conversationPreviews(
|
||||
conversations: PrivateMessageView[],
|
||||
): ConversationPreview[] {
|
||||
const deduplicated = filterDuplicates(conversations, (i) => i.creator.id)
|
||||
const deduplicated = filterDuplicates(conversations, i => i.creator.id)
|
||||
|
||||
return deduplicated.map((i) => ({
|
||||
return deduplicated.map(i => ({
|
||||
user: i.creator,
|
||||
message: {
|
||||
date: publishedToDate(i.private_message.published),
|
||||
@@ -61,13 +57,13 @@
|
||||
{:then data}
|
||||
{@const conversations = data.private_messages}
|
||||
{@const previews = conversationPreviews(conversations).filter(
|
||||
(c) => c.user.id != profile.data?.user?.local_user_view.person.id,
|
||||
c => c.user.id != profile.data?.user?.local_user_view.person.id,
|
||||
)}
|
||||
|
||||
<ul
|
||||
class="flex flex-col divide-y divide-slate-200 dark:divide-zinc-800 w-full mt-6"
|
||||
>
|
||||
{#each previews as preview, index}
|
||||
{#each previews as preview, index (preview)}
|
||||
<a
|
||||
href="/inbox/messages/{preview.user.id}"
|
||||
class="flex flex-row gap-2 py-3 -mx-4 px-4 sm:-mx-6 sm:px-6 w-full min-w-0
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { awaitIfServer } from '$lib/promise.svelte.js'
|
||||
|
||||
export async function load({ fetch, url }) {
|
||||
const page = Number(url.searchParams.get('page')) || 1
|
||||
|
||||
export async function load({ fetch }) {
|
||||
// TODO probably add proper paging
|
||||
const messagePromise = client({ func: fetch }).getPrivateMessages({
|
||||
limit: 50,
|
||||
})
|
||||
|
||||
@@ -1,28 +1,21 @@
|
||||
<script lang="ts">
|
||||
import { run, preventDefault } from 'svelte/legacy'
|
||||
|
||||
import { Button, Material, Spinner, TextInput, toast } from 'mono-svelte'
|
||||
import Message from './Message.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import { Icon, PaperAirplane } from 'svelte-hero-icons'
|
||||
import { browser } from '$app/environment'
|
||||
import { report } from '$lib/components/lemmy/moderation/moderation'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import Header from '$lib/components/ui/layout/pages/Header.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
import { backOut, expoOut } from 'svelte/easing'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import { client } from '$lib/lemmy.svelte'
|
||||
import { errorMessage } from '$lib/lemmy/error'
|
||||
import type { PrivateMessageResponse } from 'lemmy-js-client'
|
||||
import { Button, Material, TextInput, toast } from 'mono-svelte'
|
||||
import { tick } from 'svelte'
|
||||
import { Icon, PaperAirplane } from 'svelte-hero-icons'
|
||||
import { flip } from 'svelte/animate'
|
||||
import { browser } from '$app/environment'
|
||||
import { onMount, tick } from 'svelte'
|
||||
import { report } from '$lib/components/lemmy/moderation/moderation'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import Placeholder from 'mono-svelte/placeholder/Placeholder.svelte'
|
||||
import { backOut, expoOut } from 'svelte/easing'
|
||||
import { fly } from 'svelte/transition'
|
||||
import Message from './Message.svelte'
|
||||
|
||||
let { data: pageData } = $props()
|
||||
let data = $state(pageData)
|
||||
$effect(() => {
|
||||
data = pageData
|
||||
})
|
||||
let { data } = $props()
|
||||
|
||||
let textbox = $state({
|
||||
message: '',
|
||||
@@ -41,7 +34,7 @@
|
||||
try {
|
||||
const res = await client().createPrivateMessage({
|
||||
content: message,
|
||||
recipient_id: data.creator.person_view.person.id,
|
||||
recipient_id: data.creator.value.person_view.person.id,
|
||||
})
|
||||
|
||||
textbox.loading = false
|
||||
@@ -49,7 +42,7 @@
|
||||
return res
|
||||
} catch (err) {
|
||||
toast({
|
||||
content: errorMessage(err as any),
|
||||
content: errorMessage(err as string),
|
||||
type: 'error',
|
||||
})
|
||||
}
|
||||
@@ -58,7 +51,7 @@
|
||||
}
|
||||
|
||||
$effect(() => {
|
||||
if (browser && data.message && chatWindow) {
|
||||
if (browser && data.message.value && chatWindow) {
|
||||
tick().then(() =>
|
||||
chatWindow?.scrollTo({
|
||||
top: chatWindow.scrollHeight,
|
||||
@@ -69,15 +62,15 @@
|
||||
})
|
||||
|
||||
async function deleteMessage(id: number) {
|
||||
const res = await client().deletePrivateMessage({
|
||||
await client().deletePrivateMessage({
|
||||
deleted: true,
|
||||
private_message_id: id,
|
||||
})
|
||||
|
||||
data.message = {
|
||||
private_messages: data.message.private_messages.toSpliced(
|
||||
data.message.private_messages.findLastIndex(
|
||||
(i) => i.private_message.id == id,
|
||||
data.message.value = {
|
||||
private_messages: data.message.value.private_messages.toSpliced(
|
||||
data.message.value.private_messages.findLastIndex(
|
||||
i => i.private_message.id == id,
|
||||
),
|
||||
1,
|
||||
),
|
||||
@@ -88,7 +81,7 @@
|
||||
<Header pageHeader>
|
||||
{$t('filter.inbox.messages')}
|
||||
{#snippet extended()}
|
||||
<UserLink avatar user={data.creator.person_view.person} />
|
||||
<UserLink avatar user={data.creator.value.person_view.person} />
|
||||
{/snippet}
|
||||
</Header>
|
||||
<Material
|
||||
@@ -103,23 +96,22 @@
|
||||
<div class="mt-auto"></div>
|
||||
<p class="mx-auto mt-auto text-slate-400 dark:text-zinc-600">
|
||||
{$t('routes.inbox.messages.conversation', {
|
||||
// @ts-ignore
|
||||
user:
|
||||
data.creator.person_view.person.name +
|
||||
data.creator.value.person_view.person.name +
|
||||
'@' +
|
||||
new URL(data.creator.person_view.person.actor_id).hostname,
|
||||
new URL(data.creator.value.person_view.person.actor_id).hostname,
|
||||
})}
|
||||
</p>
|
||||
{#each data.message.private_messages.toReversed() as private_message, index (private_message.private_message.id)}
|
||||
{#each data.message.value.private_messages.toReversed() as private_message, index (private_message.private_message.id)}
|
||||
<div
|
||||
class={private_message.creator.id ==
|
||||
data.creator.person_view.person.id
|
||||
data.creator.value.person_view.person.id
|
||||
? 'self-start'
|
||||
: 'self-end'}
|
||||
in:fly|global={{
|
||||
duration: 700,
|
||||
easing: backOut,
|
||||
delay: data.message.private_messages.length * 50 - index * 50,
|
||||
delay: data.message.value.private_messages.length * 50 - index * 50,
|
||||
y: -12,
|
||||
}}
|
||||
animate:flip={{ duration: 500, easing: expoOut }}
|
||||
@@ -129,27 +121,27 @@
|
||||
onreport={() => report(private_message)}
|
||||
message={private_message}
|
||||
primary={private_message.creator.id !=
|
||||
data.creator.person_view.person.id}
|
||||
data.creator.value.person_view.person.id}
|
||||
/>
|
||||
</div>
|
||||
{/each}
|
||||
</ul>
|
||||
</div>
|
||||
</Material>
|
||||
{#await data.message then message}
|
||||
{#await data.message.value then message}
|
||||
<div class="sticky bottom-4 p-4">
|
||||
<form
|
||||
class="flex flex-row h-14 items-center w-full
|
||||
border-slate-200 dark:border-zinc-800
|
||||
p-2 gap-2 backdrop-blur-xl
|
||||
bg-white/50 dark:bg-zinc-950/50 border rounded-2xl"
|
||||
onsubmit={async (e) => {
|
||||
onsubmit={async e => {
|
||||
e.preventDefault()
|
||||
|
||||
const res = await sendMessage(textbox.message)
|
||||
if (!res) return
|
||||
|
||||
data.message = {
|
||||
data.message.value = {
|
||||
private_messages: [
|
||||
res.private_message_view,
|
||||
...message.private_messages,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { client } from '$lib/lemmy.svelte.js'
|
||||
import { awaitIfServer } from '$lib/promise.svelte.js'
|
||||
import { ReactiveState } from '$lib/promise.svelte.js'
|
||||
|
||||
export async function load({ fetch, params }) {
|
||||
const creator = Number(params.user_id)
|
||||
@@ -18,7 +18,7 @@ export async function load({ fetch, params }) {
|
||||
const [message, user] = await Promise.all([messagePromise, userPromise])
|
||||
|
||||
return {
|
||||
message: message,
|
||||
creator: user,
|
||||
message: new ReactiveState(message),
|
||||
creator: new ReactiveState(user),
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import { t } from '$lib/i18n/translations'
|
||||
import type { PrivateMessageView } from 'lemmy-js-client'
|
||||
import { Button, Menu, MenuButton, MenuDivider, Popover } from 'mono-svelte'
|
||||
import { Button, Menu, MenuButton, MenuDivider } from 'mono-svelte'
|
||||
import { EllipsisVertical, Flag, Icon, Trash } from 'svelte-hero-icons'
|
||||
|
||||
interface Props {
|
||||
|
||||
Reference in new issue
Block a user