feat: add v0.19.0 support

This commit is contained in:
Xyphyn committed 2023-09-28 17:09:09 -07:00
1 parent b3b8a10e44
commit 119ab53946
62 files changed
+188 -157

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
# Todo
- [ ] Add blocking instances and stuff
+1 -1
View File
@@ -21,7 +21,7 @@
"@vite-pwa/sveltekit": "^0.2.5", "@vite-pwa/sveltekit": "^0.2.5",
"autoprefixer": "^10.4.16", "autoprefixer": "^10.4.16",
"jsdom": "^22.1.0", "jsdom": "^22.1.0",
"lemmy-js-client": "^0.18.1", "lemmy-js-client": "^0.19.0-rc.13",
"markdown-it-container": "^3.0.0", "markdown-it-container": "^3.0.0",
"markdown-it-sub": "^1.0.0", "markdown-it-sub": "^1.0.0",
"markdown-it-sup": "^1.0.0", "markdown-it-sup": "^1.0.0",
+3 -1
View File
@@ -1,7 +1,9 @@
function buildUrl(inputUrl: URL): URL { function buildUrl(inputUrl: URL): URL {
let withoutCors = inputUrl.pathname.replace('/cors/', '') let withoutCors = inputUrl.pathname.replace('/cors/', '')
if (!withoutCors.startsWith('https://')) { if (
!(withoutCors.startsWith('https://') || withoutCors.startsWith('http://'))
) {
withoutCors = 'https://' + withoutCors withoutCors = 'https://' + withoutCors
} }
+35 -18
View File
@@ -1,15 +1,16 @@
import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js' import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js'
import { toast } from 'mono-svelte' import { toast } from 'mono-svelte'
import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js'
import { getClient, site } from '$lib/lemmy.js' import { client, getClient, site } from '$lib/lemmy.js'
import { userSettings } from '$lib/settings.js' import { userSettings } from '$lib/settings.js'
import { moveItem } from '$lib/util.js' import { instanceToURL, moveItem } from '$lib/util.js'
import { import {
LemmyHttp, LemmyHttp,
type GetSiteResponse, type GetSiteResponse,
type MyUserInfo, type MyUserInfo,
} from 'lemmy-js-client' } from 'lemmy-js-client'
import { get, writable } from 'svelte/store' import { get, writable } from 'svelte/store'
import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js'
const getDefaultProfile = (): Profile => ({ const getDefaultProfile = (): Profile => ({
id: -1, id: -1,
@@ -87,13 +88,21 @@ profile.subscribe(async (p) => {
instance.set(p.instance) instance.set(p.instance)
// fetch the user because p.user is undefined // fetch the user because p.user is undefined
const user = await userFromJwt(p.jwt, p.instance) const user = await userFromJwt(p.jwt, p.instance)
.then((user) => {
if (!user?.user)
toast({
content: 'Your login has expired. Re-login to fix this issue.',
type: 'warning',
})
site.set(user?.site)
if (!user?.user) return user
toast({
content: 'Your login has expired. Re-login to fix this issue.',
type: 'warning',
}) })
site.set(user?.site) .catch((err) => {
toast({ content: err as any, type: 'error' })
})
if (!user?.user) return
profile.update(() => ({ profile.update(() => ({
...p, ...p,
@@ -105,13 +114,17 @@ profile.subscribe(async (p) => {
export async function setUser(jwt: string, inst: string, username: string) { export async function setUser(jwt: string, inst: string, username: string) {
try { try {
new URL(`https://${inst}`) new URL(instanceToURL(inst))
} catch (err) { } catch (err) {
return return
} }
const user = await userFromJwt(jwt, inst) const user = await userFromJwt(jwt, inst)
if (!user) { .then((u) => u)
.catch((err) => {
toast({ content: err as any, type: 'error' })
})
if (!user?.user) {
toast({ toast({
content: 'Failed to fetch your user. Is your instance down?', content: 'Failed to fetch your user. Is your instance down?',
type: 'error', type: 'error',
@@ -152,9 +165,7 @@ async function userFromJwt(
jwt: string, jwt: string,
instance: string instance: string
): Promise<{ user: PersonData; site: GetSiteResponse } | undefined> { ): Promise<{ user: PersonData; site: GetSiteResponse } | undefined> {
const sitePromise = getClient(instance).getSite({ const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite()
auth: jwt,
})
let timer = setTimeout( let timer = setTimeout(
() => () =>
@@ -170,6 +181,12 @@ async function userFromJwt(
return r return r
}) })
if (!versionIsSupported(site.version, MINIMUM_VERSION)) {
throw new Error(
`This version of Photon only supports Lemmy instances with version ${MINIMUM_VERSION} or higher. This Lemmy instance is running: ${site.version}`
)
}
const myUser = site.my_user const myUser = site.my_user
if (!myUser) return undefined if (!myUser) return undefined
@@ -250,6 +267,10 @@ export async function setUserID(id: number) {
if (prof?.jwt) { if (prof?.jwt) {
const user = await userFromJwt(prof.jwt, prof.instance) const user = await userFromJwt(prof.jwt, prof.instance)
.then((u) => u)
.catch((err) => {
toast({ content: err as any, type: 'error' })
})
instance.set(prof.instance) instance.set(prof.instance)
prof.user = user?.user prof.user = user?.user
prof.avatar = user?.user.local_user_view.person.avatar prof.avatar = user?.user.local_user_view.person.avatar
@@ -276,16 +297,12 @@ export function moveProfile(id: number, up: boolean) {
} }
const getNotificationCount = async (jwt: string, mod: boolean) => { const getNotificationCount = async (jwt: string, mod: boolean) => {
const unreads = await getClient().getUnreadCount({ const unreads = await getClient().getUnreadCount()
auth: jwt,
})
let reports: number = 0 let reports: number = 0
if (mod) { if (mod) {
const reportRes = await getClient().getReportCount({ const reportRes = await getClient().getReportCount({})
auth: jwt,
})
reports = reports =
reportRes.comment_reports + reportRes.comment_reports +
@@ -22,7 +22,6 @@
search={async (q) => { search={async (q) => {
const results = await getClient().search({ const results = await getClient().search({
q: q || ' ', q: q || ' ',
auth: jwt,
type_: 'Communities', type_: 'Communities',
limit: 20, limit: 20,
listing_type: listing_type, listing_type: listing_type,
@@ -41,7 +41,6 @@
try { try {
await getClient().editComment({ await getClient().editComment({
auth: $profile.jwt,
comment_id: node.comment_view.comment.id, comment_id: node.comment_view.comment.id,
content: newComment, content: newComment,
}) })
@@ -31,7 +31,6 @@
try { try {
const response = await getClient().createComment({ const response = await getClient().createComment({
auth: $profile.jwt,
content: value, content: value,
post_id: postId, post_id: postId,
parent_id: parentId, parent_id: parentId,
@@ -35,7 +35,6 @@
await getClient() await getClient()
.likeComment({ .likeComment({
score: upvoted ? 0 : 1, score: upvoted ? 0 : 1,
auth: $profile.jwt,
comment_id: commentId, comment_id: commentId,
}) })
.catch((_) => undefined) .catch((_) => undefined)
@@ -59,7 +58,6 @@
await getClient() await getClient()
.likeComment({ .likeComment({
score: upvoted ? 0 : -1, score: upvoted ? 0 : -1,
auth: $profile.jwt,
comment_id: commentId, comment_id: commentId,
}) })
.catch((_) => undefined) .catch((_) => undefined)
@@ -43,7 +43,6 @@
parent.loading = true parent.loading = true
const newComments = await getClient($page.params.instance).getComments({ const newComments = await getClient($page.params.instance).getComments({
auth: $profile?.jwt,
max_depth: 5, max_depth: 5,
parent_id: parent.comment_view.comment.id, parent_id: parent.comment_view.comment.id,
type_: 'All', type_: 'All',
@@ -41,7 +41,6 @@
try { try {
await getClient().followCommunity({ await getClient().followCommunity({
auth: $profile.jwt,
community_id: community_view.community.id, community_id: community_view.community.id,
follow: !subscribed, follow: !subscribed,
}) })
@@ -61,7 +60,6 @@
try { try {
await getClient().blockCommunity({ await getClient().blockCommunity({
auth: $profile.jwt,
community_id: community_view.community.id, community_id: community_view.community.id,
block: !blocked, block: !blocked,
}) })
@@ -49,7 +49,6 @@
const res = edit const res = edit
? await getClient().editCommunity({ ? await getClient().editCommunity({
auth: $profile.jwt,
title: formData.displayName, title: formData.displayName,
description: formData.sidebar, description: formData.sidebar,
nsfw: formData.nsfw, nsfw: formData.nsfw,
@@ -59,7 +58,6 @@
community_id: edit, community_id: edit,
}) })
: await getClient().createCommunity({ : await getClient().createCommunity({
auth: $profile.jwt,
name: formData.name, name: formData.name,
title: formData.displayName, title: formData.displayName,
description: formData.sidebar, description: formData.sidebar,
@@ -20,7 +20,6 @@
try { try {
await getClient().createPrivateMessage({ await getClient().createPrivateMessage({
auth: $profile.jwt,
content: message, content: message,
recipient_id: user.id, recipient_id: user.id,
}) })
@@ -62,7 +62,6 @@
if (community) { if (community) {
await getClient().banFromCommunity({ await getClient().banFromCommunity({
auth: $profile.jwt,
ban: !banned, ban: !banned,
community_id: community.id, community_id: community.id,
person_id: item.id, person_id: item.id,
@@ -72,7 +71,6 @@
}) })
} else { } else {
await getClient().banPerson({ await getClient().banPerson({
auth: $profile.jwt,
ban: !banned, ban: !banned,
person_id: item.id, person_id: item.id,
reason: reason || undefined, reason: reason || undefined,
@@ -29,7 +29,6 @@
try { try {
await getClient().lockPost({ await getClient().lockPost({
auth: $profile.jwt,
locked: lock, locked: lock,
post_id: item.post.id, post_id: item.post.id,
}) })
@@ -60,7 +59,6 @@
try { try {
await getClient().featurePost({ await getClient().featurePost({
feature_type: toInstance ? 'Local' : 'Community', feature_type: toInstance ? 'Local' : 'Community',
auth: $profile.jwt,
featured: pinned, featured: pinned,
post_id: item.post.id, post_id: item.post.id,
}) })
@@ -57,13 +57,11 @@
if (purge) { if (purge) {
if (isCommentView(item)) { if (isCommentView(item)) {
await getClient(undefined, fetch).purgeComment({ await getClient(undefined, fetch).purgeComment({
auth: $profile.jwt,
comment_id: item.comment.id, comment_id: item.comment.id,
reason: reason, reason: reason,
}) })
} else { } else {
await getClient(undefined, fetch).purgePost({ await getClient(undefined, fetch).purgePost({
auth: $profile.jwt,
post_id: item.post.id, post_id: item.post.id,
reason: reason, reason: reason,
}) })
@@ -91,7 +89,6 @@
if (privateMessage) { if (privateMessage) {
await getClient() await getClient()
.createPrivateMessage({ .createPrivateMessage({
auth: $profile.jwt,
content: replyReason, content: replyReason,
recipient_id: isCommentView(item) recipient_id: isCommentView(item)
? item.comment.creator_id ? item.comment.creator_id
@@ -106,7 +103,6 @@
} else { } else {
await getClient() await getClient()
.createComment({ .createComment({
auth: $profile.jwt,
content: replyReason, content: replyReason,
post_id: item.post.id, post_id: item.post.id,
parent_id: isCommentView(item) ? item.comment.id : undefined, parent_id: isCommentView(item) ? item.comment.id : undefined,
@@ -122,7 +118,6 @@
if (isCommentView(item)) { if (isCommentView(item)) {
await getClient().removeComment({ await getClient().removeComment({
auth: $profile.jwt,
comment_id: item.comment.id, comment_id: item.comment.id,
removed: !removed, removed: !removed,
reason: reason || undefined, reason: reason || undefined,
@@ -130,7 +125,6 @@
item.comment.removed = !removed item.comment.removed = !removed
} else if (isPostView(item)) { } else if (isPostView(item)) {
await getClient().removePost({ await getClient().removePost({
auth: $profile.jwt,
post_id: item.post.id, post_id: item.post.id,
removed: !removed, removed: !removed,
reason: reason || undefined, reason: reason || undefined,
@@ -27,13 +27,11 @@
try { try {
if (isComment(item)) { if (isComment(item)) {
await getClient().createCommentReport({ await getClient().createCommentReport({
auth: $profile.jwt,
comment_id: item.comment.id, comment_id: item.comment.id,
reason: reason, reason: reason,
}) })
} else if (isPost(item)) { } else if (isPost(item)) {
await getClient().createPostReport({ await getClient().createPostReport({
auth: $profile.jwt,
post_id: item.post.id, post_id: item.post.id,
reason: reason, reason: reason,
}) })
@@ -78,7 +78,7 @@ export const amMod = (me: MyUserInfo, community: Community) =>
export const amModOfAny = (me?: MyUserInfo) => export const amModOfAny = (me?: MyUserInfo) =>
me && (me.moderates.length > 0 || isAdmin(me)) me && (me.moderates.length > 0 || isAdmin(me))
export const isAdmin = (me: MyUserInfo) => me.local_user_view.person.admin export const isAdmin = (me: MyUserInfo) => me.local_user_view.local_user.admin
export const removalTemplate = ( export const removalTemplate = (
input: string, input: string,
@@ -63,7 +63,6 @@
communitySearch = passedCommunity.name communitySearch = passedCommunity.name
} else { } else {
const list = await getClient().listCommunities({ const list = await getClient().listCommunities({
auth: $profile?.jwt,
type_: 'All', type_: 'All',
sort: 'Active', sort: 'Active',
limit: 40, limit: 40,
@@ -107,7 +106,6 @@
} }
const post = await getClient().editPost({ const post = await getClient().editPost({
auth: $profile.jwt,
name: data.title, name: data.title,
body: data.body, body: data.body,
url: data.url || undefined, url: data.url || undefined,
@@ -121,10 +119,11 @@
dispatcher('submit', post.post_view) dispatcher('submit', post.post_view)
} else { } else {
let image = data.image ? await uploadImage(data.image[0], $profile.instance, $profile.jwt) : undefined let image = data.image
? await uploadImage(data.image[0], $profile.instance, $profile.jwt)
: undefined
data.url = image || data.url || undefined data.url = image || data.url || undefined
const post = await getClient().createPost({ const post = await getClient().createPost({
auth: $profile.jwt,
community_id: data.community!, community_id: data.community!,
name: data.title, name: data.title,
body: data.body, body: data.body,
+2 -5
View File
@@ -1,9 +1,6 @@
import { getInstance } from '$lib/lemmy.js' import { getInstance } from '$lib/lemmy.js'
import type { CommentView, PersonView, Post, PostView } from 'lemmy-js-client' import type { CommentView, PersonView, Post, PostView } from 'lemmy-js-client'
export const isMutable = (post: PostView, me: PersonView) =>
(me.person.admin && post.post.local) || me.person.id == post.creator.id
export const isCommentMutable = (comment: CommentView, me: PersonView) => export const isCommentMutable = (comment: CommentView, me: PersonView) =>
me.person.id == comment.creator.id me.person.id == comment.creator.id
@@ -13,8 +10,8 @@ export const bestImageURL = (
width: number = 1024 width: number = 1024
) => { ) => {
if (width > 1024) { if (width > 1024) {
if (post.url) return `${post.url}?format=webp` if (post.url) return `${post.url}?format=webp`
else if (post.thumbnail_url) return `${post.thumbnail_url}?format=webp` else if (post.thumbnail_url) return `${post.thumbnail_url}?format=webp`
} }
if (compact && post.thumbnail_url) if (compact && post.thumbnail_url)
+1 -1
View File
@@ -113,7 +113,7 @@
<Button <Button
href="/admin" href="/admin"
aria-label="Admin" aria-label="Admin"
class="max-md:w-9 max-md:h-8 max-md:!p-0 relative" class="max-md:w-9 max-md:h-8 max-md:!p-0 "
> >
<Icon src={CommandLine} mini size="16" slot="prefix" /> <Icon src={CommandLine} mini size="16" slot="prefix" />
<span class="hidden md:inline">Admin</span> <span class="hidden md:inline">Admin</span>
+31 -13
View File
@@ -2,6 +2,8 @@ import { type GetSiteResponse, LemmyHttp } from 'lemmy-js-client'
import { get, writable } from 'svelte/store' import { get, writable } from 'svelte/store'
import { error } from '@sveltejs/kit' import { error } from '@sveltejs/kit'
import { instance } from '$lib/instance.js' import { instance } from '$lib/instance.js'
import { instanceToURL } from '$lib/util.js'
import { profile } from '$lib/auth.js'
async function customFetch( async function customFetch(
func: ( func: (
@@ -16,33 +18,49 @@ async function customFetch(
return res return res
} }
export function client({
instanceURL,
func,
auth,
}: {
instanceURL?: string
func?: (
input: RequestInfo | URL,
init?: RequestInit | undefined
) => Promise<Response>
auth?: string
}) {
if (!instanceURL) instanceURL = get(instance)
let jwt = auth ? auth : get(profile)?.jwt
let headers = jwt ? { Authorization: `Bearer ${jwt}` } : { Authorization: '' }
return new LemmyHttp(instanceToURL(instanceURL), {
fetchFunction: func,
headers: headers,
})
}
export function getClient( export function getClient(
instanceURL?: string, instanceURL?: string,
func?: ( func?: (
input: RequestInfo | URL, input: RequestInfo | URL,
init?: RequestInit | undefined init?: RequestInit | undefined
) => Promise<Response> ) => Promise<Response>,
auth?: string
): LemmyHttp { ): LemmyHttp {
if (!instanceURL) { return client({ instanceURL, func, auth })
instanceURL = get(instance)
}
return new LemmyHttp(`https://${instanceURL}`, {
fetchFunction: func
? (input, init) => customFetch(func, input, init)
: undefined,
})
} }
export const getInstance = () => get(instance) export const getInstance = () => encodeURIComponent(get(instance))
export const site = writable<GetSiteResponse | undefined>(undefined) export const site = writable<GetSiteResponse | undefined>(undefined)
export async function validateInstance(instance: string): Promise<boolean> { export async function validateInstance(instance: string): Promise<boolean> {
if (instance == '') return false if (instance == '') return false
try { try {
await getClient(instance).getSite({}) await getClient(instance).getSite()
return true return true
} catch (err) { } catch (err) {
-7
View File
@@ -70,7 +70,6 @@ export async function save(
if (item.type == 'post') { if (item.type == 'post') {
return ( return (
await getClient().savePost({ await getClient().savePost({
auth: jwt,
post_id: item.id, post_id: item.id,
save: save, save: save,
}) })
@@ -78,7 +77,6 @@ export async function save(
} else if (item.type == 'comment') { } else if (item.type == 'comment') {
return ( return (
await getClient().saveComment({ await getClient().saveComment({
auth: jwt,
comment_id: item.id, comment_id: item.id,
save: save, save: save,
}) })
@@ -97,7 +95,6 @@ export async function deleteItem(
if (item.type == 'post') { if (item.type == 'post') {
return ( return (
await getClient().deletePost({ await getClient().deletePost({
auth: jwt,
post_id: item.id, post_id: item.id,
deleted: deleted, deleted: deleted,
}) })
@@ -105,7 +102,6 @@ export async function deleteItem(
} else if (item.type == 'comment') { } else if (item.type == 'comment') {
return ( return (
await getClient().deleteComment({ await getClient().deleteComment({
auth: jwt,
comment_id: item.id, comment_id: item.id,
deleted: deleted, deleted: deleted,
}) })
@@ -124,7 +120,6 @@ export async function vote(
if (item.type == 'post') { if (item.type == 'post') {
return ( return (
await getClient().likePost({ await getClient().likePost({
auth: jwt,
post_id: item.id, post_id: item.id,
score: vote, score: vote,
}) })
@@ -132,7 +127,6 @@ export async function vote(
} else if (item.type == 'comment') { } else if (item.type == 'comment') {
return ( return (
await getClient().likeComment({ await getClient().likeComment({
auth: jwt,
comment_id: item.id, comment_id: item.id,
score: vote, score: vote,
}) })
@@ -151,7 +145,6 @@ export async function markAsRead(
if (item.type == 'post') { if (item.type == 'post') {
return ( return (
await getClient().markPostAsRead({ await getClient().markPostAsRead({
auth: jwt,
post_id: item.id, post_id: item.id,
read: read, read: read,
}) })
-3
View File
@@ -10,7 +10,6 @@ export const blockUser = async (block: boolean, id: number) => {
if (!auth) throw new Error('Unauthorized') if (!auth) throw new Error('Unauthorized')
const response = await getClient().blockPerson({ const response = await getClient().blockPerson({
auth: auth,
block: block, block: block,
person_id: id, person_id: id,
}) })
@@ -53,14 +52,12 @@ export const addSubscription = (
export const addAdmin = async (handle: string, added: boolean, jwt: string) => export const addAdmin = async (handle: string, added: boolean, jwt: string) =>
trycatch(async () => { trycatch(async () => {
const user = await getClient().resolveObject({ const user = await getClient().resolveObject({
auth: jwt,
q: handle, q: handle,
}) })
if (!user.person) throw new Error('No user found') if (!user.person) throw new Error('No user found')
return await getClient().addAdmin({ return await getClient().addAdmin({
auth: jwt,
added: true, added: true,
person_id: user.person.person.id, person_id: user.person.person.id,
}) })
+9 -2
View File
@@ -101,8 +101,10 @@ export const removeItem = <T>(array: T[], predicate: (item: T) => boolean) => {
array.splice(array.findIndex(predicate), 1) array.splice(array.findIndex(predicate), 1)
} }
export const DOMAIN_REGEX = /^((?!-)[A-Za-z0-9-]{1,63}\.)+[A-Za-z]{2,63}/gi export const DOMAIN_REGEX =
export const DOMAIN_REGEX_FORMS = '^((?!-)[A-Za-z0-9-]{1,63}.)+[A-Za-z]{2,63}' /^(http(s)?:\/\/)?((?!-)[A-Za-z0-9-]{1,63}\.)+[A-Za-z]{2,63}(:[0-9]{0,5})$/g
export const DOMAIN_REGEX_FORMS =
'(http(s)?://)?((?!-)[A-Za-z0-9-]{1,63}.)+[A-Za-z]{2,63}(:[0-9]{0,5})?'
export const isSubscribed = (subscribed: SubscribedType) => export const isSubscribed = (subscribed: SubscribedType) =>
subscribed == 'Pending' || subscribed == 'Subscribed' subscribed == 'Pending' || subscribed == 'Subscribed'
@@ -166,3 +168,8 @@ export async function uploadImage(
}: ${response.status}: ${response.statusText}` }: ${response.status}: ${response.statusText}`
) )
} }
export const instanceToURL = (input: string) =>
input.startsWith('http://') || input.startsWith('https://')
? input
: `https://${input}`
+31
View File
@@ -0,0 +1,31 @@
export const MINIMUM_VERSION = '0.19.0'
export const MAXIMUM_VERSION = '0.999'
export const versionIsSupported = (v: string, minimum: string) => {
const regex = /^(\d+\.)?(\d+\.)?(\*|\d+)*/i
const cur = v.match(regex)
const min = minimum.match(regex)
if (!cur || !min) return false
const [minMajor, minMinor, minPatch] = min.slice(1, 4).map((i) => Number(i))
const [curMajor, curMinor, curPatch] = cur.slice(1, 4).map((i) => Number(i))
if (curMajor < minMajor) {
return false
} else if (curMajor > minMajor) {
return true
}
if (curMinor < minMinor) {
return false
} else if (curMinor > minMinor) {
return true
}
if (curPatch < minPatch) {
return false
}
return true
}
-1
View File
@@ -25,7 +25,6 @@ export async function load({ url, fetch }) {
page: page, page: page,
sort: sort, sort: sort,
type_: listingType, type_: listingType,
auth: get(profile)?.jwt,
}), }),
} }
} catch (err) { } catch (err) {
+1 -3
View File
@@ -8,9 +8,7 @@ export async function load({ fetch }) {
let site = get(siteStore) let site = get(siteStore)
if (!site) { if (!site) {
const res = await getClient(undefined, fetch).getSite({ const res = await getClient(undefined, fetch).getSite()
auth: jwt,
})
site = res site = res
} }
-1
View File
@@ -12,7 +12,6 @@ export async function load({ data, fetch, url }) {
const unreadOnly = (url.searchParams.get('unreadOnly') || 'true') == 'true' const unreadOnly = (url.searchParams.get('unreadOnly') || 'true') == 'true'
const res = await getClient(undefined, fetch).listRegistrationApplications({ const res = await getClient(undefined, fetch).listRegistrationApplications({
auth: jwt,
page: page, page: page,
limit: 40, limit: 40,
unread_only: unreadOnly, unread_only: unreadOnly,
@@ -25,7 +25,6 @@
try { try {
await getClient().approveRegistrationApplication({ await getClient().approveRegistrationApplication({
approve: approve, approve: approve,
auth: $profile.jwt,
id: application.registration_application.id, id: application.registration_application.id,
}) })
toast({ toast({
-1
View File
@@ -24,7 +24,6 @@
try { try {
await getClient().editSite({ await getClient().editSite({
auth: jwt,
...formData, ...formData,
}) })
toast({ toast({
-2
View File
@@ -66,7 +66,6 @@
if (!blocked) allowedInstances.push(instance) if (!blocked) allowedInstances.push(instance)
await getClient().editSite({ await getClient().editSite({
auth: $profile.jwt,
blocked_instances: blockedInstances, blocked_instances: blockedInstances,
allowed_instances: allowedInstances, allowed_instances: allowedInstances,
}) })
@@ -102,7 +101,6 @@
) )
return await getClient().editSite({ return await getClient().editSite({
auth: $profile.jwt,
allowed_instances: allowedInstances, allowed_instances: allowedInstances,
blocked_instances: blockedInstances, blocked_instances: blockedInstances,
}) })
+1 -3
View File
@@ -3,9 +3,7 @@ import { getClient } from '$lib/lemmy.js'
import { get } from 'svelte/store' import { get } from 'svelte/store'
export async function load({ fetch, parent }) { export async function load({ fetch, parent }) {
const instances = await getClient(undefined, fetch).getFederatedInstances({ const instances = await getClient(undefined, fetch).getFederatedInstances()
auth: get(profile)?.jwt,
})
return { return {
federated_instances: instances, federated_instances: instances,
-1
View File
@@ -24,7 +24,6 @@
try { try {
await getClient().editSite({ await getClient().editSite({
auth: $profile.jwt,
taglines: taglines, taglines: taglines,
}) })
toast({ toast({
-1
View File
@@ -28,7 +28,6 @@
const result = await trycatch(() => const result = await trycatch(() =>
getClient().addAdmin({ getClient().addAdmin({
added: false, added: false,
auth: $profile!.jwt!,
person_id: id, person_id: id,
}) })
) )
-2
View File
@@ -19,11 +19,9 @@ export async function load(req: any) {
community_name: req.params.name, community_name: req.params.name,
page: page, page: page,
sort: sort, sort: sort,
auth: get(profile)?.jwt,
}), }),
community: getClient(undefined, req.fetch).getCommunity({ community: getClient(undefined, req.fetch).getCommunity({
name: req.params.name, name: req.params.name,
auth: get(profile)?.jwt,
}), }),
} }
} }
@@ -24,13 +24,11 @@
try { try {
const res = await getClient().resolveObject({ const res = await getClient().resolveObject({
auth: $profile.jwt,
q: formData.newModerator, q: formData.newModerator,
}) })
if (res.person) { if (res.person) {
const addModRes = await getClient().addModToCommunity({ const addModRes = await getClient().addModToCommunity({
auth: $profile.jwt,
added: true, added: true,
person_id: res.person.person.id, person_id: res.person.person.id,
community_id: data.community.community_view.community.id, community_id: data.community.community_view.community.id,
@@ -66,7 +64,6 @@
try { try {
const res = await getClient().addModToCommunity({ const res = await getClient().addModToCommunity({
added: false, added: false,
auth: $profile.jwt,
community_id: data.community.community_view.community.id, community_id: data.community.community_view.community.id,
person_id: id, person_id: id,
}) })
@@ -6,7 +6,6 @@ import { get } from 'svelte/store'
export async function load({ params, fetch }) { export async function load({ params, fetch }) {
const comment = await getClient(undefined, fetch).getComment({ const comment = await getClient(undefined, fetch).getComment({
id: Number(params.id), id: Number(params.id),
auth: get(profile)?.jwt,
}) })
throw redirect( throw redirect(
-2
View File
@@ -21,7 +21,6 @@ export async function load({ url, fetch }) {
type_: 'Communities', type_: 'Communities',
listing_type: type, listing_type: type,
q: query, q: query,
auth: get(profile)?.jwt,
})), })),
type: type, type: type,
sort: sort, sort: sort,
@@ -35,7 +34,6 @@ export async function load({ url, fetch }) {
page: page, page: page,
sort: sort, sort: sort,
type_: type, type_: type,
auth: get(profile)?.jwt,
})), })),
type: type, type: type,
sort: sort, sort: sort,
-1
View File
@@ -19,7 +19,6 @@
try { try {
const res = await getClient().followCommunity({ const res = await getClient().followCommunity({
auth: $profile.jwt,
community_id: id, community_id: id,
follow: subscribed == 'NotSubscribed', follow: subscribed == 'NotSubscribed',
}) })
+5 -3
View File
@@ -1,3 +1,5 @@
export const load = ({ url }) => ({ import { getClient } from '$lib/lemmy.js'
crosspost: Boolean(url.searchParams.get('crosspost')) ?? false,
}) export const load = ({ url }) => {
return { crosspost: Boolean(url.searchParams.get('crosspost')) ?? false }
}
+1 -3
View File
@@ -30,9 +30,7 @@
markingAsRead = true markingAsRead = true
const response = await getClient().markAllAsRead({ const response = await getClient().markAllAsRead()
auth: $profile.jwt!,
})
$profile.user.unreads = 0 $profile.user.unreads = 0
-1
View File
@@ -23,7 +23,6 @@ export async function load({ url, fetch }) {
const params = { const params = {
limit: 20, limit: 20,
page: page, page: page,
auth: auth.jwt,
unread_only: unreadOnly == 'true', unread_only: unreadOnly == 'true',
} }
-3
View File
@@ -38,7 +38,6 @@
try { try {
await getClient().createPrivateMessage({ await getClient().createPrivateMessage({
auth: $profile.jwt,
content: reply, content: reply,
recipient_id: message.creator.id, recipient_id: message.creator.id,
}) })
@@ -68,13 +67,11 @@
if (item.type == 'person_mention') { if (item.type == 'person_mention') {
await getClient().markPersonMentionAsRead({ await getClient().markPersonMentionAsRead({
auth: $profile?.jwt,
person_mention_id: item.id, person_mention_id: item.id,
read: isRead, read: isRead,
}) })
} else if (item.type == 'comment_reply') { } else if (item.type == 'comment_reply') {
await getClient().markCommentReplyAsRead({ await getClient().markCommentReplyAsRead({
auth: $profile?.jwt,
comment_reply_id: item.id, comment_reply_id: item.id,
read: isRead, read: isRead,
}) })
+2 -5
View File
@@ -3,9 +3,6 @@ import { getClient } from '$lib/lemmy.js'
import { get } from 'svelte/store' import { get } from 'svelte/store'
export async function load({ fetch }) { export async function load({ fetch }) {
return ( return (await getClient(undefined, fetch).getFederatedInstances())
await getClient(undefined, fetch).getFederatedInstances({ .federated_instances
auth: get(profile)?.jwt,
})
).federated_instances
} }
+16 -5
View File
@@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation' import { goto } from '$app/navigation'
import { setUser } from '$lib/auth.js' import { setUser } from '$lib/auth.js'
import { toast } from 'mono-svelte' import { Note, toast } from 'mono-svelte'
import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js' import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js'
import { getClient, validateInstance } from '$lib/lemmy.js' import { getClient, validateInstance } from '$lib/lemmy.js'
import { Button, TextInput } from 'mono-svelte' import { Button, TextInput } from 'mono-svelte'
@@ -11,6 +11,8 @@
Identification, Identification,
QuestionMarkCircle, QuestionMarkCircle,
} from 'svelte-hero-icons' } from 'svelte-hero-icons'
import { DOMAIN_REGEX_FORMS } from '$lib/util.js'
import { MINIMUM_VERSION } from '$lib/version.js'
let data = { let data = {
instance: DEFAULT_INSTANCE_URL, instance: DEFAULT_INSTANCE_URL,
@@ -36,10 +38,12 @@
}) })
if (response?.jwt) { if (response?.jwt) {
await setUser(response.jwt, data.instance, data.username) const result = await setUser(response.jwt, data.instance, data.username)
toast({ content: 'Successfully logged in.', type: 'success' }) if (result) {
goto('/') toast({ content: 'Successfully logged in.', type: 'success' })
goto('/')
}
} else { } else {
throw new Error('Invalid credentials') throw new Error('Invalid credentials')
} }
@@ -62,6 +66,13 @@
<div class="flex flex-col gap-2"> <div class="flex flex-col gap-2">
<h1 class="font-bold text-3xl">Log In</h1> <h1 class="font-bold text-3xl">Log In</h1>
<p>Enter the fediverse</p> <p>Enter the fediverse</p>
<Note>
This version of Photon supports instances running
<span style="font-family: monospace;">
v{MINIMUM_VERSION}
</span>
or higher.
</Note>
</div> </div>
<div class="flex flex-row w-full items-center gap-2"> <div class="flex flex-row w-full items-center gap-2">
<TextInput <TextInput
@@ -81,7 +92,7 @@
bind:value={data.instance} bind:value={data.instance}
class="flex-1" class="flex-1"
required required
pattern={'(?!-)[A-Za-z0-9-]+([-.]{1}[a-z0-9]+)*.[A-Za-z]{2,6}'} pattern={DOMAIN_REGEX_FORMS}
/> />
{/if} {/if}
</div> </div>
-1
View File
@@ -32,7 +32,6 @@ export async function load({ url, fetch }) {
const client = getClient(undefined, fetch) const client = getClient(undefined, fetch)
const params = { const params = {
auth: jwt,
limit: 20, limit: 20,
page: page, page: page,
unresolved_only: type == 'unread', unresolved_only: type == 'unread',
+1 -6
View File
@@ -26,7 +26,6 @@
switch (item.type) { switch (item.type) {
case 'comment': { case 'comment': {
const res = await getClient().resolveCommentReport({ const res = await getClient().resolveCommentReport({
auth: $profile.jwt,
report_id: item.id, report_id: item.id,
resolved: !item.resolved, resolved: !item.resolved,
}) })
@@ -44,7 +43,6 @@
} }
case 'post': { case 'post': {
const res = await getClient().resolvePostReport({ const res = await getClient().resolvePostReport({
auth: $profile.jwt,
report_id: item.id, report_id: item.id,
resolved: !item.resolved, resolved: !item.resolved,
}) })
@@ -61,7 +59,6 @@
} }
case 'message': { case 'message': {
const res = await getClient().resolvePrivateMessageReport({ const res = await getClient().resolvePrivateMessageReport({
auth: $profile.jwt,
report_id: item.id, report_id: item.id,
resolved: !item.resolved, resolved: !item.resolved,
}) })
@@ -79,9 +76,7 @@
} }
} }
const reports = await getClient().getReportCount({ const reports = await getClient().getReportCount({})
auth: $profile?.jwt,
})
$profile.user.reports = $profile.user.reports =
reports.comment_reports + reports.comment_reports +
-1
View File
@@ -207,7 +207,6 @@ export async function load({ url }) {
(url.searchParams.get('type') as ModlogActionType) || 'All' (url.searchParams.get('type') as ModlogActionType) || 'All'
const results = await getClient().getModlog({ const results = await getClient().getModlog({
auth: get(profile)?.jwt,
community_id: community, community_id: community,
limit: 40, limit: 40,
type_: type, type_: type,
+2 -1
View File
@@ -1,4 +1,5 @@
import { instance } from '$lib/instance.js' import { instance } from '$lib/instance.js'
import { getInstance } from '$lib/lemmy.js'
import { error, redirect } from '@sveltejs/kit' import { error, redirect } from '@sveltejs/kit'
import { get } from 'svelte/store' import { get } from 'svelte/store'
@@ -6,7 +7,7 @@ export function load({ params, url }) {
if (Number(params.instance)) { if (Number(params.instance)) {
const split = url.pathname.split('/') const split = url.pathname.split('/')
split.splice(2, 0, `${get(instance)?.toLowerCase()}`) split.splice(2, 0, `${getInstance()?.toLowerCase()}`)
const newUrl = new URL(url) const newUrl = new URL(url)
newUrl.pathname = split.join('/') newUrl.pathname = split.join('/')
@@ -42,7 +42,6 @@
$profile?.jwt $profile?.jwt
) { ) {
getClient().markPostAsRead({ getClient().markPostAsRead({
auth: $profile.jwt,
read: $userSettings.markPostsAsRead, read: $userSettings.markPostsAsRead,
post_id: post.post_view.post.id, post_id: post.post_view.post.id,
}) })
@@ -73,7 +72,6 @@
try { try {
const res = await getClient().resolveObject({ const res = await getClient().resolveObject({
auth: jwt,
q: post.post_view.post.ap_id, q: post.post_view.post.ap_id,
}) })
@@ -98,7 +96,6 @@
commentsPage = 1 commentsPage = 1
data.streamed.comments = getClient().getComments({ data.streamed.comments = getClient().getComments({
auth: $profile?.jwt,
page: 1, page: 1,
limit: 25, limit: 25,
type_: 'All', type_: 'All',
@@ -8,7 +8,6 @@ import { get } from 'svelte/store'
export async function load({ params, url, fetch }) { export async function load({ params, url, fetch }) {
const post = await getClient(params.instance.toLowerCase(), fetch).getPost({ const post = await getClient(params.instance.toLowerCase(), fetch).getPost({
id: Number(params.id), id: Number(params.id),
auth: get(profile)?.jwt,
}) })
let max_depth = post.post_view.counts.comments > 100 ? 1 : 3 let max_depth = post.post_view.counts.comments > 100 ? 1 : 3
@@ -38,7 +37,6 @@ export async function load({ params, url, fetch }) {
max_depth: max_depth, max_depth: max_depth,
saved_only: false, saved_only: false,
sort: sort, sort: sort,
auth: get(profile)?.jwt,
parent_id: parentId, parent_id: parentId,
} }
@@ -30,7 +30,6 @@
data.person_blocks = data.person_blocks data.person_blocks = data.person_blocks
await getClient().blockPerson({ await getClient().blockPerson({
auth: $profile.jwt,
block: false, block: false,
person_id: item.target.id, person_id: item.target.id,
}) })
@@ -50,7 +49,6 @@
data.community_blocks = data.community_blocks data.community_blocks = data.community_blocks
await getClient().blockCommunity({ await getClient().blockCommunity({
auth: $profile.jwt,
block: false, block: false,
community_id: item.community.id, community_id: item.community.id,
}) })
@@ -15,6 +15,7 @@
newPasswordVerify = '' newPasswordVerify = ''
let loading = false let loading = false
// @ts-ignore
$: totpLink = data.my_user?.local_user_view?.local_user?.totp_2fa_url $: totpLink = data.my_user?.local_user_view?.local_user?.totp_2fa_url
async function changePassword() { async function changePassword() {
@@ -22,7 +23,6 @@
if (!$profile?.jwt) return if (!$profile?.jwt) return
loading = true loading = true
const res = await getClient().changePassword({ const res = await getClient().changePassword({
auth: $profile?.jwt,
new_password: newPassword, new_password: newPassword,
new_password_verify: newPasswordVerify, new_password_verify: newPasswordVerify,
old_password: oldPassword, old_password: oldPassword,
@@ -56,8 +56,8 @@
await getClient().saveUserSettings({ await getClient().saveUserSettings({
...data.my_user?.local_user_view.local_user, ...data.my_user?.local_user_view.local_user,
...data.my_user?.local_user_view.person, ...data.my_user?.local_user_view.person,
// @ts-ignore
generate_totp_2fa: enabled, generate_totp_2fa: enabled,
auth: $profile?.jwt,
}) })
goto($page.url, { invalidateAll: true }) goto($page.url, { invalidateAll: true })
toast({ toast({
@@ -28,7 +28,6 @@
: undefined : undefined
const res = await getClient().saveUserSettings({ const res = await getClient().saveUserSettings({
auth: $profile.jwt,
...formData, ...formData,
avatar: pfp, avatar: pfp,
}) })
@@ -104,9 +103,10 @@
try { try {
const { jwt } = $profile const { jwt } = $profile
// TODO - add option to delete content
await getClient().deleteAccount({ await getClient().deleteAccount({
auth: jwt,
password: deletion.password, password: deletion.password,
delete_content: false,
}) })
profileData.update((pd) => { profileData.update((pd) => {
+1 -2
View File
@@ -5,8 +5,7 @@ import type { SortType } from 'lemmy-js-client'
import { get } from 'svelte/store' import { get } from 'svelte/store'
export async function load({ params, url, fetch }) { export async function load({ params, url, fetch }) {
const my_user = (await getClient().getSite({ auth: get(profile)?.jwt })) const my_user = (await getClient().getSite()).my_user
.my_user
return { return {
my_user: my_user, my_user: my_user,
-1
View File
@@ -17,7 +17,6 @@ export async function load({ url, fetch, parent }) {
page: page, page: page,
username: my_user?.local_user_view.person.name, username: my_user?.local_user_view.person.name,
sort: sort, sort: sort,
auth: get(profile)?.jwt,
}) })
const items = [...user.posts, ...user.comments] const items = [...user.posts, ...user.comments]
+8 -3
View File
@@ -1,6 +1,12 @@
import { profile } from '$lib/auth.js' import { profile } from '$lib/auth.js'
import { getClient } from '$lib/lemmy.js' import { getClient } from '$lib/lemmy.js'
import type { CommentSortType, CommentView, ListingType, PostView, SortType } from 'lemmy-js-client' import type {
CommentSortType,
CommentView,
ListingType,
PostView,
SortType,
} from 'lemmy-js-client'
import { get } from 'svelte/store' import { get } from 'svelte/store'
function getSavedItemPublished(item: PostView | CommentView) { function getSavedItemPublished(item: PostView | CommentView) {
@@ -18,12 +24,11 @@ export async function load({ url, fetch }) {
const client = getClient(undefined, fetch) const client = getClient(undefined, fetch)
const params = { const params = {
auth: get(profile)!.jwt!,
saved_only: true, saved_only: true,
limit: 20, limit: 20,
page: page, page: page,
sort: 'New' as SortType & CommentSortType, sort: 'New' as SortType & CommentSortType,
type_: 'All' as ListingType type_: 'All' as ListingType,
} }
const [posts, comments] = await Promise.all([ const [posts, comments] = await Promise.all([
-2
View File
@@ -22,7 +22,6 @@ export async function load({ url, fetch }) {
if (query) { if (query) {
const results = await getClient(undefined, fetch).search({ const results = await getClient(undefined, fetch).search({
q: query, q: query,
auth: get(profile)?.jwt,
community_id: community ?? undefined, community_id: community ?? undefined,
limit: 20, limit: 20,
page: page, page: page,
@@ -52,7 +51,6 @@ export async function load({ url, fetch }) {
streamed: { streamed: {
object: get(profile)?.jwt object: get(profile)?.jwt
? getClient(undefined, fetch).resolveObject({ ? getClient(undefined, fetch).resolveObject({
auth: get(profile)!.jwt!,
q: query, q: query,
}) })
: undefined, : undefined,
+1 -2
View File
@@ -49,7 +49,6 @@
const blocked = isBlocked($profile.user, block) const blocked = isBlocked($profile.user, block)
await getClient().blockPerson({ await getClient().blockPerson({
auth: $profile.jwt,
block: !blocked, block: !blocked,
person_id: block, person_id: block,
}) })
@@ -130,7 +129,7 @@
<div <div
class="!divide-y divide-slate-200 dark:divide-zinc-800 flex flex-col" class="!divide-y divide-slate-200 dark:divide-zinc-800 flex flex-col"
> >
{#each data.items as item (item.counts.id)} {#each data.items as item}
{#if isCommentView(item) && (data.type == 'all' || data.type == 'comments')} {#if isCommentView(item) && (data.type == 'all' || data.type == 'comments')}
<CommentItem comment={item} /> <CommentItem comment={item} />
{:else if !isCommentView(item) && (data.type == 'all' || data.type == 'posts')} {:else if !isCommentView(item) && (data.type == 'all' || data.type == 'posts')}
-1
View File
@@ -15,7 +15,6 @@ export async function load({ params, url, fetch }) {
page: page, page: page,
username: params.name, username: params.name,
sort: sort, sort: sort,
auth: get(profile)?.jwt,
}) })
const items = [...user.posts, ...user.comments] const items = [...user.posts, ...user.comments]
+21
View File
@@ -0,0 +1,21 @@
import { versionIsSupported } from '../src/lib/version.js'
import { describe, expect, it } from 'vitest'
describe('versionIsSupported()', () => {
it('checks minimum correctly', () => {
expect(versionIsSupported('0.1.0', '0.0.0')).toBeTruthy()
expect(versionIsSupported('0.0.0', '0.1.0')).toBeFalsy()
})
it('checks weird minimum versions correctly', () => {
expect(versionIsSupported('0.19.0-rc.2', '0.19.0')).toBeTruthy()
expect(versionIsSupported('0.19.0.rc.9', '0.19.1')).toBeFalsy()
})
it('checks major and patch versions correctly', () => {
expect(versionIsSupported('2.0.0', '1.0.0')).toBeTruthy()
expect(versionIsSupported('0.0.2', '0.0.1')).toBeTruthy()
})
it('handles other cases', () => {
expect(versionIsSupported('2.0.2', '1.0.5')).toBeTruthy()
expect(versionIsSupported('9.5.2', '7.6.3')).toBeTruthy()
})
})
+4 -4
View File
@@ -2821,10 +2821,10 @@ kleur@^4.1.5:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780" resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ== integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
lemmy-js-client@^0.18.1: lemmy-js-client@^0.19.0-rc.13:
version "0.18.1" version "0.19.0-rc.13"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.1.tgz#28df266eded0ef4a72b05ee6eabebddadfd81a27" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-rc.13.tgz#e0e15ba6fe3a08cb85130eea7eec4bd2773999f9"
integrity sha512-maafUZ9ZJkXthRZmM0+limJmymF2kmN/8SiKufS3V4OVNM72s+wUFFiyhKmA370g23iZRW6SUagE7jNKnqNyYQ== integrity sha512-JP9oEh1+Wfttqx5O5EMAVIR/hFVS66iVKmEo8/Uxw8fJfyUeQo7BhKvG8LTYegBE39Womgyu3KxXb7Jy9DRI5A==
dependencies: dependencies:
cross-fetch "^3.1.5" cross-fetch "^3.1.5"
form-data "^4.0.0" form-data "^4.0.0"