('all')
const [searchQuery, setSearchQuery] = createSignal('')
- const fetchSubscriptions = async () => {
- try {
- const slug = author()?.slug
- const authorFollows = await apiClient.getAuthorFollows({ slug })
- setFollowing([...authorFollows['authors']])
- setFiltered([...authorFollows['authors'], ...authorFollows['topics']])
- } catch (error) {
- console.error('[fetchSubscriptions] :', error)
- throw error
- }
- }
-
createEffect(() => {
- if (following()) {
+ const { authors, topics } = subscriptions
+ if (authors || topics) {
+ const fdata = [...(authors || []), ...(topics || [])]
+ setFollowing(fdata)
if (subscriptionFilter() === 'authors') {
- setFiltered(following().filter((s) => 'name' in s))
+ setFiltered(fdata.filter((s) => 'name' in s))
} else if (subscriptionFilter() === 'topics') {
- setFiltered(following().filter((s) => 'title' in s))
+ setFiltered(fdata.filter((s) => 'title' in s))
} else {
- setFiltered(following())
+ setFiltered(fdata)
}
}
- if (searchQuery()) {
- setFiltered(dummyFilter(following(), searchQuery(), lang()))
- }
})
- onMount(async () => {
- await fetchSubscriptions()
+ createEffect(() => {
+ if (searchQuery()) {
+ setFiltered(dummyFilter(following(), searchQuery(), lang()))
+ }
})
return (
@@ -73,17 +65,29 @@ export const ProfileSubscriptions = () => {
{t('Here you can manage all your Discours subscriptions')}
}>
- -
+
-
- -
+
-
- -
+
-
diff --git a/src/context/following.tsx b/src/context/following.tsx
index 1b0aa059..ad93eaaf 100644
--- a/src/context/following.tsx
+++ b/src/context/following.tsx
@@ -2,12 +2,13 @@ import { Accessor, JSX, createContext, createEffect, createSignal, useContext }
import { createStore } from 'solid-js/store'
import { apiClient } from '../graphql/client/core'
-import { AuthorFollowsResult, FollowingEntity } from '../graphql/schema/core.gen'
+import { Author, AuthorFollowsResult, FollowingEntity } from '../graphql/schema/core.gen'
import { useSession } from './session'
interface FollowingContextType {
loading: Accessor
+ followers: Accessor>
subscriptions: AuthorFollowsResult
setSubscriptions: (subscriptions: AuthorFollowsResult) => void
setFollowing: (what: FollowingEntity, slug: string, value: boolean) => void
@@ -31,6 +32,7 @@ const EMPTY_SUBSCRIPTIONS: AuthorFollowsResult = {
export const FollowingProvider = (props: { children: JSX.Element }) => {
const [loading, setLoading] = createSignal(false)
+ const [followers, setFollowers] = createSignal>([])
const [subscriptions, setSubscriptions] = createStore(EMPTY_SUBSCRIPTIONS)
const { author, session } = useSession()
@@ -77,8 +79,14 @@ export const FollowingProvider = (props: { children: JSX.Element }) => {
createEffect(() => {
if (author()) {
- console.debug('[context.following] author update detect')
- fetchData()
+ try {
+ const { authors, followers, topics } = session().user.app_data
+ setSubscriptions({ authors, topics })
+ setFollowers(followers)
+ if (!authors) fetchData()
+ } catch (e) {
+ console.error(e)
+ }
}
})
@@ -116,6 +124,7 @@ export const FollowingProvider = (props: { children: JSX.Element }) => {
setSubscriptions,
isOwnerSubscribed,
setFollowing,
+ followers,
loadSubscriptions: fetchData,
follow,
unfollow,
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 73659a6c..67bd5a93 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -199,6 +199,7 @@ export const SessionProvider = (props: {
}
onCleanup(() => clearTimeout(minuteLater))
+
const authorData = async () => {
const u = session()?.user
return u ? (await apiClient.getAuthorId({ user: u.id.trim() })) || null : null
@@ -217,7 +218,15 @@ export const SessionProvider = (props: {
apiClient.connect(token)
inboxClient.connect(token)
}
- if (!author()) loadAuthor()
+
+ try {
+ const { profile } = session().user.app_data
+ setAuthor(profile)
+ addAuthors([profile])
+ if (!profile) loadAuthor()
+ } catch (e) {
+ console.error(e)
+ }
setIsSessionLoaded(true)
}
@@ -263,7 +272,6 @@ export const SessionProvider = (props: {
() => {
props.onStateChangeCallback(session())
},
- { defer: true },
),
)