@codingfactory/socialkit-vue 0.7.23 → 0.7.24

package/src/stores/discussion.ts

@@ -6,16 +6,21 @@ import { isAxiosError } from 'axios'
 import { defineStore } from 'pinia'
 import { onScopeDispose, ref } from 'vue'
 import type {
+  CreateSpaceInput,
   CreateReplyInput,
   CreateThreadInput,
+  DiscussionBrowseMode,
   DiscussionCategorySummary,
   DiscussionStoreConfig,
   DiscussionTag,
+  LoadSpacesOptions,
+  QuotedReply,
   QuoteResponse,
   Reply,
   SaveDraftOptions,
   Space,
   SpaceMembership,
+  SpaceThreadFilter,
   SpaceThreadSort,
   Thread,
   UpdateThreadInput,
@@ -252,6 +257,8 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
     const spaceMemberships = ref<Record<string, SpaceMembership>>({})
     const spaceMembershipLoading = ref<Record<string, boolean>>({})
     const threads = ref<Thread[]>([])
+    const browseThreadList = ref<Thread[]>([])
+    const currentBrowseMode = ref<DiscussionBrowseMode | null>(null)
     const currentThread = ref<Thread | null>(null)
     const replies = ref<Reply[]>([])
     const currentReplySort = ref<'best' | 'top' | 'new' | 'controversial'>('best')
@@ -261,8 +268,10 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
     const repliesLoadingState = createLoadingState()
 
     const loading = ref(false)
+    let activeLoadingRequests = 0
     const error = ref<string | null>(null)
     const nextCursor = ref<string | null>(null)
+    const browseNextCursor = ref<string | null>(null)
     const repliesNextCursor = ref<string | null>(null)
 
     const latestSpaceSlug = ref<string | null>(null)
@@ -365,7 +374,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       }
     }
 
-    function resolveQuotedReply(reply: Reply, existingReply?: Reply | null): Reply['quoted_reply'] {
+    function resolveQuotedReply(reply: Reply, existingReply?: Reply | null): QuotedReply | null {
       const quotedReplyId = typeof reply.quoted_reply_id === 'string'
         ? reply.quoted_reply_id.trim()
         : ''
@@ -393,6 +402,19 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       return hasQuotedReplyBody(incomingQuotedReply) ? incomingQuotedReply : null
     }
 
+    /**
+     * Check whether a reply-like object carries a truthy `is_author` flag.
+     * The field is not part of the Reply TS interface (it is user-specific
+     * metadata injected by the API) so we access it reflectively.
+     */
+    function hasReplyAuthorFlag(reply: Reply | Record<string, unknown>): boolean {
+      return Reflect.get(reply as object, 'is_author') === true
+    }
+
+    function setReplyAuthorFlag(reply: Reply | Record<string, unknown>, value: boolean): void {
+      Reflect.set(reply as object, 'is_author', value)
+    }
+
     function normalizeReplyPayload(reply: Reply, existingReply?: Reply | null): Reply {
       const normalized: Reply = { ...reply }
       const hasQuotedReplyId = typeof normalized.quoted_reply_id === 'string'
@@ -651,6 +673,16 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       REPLY: 'reply',
     } as const
 
+    function beginLoading(): void {
+      activeLoadingRequests += 1
+      loading.value = true
+    }
+
+    function endLoading(): void {
+      activeLoadingRequests = Math.max(0, activeLoadingRequests - 1)
+      loading.value = activeLoadingRequests > 0
+    }
+
     function flattenTree(tree: Space[]): Space[] {
       const result: Space[] = []
 
@@ -675,13 +707,38 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       return spaces.value.filter((space) => space.is_leaf !== false)
     }
 
-    async function loadSpaces(): Promise<unknown> {
+    function buildSpaceQueryString(options?: LoadSpacesOptions): string {
+      const params = new URLSearchParams()
+
+      params.set('tree', options?.tree === false ? '0' : '1')
+
+      if (options?.kind) {
+        params.set('kind', options.kind)
+      }
+
+      if (typeof options?.scope_type === 'string' && options.scope_type.trim().length > 0) {
+        params.set('scope_type', options.scope_type.trim())
+      }
+
+      if (typeof options?.scope_id === 'string' && options.scope_id.trim().length > 0) {
+        params.set('scope_id', options.scope_id.trim())
+      }
+
+      if (typeof options?.parent_id === 'string' && options.parent_id.trim().length > 0) {
+        params.set('parent_id', options.parent_id.trim())
+      }
+
+      return params.toString()
+    }
+
+    async function loadSpaces(options?: LoadSpacesOptions): Promise<unknown> {
       spacesLoadingState.setLoading(true)
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
-        const response = await client.get<unknown>('/v1/discussion/spaces?tree=1')
+        const queryString = buildSpaceQueryString(options)
+        const response = await client.get<unknown>(`/v1/discussion/spaces?${queryString}`)
         const responseData = toRecord(response.data)
         const treeData = Array.isArray(responseData?.items)
           ? responseData.items as Space[]
@@ -691,10 +748,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
 
         spaceTree.value = treeData
         spaces.value = flattenTree(treeData)
-
-        if (treeData.length === 0) {
-          spacesLoadingState.setEmpty(true)
-        }
+        spacesLoadingState.setEmpty(treeData.length === 0)
 
         return response.data
       } catch (err) {
@@ -705,7 +759,66 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         throw err
       } finally {
         spacesLoadingState.setLoading(false)
-        loading.value = false
+        endLoading()
+      }
+    }
+
+    async function createSpace(input: CreateSpaceInput): Promise<unknown> {
+      beginLoading()
+      error.value = null
+
+      try {
+        const response = await client.post<unknown>('/v1/discussion/spaces', {
+          ...input,
+          ...(typeof input.parent_id === 'string' ? { parent_id: input.parent_id } : { parent_id: null }),
+          ...(typeof input.description === 'string' && input.description.trim().length > 0
+            ? { description: input.description.trim() }
+            : {}),
+          ...(input.meta ? { meta: input.meta } : {}),
+        })
+
+        return response.data
+      } catch (err) {
+        logger.error('Failed to create discussion space:', err)
+        error.value = getErrorMessage(err, 'Failed to create discussion space')
+        throw err
+      } finally {
+        endLoading()
+      }
+    }
+
+    async function moveSpace(spaceId: string, parentId?: string | null): Promise<unknown> {
+      beginLoading()
+      error.value = null
+
+      try {
+        const response = await client.post<unknown>(`/v1/discussion/spaces/${spaceId}/move`, {
+          parent_id: parentId ?? null,
+        })
+
+        return response.data
+      } catch (err) {
+        logger.error('Failed to move discussion space:', err)
+        error.value = getErrorMessage(err, 'Failed to move discussion space')
+        throw err
+      } finally {
+        endLoading()
+      }
+    }
+
+    async function reorderSpaces(ids: string[]): Promise<unknown> {
+      beginLoading()
+      error.value = null
+
+      try {
+        const response = await client.post<unknown>('/v1/discussion/spaces/reorder', { ids })
+        return response.data
+      } catch (err) {
+        logger.error('Failed to reorder discussion spaces:', err)
+        error.value = getErrorMessage(err, 'Failed to reorder discussion spaces')
+        throw err
+      } finally {
+        endLoading()
       }
     }
 
@@ -813,18 +926,16 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
     async function loadThreads(
       spaceSlug: string,
       cursor?: string,
-      options?: { signal?: AbortSignal; sort?: SpaceThreadSort }
+      options?: { signal?: AbortSignal; sort?: SpaceThreadSort; filter?: SpaceThreadFilter }
     ): Promise<unknown> {
       if (!cursor || latestSpaceSlug.value === null) {
         latestSpaceSlug.value = spaceSlug
       }
 
       threadsLoadingState.setLoading(true)
-      loading.value = true
+      beginLoading()
       error.value = null
 
-      let isStale = false
-
       try {
         const queryParams = new URLSearchParams()
         if (cursor) {
@@ -833,6 +944,9 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         if (options?.sort) {
           queryParams.set('sort', options.sort)
         }
+        if (options?.filter && options.filter !== 'all') {
+          queryParams.set('filter', options.filter)
+        }
 
         const queryString = queryParams.toString()
         const url = `/v1/discussion/spaces/${spaceSlug}/threads${queryString.length > 0 ? `?${queryString}` : ''}`
@@ -853,7 +967,6 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         }
 
         if (latestSpaceSlug.value !== spaceSlug) {
-          isStale = true
           return response.data
         }
 
@@ -884,7 +997,6 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         return response.data
       } catch (err) {
         if (options?.signal?.aborted || latestSpaceSlug.value !== spaceSlug) {
-          isStale = true
           return undefined
         }
 
@@ -909,10 +1021,81 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = errorMessage
         throw err
       } finally {
-        if (!isStale) {
-          threadsLoadingState.setLoading(false)
-          loading.value = false
+        threadsLoadingState.setLoading(false)
+        endLoading()
+      }
+    }
+
+    async function browseThreads(
+      view: DiscussionBrowseMode,
+      cursor?: string,
+      options?: { signal?: AbortSignal }
+    ): Promise<unknown> {
+      if (!cursor || currentBrowseMode.value !== view) {
+        currentBrowseMode.value = view
+      }
+
+      threadsLoadingState.setLoading(true)
+      beginLoading()
+      error.value = null
+
+      try {
+        const queryParams = new URLSearchParams()
+        if (cursor) {
+          queryParams.set('cursor', cursor)
         }
+
+        const queryString = queryParams.toString()
+        const url = `/v1/discussion/threads/${view}${queryString.length > 0 ? `?${queryString}` : ''}`
+        const requestConfig = {
+          ...(options?.signal ? { signal: options.signal } : {}),
+        }
+
+        let response: Awaited<ReturnType<typeof client.get<unknown>>>
+
+        try {
+          response = await client.get<unknown>(url, requestConfig)
+        } catch (requestError) {
+          if (!isTransientThreadListError(requestError) || options?.signal?.aborted) {
+            throw requestError
+          }
+
+          response = await client.get<unknown>(url, requestConfig)
+        }
+
+        if (currentBrowseMode.value !== view) {
+          return response.data
+        }
+
+        const newThreads = getThreadsFromPayload(response.data).map((thread) => normalizeThreadReplyCount(thread))
+
+        if (cursor) {
+          browseThreadList.value = mergeUniqueById(browseThreadList.value, newThreads)
+        } else {
+          browseThreadList.value = newThreads
+
+          if (newThreads.length === 0) {
+            threadsLoadingState.setEmpty(true)
+          }
+        }
+
+        browseNextCursor.value = getThreadNextCursorFromPayload(response.data)
+        currentSpace.value = null
+
+        return response.data
+      } catch (err) {
+        if (options?.signal?.aborted || currentBrowseMode.value !== view) {
+          return undefined
+        }
+
+        logger.error('Failed to browse discussion threads:', err)
+        const errorMessage = getErrorMessage(err, 'Failed to load discussion threads')
+        threadsLoadingState.setError(new Error(errorMessage))
+        error.value = errorMessage
+        throw err
+      } finally {
+        threadsLoadingState.setLoading(false)
+        endLoading()
       }
     }
 
@@ -932,29 +1115,29 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       latestThreadId.value = threadId
 
       cleanupRealtimeChannels()
-      loading.value = true
+      beginLoading()
       error.value = null
+      replies.value = []
+      repliesNextCursor.value = null
+      currentReplySort.value = 'best'
 
       if (!threadId) {
         error.value = 'Missing thread identifier'
-        loading.value = false
+        endLoading()
         return null
       }
 
       // Accept both UUID and slug identifiers — the backend resolves by ID or slug
       if (!/^[\w-]+$/u.test(threadId)) {
         error.value = 'Invalid thread identifier format'
-        loading.value = false
+        endLoading()
         return null
       }
 
-      let isStale = false
-
       try {
         const response = await client.get<unknown>(`/v1/discussion/threads/${threadId}`)
 
         if (latestThreadId.value !== threadId) {
-          isStale = true
           return null
         }
 
@@ -1011,7 +1194,6 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         return currentThread.value
       } catch (err) {
         if (latestThreadId.value !== threadId) {
-          isStale = true
           return null
         }
 
@@ -1037,9 +1219,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
 
         throw err
       } finally {
-        if (!isStale) {
-          loading.value = false
-        }
+        endLoading()
       }
     }
 
@@ -1052,11 +1232,9 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         latestThreadId.value = threadId
       }
 
-      loading.value = true
+      beginLoading()
       error.value = null
 
-      let isStale = false
-
       try {
         const queryParts: string[] = []
         if (cursor) {
@@ -1070,7 +1248,6 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         const response = await client.get<unknown>(`/v1/discussion/threads/${threadId}/replies${queryString}`)
 
         if (latestThreadId.value !== threadId) {
-          isStale = true
           return undefined
         }
 
@@ -1139,7 +1316,6 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         return response.data
       } catch (err) {
         if (latestThreadId.value !== threadId) {
-          isStale = true
           return undefined
         }
 
@@ -1147,9 +1323,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to load replies')
         throw err
       } finally {
-        if (!isStale) {
-          loading.value = false
-        }
+        endLoading()
       }
     }
 
@@ -1168,10 +1342,19 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       if (existingReplyIndex !== -1) {
         const existingReply = replies.value[existingReplyIndex]
         if (existingReply) {
-          replies.value[existingReplyIndex] = {
+          const merged = {
             ...existingReply,
             ...reply,
           }
+
+          // Broadcast payloads lack an authenticated user context, so
+          // is_author is always false in them.  Preserve the value from
+          // the original authenticated API response when it was true.
+          if (hasReplyAuthorFlag(existingReply) && !hasReplyAuthorFlag(reply)) {
+            setReplyAuthorFlag(merged, true)
+          }
+
+          replies.value[existingReplyIndex] = merged
         }
 
         return false
@@ -1222,7 +1405,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       input: CreateThreadInput
     ): Promise<DiscussionCreateThreadResponse> {
       cleanupRealtimeChannels()
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -1253,12 +1436,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to create thread')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function loadTagCategories(query = ''): Promise<DiscussionTag[]> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -1293,7 +1476,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to load tag suggestions')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
@@ -1597,13 +1780,19 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         return
       }
 
-      replies.value[replyIndex] = normalizeReplyPayload(
-        {
-          ...existingReply,
-          ...payload,
-        },
-        existingReply
-      )
+      const merged = {
+        ...existingReply,
+        ...payload,
+      }
+
+      // Broadcast payloads lack an authenticated user context, so
+      // is_author is always false in them.  Preserve the value from
+      // the original authenticated API response when it was true.
+      if (hasReplyAuthorFlag(existingReply) && !hasReplyAuthorFlag(payload)) {
+        setReplyAuthorFlag(merged, true)
+      }
+
+      replies.value[replyIndex] = normalizeReplyPayload(merged, existingReply)
     }
 
     function handleRealtimeReplyReaction(payload: ReplyReactionRealtimePayload | null | undefined): void {
@@ -1741,8 +1930,14 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       }
     }
 
-    async function searchThreads(query: string, spaceSlug?: string): Promise<unknown> {
-      loading.value = true
+    async function searchThreads(
+      query: string,
+      spaceSlug?: string,
+      options?: {
+        signal?: AbortSignal
+      },
+    ): Promise<unknown> {
+      beginLoading()
       error.value = null
 
       try {
@@ -1751,33 +1946,49 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
           params.append('space', spaceSlug)
         }
 
-        const response = await client.get<unknown>(`/v1/discussion/search/threads?${params.toString()}`)
+        const requestConfig = options?.signal
+          ? { signal: options.signal }
+          : undefined
+        const response = await client.get<unknown>(`/v1/discussion/search/threads?${params.toString()}`, requestConfig)
         return response.data
       } catch (err) {
+        if (options?.signal?.aborted) {
+          return undefined
+        }
+
         logger.error('Failed to search threads:', err)
         error.value = getErrorMessage(err, 'Failed to search')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
-    async function searchThreadsInSpace(query: string, spaceId: string): Promise<Thread[]> {
+    async function searchThreadsInSpace(
+      query: string,
+      spaceId: string,
+      options?: {
+        signal?: AbortSignal
+      },
+    ): Promise<Thread[]> {
       const normalizedQuery = query.trim()
       if (normalizedQuery.length < 2) {
         return []
       }
 
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
+        const requestConfig = options?.signal
+          ? { signal: options.signal }
+          : undefined
         const response = await client.post<ThreadSearchResponseBody>('/v1/discussion/search', {
           query: normalizedQuery,
           space_id: spaceId,
           sort_by: 'relevance',
           limit: 50,
-        })
+        }, requestConfig)
 
         const rows = extractThreadSearchRows(response.data)
         if (rows.length > 0) {
@@ -1786,41 +1997,57 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
 
         return filterLoadedThreadsByQuery(normalizedQuery, spaceId)
       } catch (err) {
+        if (options?.signal?.aborted) {
+          return []
+        }
+
         logger.error('Failed to search threads in space:', err)
         error.value = isAxiosError(err)
           ? err.response?.data?.message ?? 'Failed to search threads'
           : 'Failed to search threads'
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
-    async function searchThreadsGlobally(query: string): Promise<Thread[]> {
+    async function searchThreadsGlobally(
+      query: string,
+      options?: {
+        signal?: AbortSignal
+      },
+    ): Promise<Thread[]> {
       const normalizedQuery = query.trim()
       if (normalizedQuery.length < 2) {
         return []
       }
 
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
+        const requestConfig = options?.signal
+          ? { signal: options.signal }
+          : undefined
         const response = await client.post<ThreadSearchResponseBody>('/v1/discussion/search', {
           query: normalizedQuery,
           sort_by: 'relevance',
           limit: 50,
-        })
+        }, requestConfig)
 
         return extractThreadSearchRows(response.data).map((row) => mapSearchRowToThread(row))
       } catch (err) {
+        if (options?.signal?.aborted) {
+          return []
+        }
+
         logger.error('Failed to search threads globally:', err)
         error.value = isAxiosError(err)
           ? err.response?.data?.message ?? 'Failed to search threads'
           : 'Failed to search threads'
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
@@ -1852,6 +2079,15 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         thread.slug = row.slug
       }
 
+      const spaceId = row.space_id ?? fallbackSpaceId ?? ''
+      if (typeof row.space_name === 'string' && typeof row.space_slug === 'string' && spaceId) {
+        thread.space = {
+          id: spaceId,
+          slug: row.space_slug,
+          name: row.space_name,
+        }
+      }
+
       return thread
     }
 
@@ -1897,7 +2133,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
     }
 
     async function setThreadPinned(threadId: string, pinned: boolean): Promise<void> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -1918,12 +2154,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to update pinned status')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function setThreadLocked(threadId: string, locked: boolean): Promise<void> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -1943,12 +2179,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to update locked status')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function moveThread(threadId: string, toSpaceSlug: string): Promise<void> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -1959,12 +2195,22 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         const responseData = toRecord(response.data)
         const movedThread = (responseData?.data ?? null) as Thread | null
         const destinationSpace = spaces.value.find((space) => space.slug === toSpaceSlug)
+        const destinationSpaceSummary = destinationSpace
+          ? {
+              id: destinationSpace.id,
+              slug: destinationSpace.slug,
+              name: destinationSpace.name,
+            }
+          : null
 
         if (currentThread.value?.id === threadId && currentThread.value) {
           currentThread.value = {
             ...currentThread.value,
             ...(movedThread ?? {}),
-            ...(destinationSpace ? { space_id: destinationSpace.id } : {}),
+            ...(destinationSpaceSummary ? {
+              space_id: destinationSpaceSummary.id,
+              space: destinationSpaceSummary,
+            } : {}),
           }
         }
 
@@ -1982,7 +2228,10 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
             threads.value[threadIndex] = {
               ...existingThread,
               ...(movedThread ?? {}),
-              ...(destinationSpace ? { space_id: destinationSpace.id } : {}),
+              ...(destinationSpaceSummary ? {
+                space_id: destinationSpaceSummary.id,
+                space: destinationSpaceSummary,
+              } : {}),
             }
           }
         }
@@ -1993,12 +2242,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to move thread')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function updateThread(threadId: string, updates: UpdateThreadInput): Promise<unknown> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -2031,12 +2280,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to update thread')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function deleteThread(threadId: string): Promise<unknown> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -2054,12 +2303,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to delete thread')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function restoreThread(threadId: string): Promise<Thread> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       try {
@@ -2102,12 +2351,12 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to restore thread')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
     async function deleteReply(replyId: string): Promise<void> {
-      loading.value = true
+      beginLoading()
       error.value = null
 
       const replyIndex = replies.value.findIndex((reply) => reply.id === replyId)
@@ -2171,7 +2420,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
         error.value = getErrorMessage(err, 'Failed to delete reply')
         throw err
       } finally {
-        loading.value = false
+        endLoading()
       }
     }
 
@@ -2432,16 +2681,23 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       spaceMembershipLoading,
       cleanupRealtimeChannels,
       threads,
+      browseThreadList,
+      currentBrowseMode,
       currentThread,
       replies,
+      currentReplySort,
       loading,
       error,
       nextCursor,
+      browseNextCursor,
       repliesNextCursor,
       spacesLoadingState,
       threadsLoadingState,
       repliesLoadingState,
       loadSpaces,
+      createSpace,
+      moveSpace,
+      reorderSpaces,
       loadSpaceDetail,
       loadSpaceMembership,
       joinSpace,
@@ -2451,6 +2707,7 @@ export function createDiscussionStoreDefinition(config: DiscussionStoreConfig) {
       rootSpaces,
       leafSpaces,
       loadThreads,
+      browseThreads,
       loadThread,
       loadReplies,
       createThread,