From 8192239dc32fb3b6dbe5a742008963b6152c2708 Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sun, 13 Aug 2023 14:32:45 -0700 Subject: [PATCH] feat: disable community creation on sites with it disabled --- package.json | 2 +- src/lib/auth.ts | 25 +++++++++++++++---------- src/lib/components/ui/Navbar.svelte | 3 ++- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index d15a8bd4..193ae15a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photon-lemmy", - "version": "0.8.0", + "version": "0.8.1", "private": true, "scripts": { "dev": "vite dev", diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 9bcce2dd..ae18660f 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -1,10 +1,10 @@ import { amModOfAny } from '$lib/components/lemmy/moderation/moderation.js' import { toast } from '$lib/components/ui/toasts/toasts.js' import { DEFAULT_INSTANCE_URL, instance } from '$lib/instance.js' -import { getClient } from '$lib/lemmy.js' +import { getClient, site } from '$lib/lemmy.js' import { getInbox, getInboxItemPublished } from '$lib/lemmy/inbox.js' import { userSettings } from '$lib/settings.js' -import type { MyUserInfo } from 'lemmy-js-client' +import type { GetSiteResponse, MyUserInfo } from 'lemmy-js-client' import { get, writable } from 'svelte/store' const getDefaultProfile = (): Profile => ({ @@ -81,11 +81,12 @@ profile.subscribe(async (p) => { instance.set(p.instance) // fetch the user because p.user is undefined const user = await userFromJwt(p.jwt, p.instance) + site.set(user?.site) profile.update(() => ({ ...p, - user: user, - username: user?.local_user_view.person.name, + user: user!.user, + username: user?.user.local_user_view.person.name, })) }) @@ -119,7 +120,7 @@ export async function setUser(jwt: string, inst: string, username: string) { profile.set({ ...newProfile, - user: user, + user: user!.user, }) return { @@ -134,14 +135,18 @@ export async function setUser(jwt: string, inst: string, username: string) { async function userFromJwt( jwt: string, instance: string -): Promise { - const myUser = (await getClient(instance).getSite({ auth: jwt })).my_user +): Promise<{ user: PersonData; site: GetSiteResponse } | undefined> { + const site = await getClient(instance).getSite({ auth: jwt }) + const myUser = site.my_user if (!myUser) return undefined return { - unreads: 0, - reports: 0, - ...myUser, + user: { + unreads: 0, + reports: 0, + ...myUser, + }, + site: site, } } diff --git a/src/lib/components/ui/Navbar.svelte b/src/lib/components/ui/Navbar.svelte index f22db2d5..8c2172af 100644 --- a/src/lib/components/ui/Navbar.svelte +++ b/src/lib/components/ui/Navbar.svelte @@ -157,7 +157,8 @@ Community