zio/elk
2
0
Fork 0
Code Releases 2 Packages 1 Activity

refactor: sync masto (#1121)

Browse source
This commit is contained in:
三咲智子 Kevin Deng 2023-01-15 16:38:02 +08:00 • committed by GitHub
parent eb1f769e32
commit 4422a57f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 397 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

10
composables/masto/search.ts
View file

@ -22,7 +22,7 @@ export type SearchResult = HashTagSearchResult | AccountSearchResult | StatusSea
export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOptions = {}) {
const done = ref(false)
const masto = useMasto()
const { client } = $(useMasto())
const loading = ref(false)
const accounts = ref<AccountSearchResult[]>([])
const hashtags = ref<HashTagSearchResult[]>([])
@ -59,11 +59,11 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
}
watch(() => resolveUnref(query), () => {
loading.value = !!(q && isMastoInitialised.value)
loading.value = !!(q && isHydrated.value)
})
debouncedWatch(() => resolveUnref(query), async () => {
if (!q || !isMastoInitialised.value)
if (!q || !isHydrated.value)
return
loading.value = true
@ -72,7 +72,7 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
* Based on the source it seems like modifying the params when calling next would result in a new search,
* but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
*/
paginator = masto.v2.search({
paginator = client.v2.search({
q,
...resolveUnref(options),
resolve: !!currentUser.value,
@ -87,7 +87,7 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
}, { debounce: 300 })
const next = async () => {
if (!q || !isMastoInitialised.value || !paginator)
if (!q || !isHydrated.value || !paginator)
return
loading.value = true