feat: add v0.19.0 support
This commit is contained in:
1 parent
b3b8a10e44
commit
119ab53946
62 files changed
+188
-157
No files matched your search
+35
-18
@@ -1,15 +1,16 @@
|
||||
import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js'
|
||||
import { toast } from 'mono-svelte'
|
||||
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 { moveItem } from '$lib/util.js'
|
||||
import { instanceToURL, moveItem } from '$lib/util.js'
|
||||
import {
|
||||
LemmyHttp,
|
||||
type GetSiteResponse,
|
||||
type MyUserInfo,
|
||||
} from 'lemmy-js-client'
|
||||
import { get, writable } from 'svelte/store'
|
||||
import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js'
|
||||
|
||||
const getDefaultProfile = (): Profile => ({
|
||||
id: -1,
|
||||
@@ -87,13 +88,21 @@ profile.subscribe(async (p) => {
|
||||
instance.set(p.instance)
|
||||
// fetch the user because p.user is undefined
|
||||
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)
|
||||
toast({
|
||||
content: 'Your login has expired. Re-login to fix this issue.',
|
||||
type: 'warning',
|
||||
return user
|
||||
})
|
||||
site.set(user?.site)
|
||||
.catch((err) => {
|
||||
toast({ content: err as any, type: 'error' })
|
||||
})
|
||||
|
||||
if (!user?.user) return
|
||||
|
||||
profile.update(() => ({
|
||||
...p,
|
||||
@@ -105,13 +114,17 @@ profile.subscribe(async (p) => {
|
||||
|
||||
export async function setUser(jwt: string, inst: string, username: string) {
|
||||
try {
|
||||
new URL(`https://${inst}`)
|
||||
new URL(instanceToURL(inst))
|
||||
} catch (err) {
|
||||
return
|
||||
}
|
||||
|
||||
const user = await userFromJwt(jwt, inst)
|
||||
if (!user) {
|
||||
.then((u) => u)
|
||||
.catch((err) => {
|
||||
toast({ content: err as any, type: 'error' })
|
||||
})
|
||||
if (!user?.user) {
|
||||
toast({
|
||||
content: 'Failed to fetch your user. Is your instance down?',
|
||||
type: 'error',
|
||||
@@ -152,9 +165,7 @@ async function userFromJwt(
|
||||
jwt: string,
|
||||
instance: string
|
||||
): Promise<{ user: PersonData; site: GetSiteResponse } | undefined> {
|
||||
const sitePromise = getClient(instance).getSite({
|
||||
auth: jwt,
|
||||
})
|
||||
const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite()
|
||||
|
||||
let timer = setTimeout(
|
||||
() =>
|
||||
@@ -170,6 +181,12 @@ async function userFromJwt(
|
||||
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
|
||||
if (!myUser) return undefined
|
||||
|
||||
@@ -250,6 +267,10 @@ export async function setUserID(id: number) {
|
||||
|
||||
if (prof?.jwt) {
|
||||
const user = await userFromJwt(prof.jwt, prof.instance)
|
||||
.then((u) => u)
|
||||
.catch((err) => {
|
||||
toast({ content: err as any, type: 'error' })
|
||||
})
|
||||
instance.set(prof.instance)
|
||||
prof.user = user?.user
|
||||
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 unreads = await getClient().getUnreadCount({
|
||||
auth: jwt,
|
||||
})
|
||||
const unreads = await getClient().getUnreadCount()
|
||||
|
||||
let reports: number = 0
|
||||
|
||||
if (mod) {
|
||||
const reportRes = await getClient().getReportCount({
|
||||
auth: jwt,
|
||||
})
|
||||
const reportRes = await getClient().getReportCount({})
|
||||
|
||||
reports =
|
||||
reportRes.comment_reports +
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
search={async (q) => {
|
||||
const results = await getClient().search({
|
||||
q: q || ' ',
|
||||
auth: jwt,
|
||||
type_: 'Communities',
|
||||
limit: 20,
|
||||
listing_type: listing_type,
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
|
||||
try {
|
||||
await getClient().editComment({
|
||||
auth: $profile.jwt,
|
||||
comment_id: node.comment_view.comment.id,
|
||||
content: newComment,
|
||||
})
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
try {
|
||||
const response = await getClient().createComment({
|
||||
auth: $profile.jwt,
|
||||
content: value,
|
||||
post_id: postId,
|
||||
parent_id: parentId,
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
await getClient()
|
||||
.likeComment({
|
||||
score: upvoted ? 0 : 1,
|
||||
auth: $profile.jwt,
|
||||
comment_id: commentId,
|
||||
})
|
||||
.catch((_) => undefined)
|
||||
@@ -59,7 +58,6 @@
|
||||
await getClient()
|
||||
.likeComment({
|
||||
score: upvoted ? 0 : -1,
|
||||
auth: $profile.jwt,
|
||||
comment_id: commentId,
|
||||
})
|
||||
.catch((_) => undefined)
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
parent.loading = true
|
||||
|
||||
const newComments = await getClient($page.params.instance).getComments({
|
||||
auth: $profile?.jwt,
|
||||
max_depth: 5,
|
||||
parent_id: parent.comment_view.comment.id,
|
||||
type_: 'All',
|
||||
|
||||
@@ -41,7 +41,6 @@
|
||||
|
||||
try {
|
||||
await getClient().followCommunity({
|
||||
auth: $profile.jwt,
|
||||
community_id: community_view.community.id,
|
||||
follow: !subscribed,
|
||||
})
|
||||
@@ -61,7 +60,6 @@
|
||||
|
||||
try {
|
||||
await getClient().blockCommunity({
|
||||
auth: $profile.jwt,
|
||||
community_id: community_view.community.id,
|
||||
block: !blocked,
|
||||
})
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
|
||||
const res = edit
|
||||
? await getClient().editCommunity({
|
||||
auth: $profile.jwt,
|
||||
title: formData.displayName,
|
||||
description: formData.sidebar,
|
||||
nsfw: formData.nsfw,
|
||||
@@ -59,7 +58,6 @@
|
||||
community_id: edit,
|
||||
})
|
||||
: await getClient().createCommunity({
|
||||
auth: $profile.jwt,
|
||||
name: formData.name,
|
||||
title: formData.displayName,
|
||||
description: formData.sidebar,
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
|
||||
try {
|
||||
await getClient().createPrivateMessage({
|
||||
auth: $profile.jwt,
|
||||
content: message,
|
||||
recipient_id: user.id,
|
||||
})
|
||||
|
||||
@@ -62,7 +62,6 @@
|
||||
|
||||
if (community) {
|
||||
await getClient().banFromCommunity({
|
||||
auth: $profile.jwt,
|
||||
ban: !banned,
|
||||
community_id: community.id,
|
||||
person_id: item.id,
|
||||
@@ -72,7 +71,6 @@
|
||||
})
|
||||
} else {
|
||||
await getClient().banPerson({
|
||||
auth: $profile.jwt,
|
||||
ban: !banned,
|
||||
person_id: item.id,
|
||||
reason: reason || undefined,
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
|
||||
try {
|
||||
await getClient().lockPost({
|
||||
auth: $profile.jwt,
|
||||
locked: lock,
|
||||
post_id: item.post.id,
|
||||
})
|
||||
@@ -60,7 +59,6 @@
|
||||
try {
|
||||
await getClient().featurePost({
|
||||
feature_type: toInstance ? 'Local' : 'Community',
|
||||
auth: $profile.jwt,
|
||||
featured: pinned,
|
||||
post_id: item.post.id,
|
||||
})
|
||||
|
||||
@@ -57,13 +57,11 @@
|
||||
if (purge) {
|
||||
if (isCommentView(item)) {
|
||||
await getClient(undefined, fetch).purgeComment({
|
||||
auth: $profile.jwt,
|
||||
comment_id: item.comment.id,
|
||||
reason: reason,
|
||||
})
|
||||
} else {
|
||||
await getClient(undefined, fetch).purgePost({
|
||||
auth: $profile.jwt,
|
||||
post_id: item.post.id,
|
||||
reason: reason,
|
||||
})
|
||||
@@ -91,7 +89,6 @@
|
||||
if (privateMessage) {
|
||||
await getClient()
|
||||
.createPrivateMessage({
|
||||
auth: $profile.jwt,
|
||||
content: replyReason,
|
||||
recipient_id: isCommentView(item)
|
||||
? item.comment.creator_id
|
||||
@@ -106,7 +103,6 @@
|
||||
} else {
|
||||
await getClient()
|
||||
.createComment({
|
||||
auth: $profile.jwt,
|
||||
content: replyReason,
|
||||
post_id: item.post.id,
|
||||
parent_id: isCommentView(item) ? item.comment.id : undefined,
|
||||
@@ -122,7 +118,6 @@
|
||||
|
||||
if (isCommentView(item)) {
|
||||
await getClient().removeComment({
|
||||
auth: $profile.jwt,
|
||||
comment_id: item.comment.id,
|
||||
removed: !removed,
|
||||
reason: reason || undefined,
|
||||
@@ -130,7 +125,6 @@
|
||||
item.comment.removed = !removed
|
||||
} else if (isPostView(item)) {
|
||||
await getClient().removePost({
|
||||
auth: $profile.jwt,
|
||||
post_id: item.post.id,
|
||||
removed: !removed,
|
||||
reason: reason || undefined,
|
||||
|
||||
@@ -27,13 +27,11 @@
|
||||
try {
|
||||
if (isComment(item)) {
|
||||
await getClient().createCommentReport({
|
||||
auth: $profile.jwt,
|
||||
comment_id: item.comment.id,
|
||||
reason: reason,
|
||||
})
|
||||
} else if (isPost(item)) {
|
||||
await getClient().createPostReport({
|
||||
auth: $profile.jwt,
|
||||
post_id: item.post.id,
|
||||
reason: reason,
|
||||
})
|
||||
|
||||
@@ -78,7 +78,7 @@ export const amMod = (me: MyUserInfo, community: Community) =>
|
||||
export const amModOfAny = (me?: MyUserInfo) =>
|
||||
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 = (
|
||||
input: string,
|
||||
|
||||
@@ -63,7 +63,6 @@
|
||||
communitySearch = passedCommunity.name
|
||||
} else {
|
||||
const list = await getClient().listCommunities({
|
||||
auth: $profile?.jwt,
|
||||
type_: 'All',
|
||||
sort: 'Active',
|
||||
limit: 40,
|
||||
@@ -107,7 +106,6 @@
|
||||
}
|
||||
|
||||
const post = await getClient().editPost({
|
||||
auth: $profile.jwt,
|
||||
name: data.title,
|
||||
body: data.body,
|
||||
url: data.url || undefined,
|
||||
@@ -121,10 +119,11 @@
|
||||
|
||||
dispatcher('submit', post.post_view)
|
||||
} 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
|
||||
const post = await getClient().createPost({
|
||||
auth: $profile.jwt,
|
||||
community_id: data.community!,
|
||||
name: data.title,
|
||||
body: data.body,
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import { getInstance } from '$lib/lemmy.js'
|
||||
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) =>
|
||||
me.person.id == comment.creator.id
|
||||
|
||||
@@ -13,8 +10,8 @@ export const bestImageURL = (
|
||||
width: number = 1024
|
||||
) => {
|
||||
if (width > 1024) {
|
||||
if (post.url) return `${post.url}?format=webp`
|
||||
else if (post.thumbnail_url) return `${post.thumbnail_url}?format=webp`
|
||||
if (post.url) return `${post.url}?format=webp`
|
||||
else if (post.thumbnail_url) return `${post.thumbnail_url}?format=webp`
|
||||
}
|
||||
|
||||
if (compact && post.thumbnail_url)
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
<Button
|
||||
href="/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" />
|
||||
<span class="hidden md:inline">Admin</span>
|
||||
|
||||
+31
-13
@@ -2,6 +2,8 @@ import { type GetSiteResponse, LemmyHttp } from 'lemmy-js-client'
|
||||
import { get, writable } from 'svelte/store'
|
||||
import { error } from '@sveltejs/kit'
|
||||
import { instance } from '$lib/instance.js'
|
||||
import { instanceToURL } from '$lib/util.js'
|
||||
import { profile } from '$lib/auth.js'
|
||||
|
||||
async function customFetch(
|
||||
func: (
|
||||
@@ -16,33 +18,49 @@ async function customFetch(
|
||||
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(
|
||||
instanceURL?: string,
|
||||
func?: (
|
||||
input: RequestInfo | URL,
|
||||
init?: RequestInit | undefined
|
||||
) => Promise<Response>
|
||||
) => Promise<Response>,
|
||||
auth?: string
|
||||
): LemmyHttp {
|
||||
if (!instanceURL) {
|
||||
instanceURL = get(instance)
|
||||
}
|
||||
|
||||
return new LemmyHttp(`https://${instanceURL}`, {
|
||||
fetchFunction: func
|
||||
? (input, init) => customFetch(func, input, init)
|
||||
: undefined,
|
||||
})
|
||||
return client({ instanceURL, func, auth })
|
||||
}
|
||||
|
||||
export const getInstance = () => get(instance)
|
||||
|
||||
export const getInstance = () => encodeURIComponent(get(instance))
|
||||
export const site = writable<GetSiteResponse | undefined>(undefined)
|
||||
|
||||
export async function validateInstance(instance: string): Promise<boolean> {
|
||||
if (instance == '') return false
|
||||
|
||||
try {
|
||||
await getClient(instance).getSite({})
|
||||
await getClient(instance).getSite()
|
||||
|
||||
return true
|
||||
} catch (err) {
|
||||
|
||||
@@ -70,7 +70,6 @@ export async function save(
|
||||
if (item.type == 'post') {
|
||||
return (
|
||||
await getClient().savePost({
|
||||
auth: jwt,
|
||||
post_id: item.id,
|
||||
save: save,
|
||||
})
|
||||
@@ -78,7 +77,6 @@ export async function save(
|
||||
} else if (item.type == 'comment') {
|
||||
return (
|
||||
await getClient().saveComment({
|
||||
auth: jwt,
|
||||
comment_id: item.id,
|
||||
save: save,
|
||||
})
|
||||
@@ -97,7 +95,6 @@ export async function deleteItem(
|
||||
if (item.type == 'post') {
|
||||
return (
|
||||
await getClient().deletePost({
|
||||
auth: jwt,
|
||||
post_id: item.id,
|
||||
deleted: deleted,
|
||||
})
|
||||
@@ -105,7 +102,6 @@ export async function deleteItem(
|
||||
} else if (item.type == 'comment') {
|
||||
return (
|
||||
await getClient().deleteComment({
|
||||
auth: jwt,
|
||||
comment_id: item.id,
|
||||
deleted: deleted,
|
||||
})
|
||||
@@ -124,7 +120,6 @@ export async function vote(
|
||||
if (item.type == 'post') {
|
||||
return (
|
||||
await getClient().likePost({
|
||||
auth: jwt,
|
||||
post_id: item.id,
|
||||
score: vote,
|
||||
})
|
||||
@@ -132,7 +127,6 @@ export async function vote(
|
||||
} else if (item.type == 'comment') {
|
||||
return (
|
||||
await getClient().likeComment({
|
||||
auth: jwt,
|
||||
comment_id: item.id,
|
||||
score: vote,
|
||||
})
|
||||
@@ -151,7 +145,6 @@ export async function markAsRead(
|
||||
if (item.type == 'post') {
|
||||
return (
|
||||
await getClient().markPostAsRead({
|
||||
auth: jwt,
|
||||
post_id: item.id,
|
||||
read: read,
|
||||
})
|
||||
|
||||
@@ -10,7 +10,6 @@ export const blockUser = async (block: boolean, id: number) => {
|
||||
if (!auth) throw new Error('Unauthorized')
|
||||
|
||||
const response = await getClient().blockPerson({
|
||||
auth: auth,
|
||||
block: block,
|
||||
person_id: id,
|
||||
})
|
||||
@@ -53,14 +52,12 @@ export const addSubscription = (
|
||||
export const addAdmin = async (handle: string, added: boolean, jwt: string) =>
|
||||
trycatch(async () => {
|
||||
const user = await getClient().resolveObject({
|
||||
auth: jwt,
|
||||
q: handle,
|
||||
})
|
||||
|
||||
if (!user.person) throw new Error('No user found')
|
||||
|
||||
return await getClient().addAdmin({
|
||||
auth: jwt,
|
||||
added: true,
|
||||
person_id: user.person.person.id,
|
||||
})
|
||||
|
||||
+9
-2
@@ -101,8 +101,10 @@ export const removeItem = <T>(array: T[], predicate: (item: T) => boolean) => {
|
||||
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_FORMS = '^((?!-)[A-Za-z0-9-]{1,63}.)+[A-Za-z]{2,63}'
|
||||
export const DOMAIN_REGEX =
|
||||
/^(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) =>
|
||||
subscribed == 'Pending' || subscribed == 'Subscribed'
|
||||
@@ -166,3 +168,8 @@ export async function uploadImage(
|
||||
}: ${response.status}: ${response.statusText}`
|
||||
)
|
||||
}
|
||||
|
||||
export const instanceToURL = (input: string) =>
|
||||
input.startsWith('http://') || input.startsWith('https://')
|
||||
? input
|
||||
: `https://${input}`
|
||||
@@ -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
|
||||
}
|
||||
Reference in new issue
Block a user