diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index 12e6aae6..cf0c94e8 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -7,7 +7,6 @@ import { import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { client, getClient, site } from '$lib/client/lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' -import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js' import { toast } from 'mono-svelte' import { writable } from 'svelte/store' import { t } from './i18n/translations' @@ -309,9 +308,7 @@ export const notifications = writable({ async function userFromJwt( jwt: string, instance: string, -): Promise< - { user: MyUserInfo | undefined; site: GetSiteResponse } | undefined -> { +): Promise<{ user?: MyUserInfo; site: GetSiteResponse } | undefined> { const sitePromise = client({ instanceURL: instance, auth: jwt }).getSite() const timer = setTimeout( @@ -335,13 +332,6 @@ async function userFromJwt( if (!site) return - if (!versionIsSupported(site.version, MINIMUM_VERSION)) { - toast({ - content: `This version of Photon only supports Lemmy instances with version ${MINIMUM_VERSION} or higher. This Lemmy instance is running: ${site.version}`, - type: 'error', - }) - } - const myUser = site.my_user return { diff --git a/src/lib/components/lemmy/comment/CommentItem.svelte b/src/lib/components/lemmy/comment/CommentItem.svelte index 904d60bb..3cd7e571 100644 --- a/src/lib/components/lemmy/comment/CommentItem.svelte +++ b/src/lib/components/lemmy/comment/CommentItem.svelte @@ -1,12 +1,12 @@ {data.person_view.value.person.name} -{#if purgingUser} - - {#snippet customTitle()} - Purging User - {/snippet} -

- Purging user - {data.person_view.value.person.name} - -

-

- Are you sure you want to do this? (The button will enable in 3 seconds.) -

-
- - -
-
-{/if} -
{#if !inline}
@@ -201,7 +83,7 @@ /> {/snippet} ({ + items={data.moderates.value.map((m) => ({ id: m.community.id, name: m.community.title, url: communityLink(m.community), @@ -212,97 +94,7 @@ {/if} {#snippet actions()} - {#if profile.current?.user && profile.current.jwt && data.person_view.value.person.id != profile.current.user.local_user_view.person.id} -
- - {#if data.person_view.value.person.matrix_user_id} - - {/if} - {#if isAdmin(profile.current?.user)} - - {#snippet target(attachment)} - - {/snippet} - - - {$t('moderation.modlog.user')} - - - ban( - data.person_view.value.person.banned, - data.person_view.value.person, - )} - > - {#snippet prefix()} - - {/snippet} - {data.person_view.value.person.banned ? 'Unban' : 'Ban'} - - (purgingUser = !purgingUser)} - > - {#snippet prefix()} - - {/snippet} - Purge - - - {/if} - - {#snippet target(attachment)} - - {/snippet} - blockUser(data.person_view.value.person.id)} - > - {#snippet prefix()} - - {/snippet} - {isBlocked( - profile.current.user, - data.person_view.value.person.id, - ) - ? 'Unblock' - : 'Block'} - - -
- {/if} + {/snippet}
@@ -358,6 +150,6 @@ {/if} `?page=${page}`} + href={(page) => `?page=${page}`} /> diff --git a/src/routes/u/[name]/UserActions.svelte b/src/routes/u/[name]/UserActions.svelte new file mode 100644 index 00000000..5a63d5f4 --- /dev/null +++ b/src/routes/u/[name]/UserActions.svelte @@ -0,0 +1,145 @@ + + + + +{#if purgingUser} + + {#snippet customTitle()} + Purging User + {/snippet} +

+ Purging user + {person.person.name} + +

+

+ Are you sure you want to do this? +

+
+ + +
+
+{/if} + +{#if profile.current?.user && profile.current.jwt && person.person.id != profile.current.user.local_user_view.person.id} +
+ + {#if person.person.matrix_user_id} + + {/if} + {#if isAdmin(profile.current?.user)} + + {#snippet target(attachment)} + + {/snippet} + + + {$t('moderation.modlog.user')} + + ban(person.person.banned, person.person)} + > + {#snippet prefix()} + + {/snippet} + {person.person.banned ? 'Unban' : 'Ban'} + + (purgingUser = !purgingUser)} + > + {#snippet prefix()} + + {/snippet} + Purge + + + {/if} + + {#snippet target(attachment)} + + {/snippet} + blockUser(isBlocked(profile.current.user!, person.person.id), person.person.id)} + > + {#snippet prefix()} + + {/snippet} + {isBlocked(profile.current.user, person.person.id) + ? 'Unblock' + : 'Block'} + + +
+{/if} diff --git a/src/routes/util/functions/+page.svelte b/src/routes/util/functions/+page.svelte index 10a030e2..7126ccec 100644 --- a/src/routes/util/functions/+page.svelte +++ b/src/routes/util/functions/+page.svelte @@ -1,5 +1,5 @@