feat: switch to new account system

This commit is contained in:
Xyphyn committed 2023-08-01 13:00:06 -07:00
1 parent 54ab6fdc82
commit 2da415b670
38 files changed
+222 -362

No files matched your search

+4 -3
View File
@@ -1,4 +1,5 @@
import { authData, getClient } from '$lib/lemmy.js'
import { profile } from '$lib/auth.js'
import { getClient } from '$lib/lemmy.js'
import { getItemPublished } from '$lib/lemmy/item.js'
import { get } from 'svelte/store'
@@ -12,11 +13,11 @@ export async function load({ url }) {
const filter: ReportFilter =
(url.searchParams.get('filter') as ReportFilter) || 'all'
const jwt = get(authData)?.token
const jwt = get(profile)?.jwt
if (!jwt) return { type: type, page: page }
// can they like
// can they please
// make a sane, consistent, and simple API for once
// 3 separate requests? really?
// and this time instead of get() it's list(). Why?!
+7 -7
View File
@@ -3,7 +3,7 @@
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
import Post from '$lib/components/lemmy/post/Post.svelte'
import { ToastType, toast } from '$lib/components/ui/toasts/toasts.js'
import { authData, getClient, user } from '$lib/lemmy.js'
import { getClient } from '$lib/lemmy.js'
import { isCommentReport, isPostReport } from '$lib/lemmy/item.js'
import type {
CommentReportView,
@@ -11,7 +11,7 @@
PrivateMessageReportView,
} from 'lemmy-js-client'
import { Check, Icon } from 'svelte-hero-icons'
import { get } from 'svelte/store'
import { profile } from '$lib/auth.js'
export let item: PostReportView | CommentReportView | PrivateMessageReportView
@@ -23,13 +23,13 @@
let resolving = false
async function resolve() {
if (!$authData || !$user) return
if (!$profile?.jwt || !$profile.user) return
resolving = true
try {
if (isCommentReport(item)) {
await getClient().resolveCommentReport({
auth: $authData.token,
auth: $profile.jwt,
report_id: item.comment_report.id,
resolved: !resolved,
})
@@ -42,7 +42,7 @@
})
} else if (isPostReport(item)) {
await getClient().resolvePostReport({
auth: $authData.token,
auth: $profile.jwt,
report_id: item.post_report.id,
resolved: !resolved,
})
@@ -55,10 +55,10 @@
}
const reports = await getClient().getReportCount({
auth: get(authData)!.token,
auth: $profile?.jwt,
})
$user.reports =
$profile.user.reports =
reports.comment_reports +
reports.post_reports +
(reports.private_message_reports ?? 0)