From 6d12b01d561b80a02a26c8f942152d5098d8e20e Mon Sep 17 00:00:00 2001 From: Untone Date: Mon, 8 Apr 2024 15:54:01 +0300 Subject: [PATCH] author-type-fix --- src/components/Views/Author/Author.tsx | 4 ++-- .../ProfileSubscriptions.tsx | 6 +++--- src/context/following.tsx | 6 +++--- src/context/session.tsx | 6 +++--- src/utils/getImageUrl.ts | 20 +++++++++---------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx index efd1bb73..e2de6c1f 100644 --- a/src/components/Views/Author/Author.tsx +++ b/src/components/Views/Author/Author.tsx @@ -53,10 +53,10 @@ export const AuthorView = (props: Props) => { // current author createEffect(() => { - if(props.authorSlug) { + if (props.authorSlug) { if (session()?.user?.app_data?.profile?.slug === props.authorSlug) { console.info('my own profile') - const {profile, authors, topics} = session().user.app_data + const { profile, authors, topics } = session().user.app_data setAuthor(profile) setFollowing([...authors, ...topics]) } diff --git a/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx b/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx index 82fe575a..cab28884 100644 --- a/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx +++ b/src/components/Views/ProfileSubscriptions/ProfileSubscriptions.tsx @@ -5,7 +5,7 @@ import { useFollowing } from '../../../context/following' import { useLocalize } from '../../../context/localize' import { useSession } from '../../../context/session' import { apiClient } from '../../../graphql/client/core' -import { Author, Topic } from '../../../graphql/schema/core.gen' +import { Author as AuthorType, Topic } from '../../../graphql/schema/core.gen' import { SubscriptionFilter } from '../../../pages/types' import { dummyFilter } from '../../../utils/dummyFilter' // TODO: refactor styles @@ -23,8 +23,8 @@ export const ProfileSubscriptions = () => { const { t, lang } = useLocalize() const { author, session } = useSession() const { subscriptions } = useFollowing() - const [following, setFollowing] = (createSignal < Array < Author) | (Topic >> []) - const [filtered, setFiltered] = (createSignal < Array < Author) | (Topic >> []) + const [following, setFollowing] = (createSignal < Array < AuthorType) | (Topic >> []) + const [filtered, setFiltered] = (createSignal < Array < AuthorType) | (Topic >> []) const [subscriptionFilter, setSubscriptionFilter] = createSignal < SubscriptionFilter > 'all' const [searchQuery, setSearchQuery] = createSignal('') diff --git a/src/context/following.tsx b/src/context/following.tsx index 6ee4621e..3371a010 100644 --- a/src/context/following.tsx +++ b/src/context/following.tsx @@ -2,7 +2,7 @@ import { Accessor, JSX, createContext, createEffect, createSignal, useContext } import { createStore } from 'solid-js/store' import { apiClient } from '../graphql/client/core' -import { AuthorFollows, FollowingEntity, Author } from '../graphql/schema/core.gen' +import { Author, AuthorFollows, FollowingEntity } from '../graphql/schema/core.gen' import { useSession } from './session' @@ -83,8 +83,8 @@ export const FollowingProvider = (props: { children: JSX.Element }) => { const { authors, followers, topics } = session().user.app_data setSubscriptions({ authors, topics }) setFollowers(followers) - if(!authors) fetchData() - } catch(e) { + if (!authors) fetchData() + } catch (e) { console.error(e) } } diff --git a/src/context/session.tsx b/src/context/session.tsx index aba1ace5..67bd5a93 100644 --- a/src/context/session.tsx +++ b/src/context/session.tsx @@ -223,8 +223,8 @@ export const SessionProvider = (props: { const { profile } = session().user.app_data setAuthor(profile) addAuthors([profile]) - if(!profile) loadAuthor() - } catch(e) { + if (!profile) loadAuthor() + } catch (e) { console.error(e) } @@ -271,7 +271,7 @@ export const SessionProvider = (props: { () => props.onStateChangeCallback, () => { props.onStateChangeCallback(session()) - } + }, ), ) diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts index 7b8b56dc..bc3c9073 100644 --- a/src/utils/getImageUrl.ts +++ b/src/utils/getImageUrl.ts @@ -15,17 +15,17 @@ export const getImageUrl = ( src: string, options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}, ) => { - if (!src.includes('discours.io') && src.includes('http')) { - return src - } - const filename = src.toLowerCase().split('/').pop() - const ext = filename.split('.').pop() - const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac'] - const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/` - const suffix = isAudio || options.noSizeUrlPart ? '' : getSizeUrlPart(options) - const subfolder = isAudio ? 'audio' : 'image' + if (!src.includes('discours.io') && src.includes('http')) { + return src + } + const filename = src.toLowerCase().split('/').pop() + const ext = filename.split('.').pop() + const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac'] + const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/` + const suffix = isAudio || options.noSizeUrlPart ? '' : getSizeUrlPart(options) + const subfolder = isAudio ? 'audio' : 'image' - return `${base}${suffix}production/${subfolder}/${filename}` + return `${base}${suffix}production/${subfolder}/${filename}` } export const getOpenGraphImageUrl = (