revert unneeded changes
This commit is contained in:
@@ -8,12 +8,16 @@ import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
|
|||||||
|
|
||||||
import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
|
import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
|
||||||
import {STALE} from '#/state/queries'
|
import {STALE} from '#/state/queries'
|
||||||
import {usePreferencesQuery} from '#/state/queries/preferences'
|
|
||||||
import {useAgent} from '#/state/session'
|
import {useAgent} from '#/state/session'
|
||||||
|
import {useModerationOpts} from '../preferences/moderation-opts'
|
||||||
import {DEFAULT_LOGGED_OUT_PREFERENCES} from './preferences'
|
import {DEFAULT_LOGGED_OUT_PREFERENCES} from './preferences'
|
||||||
|
|
||||||
|
const DEFAULT_MOD_OPTS = {
|
||||||
|
userDid: undefined,
|
||||||
|
prefs: DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
|
||||||
|
}
|
||||||
|
|
||||||
const RQKEY_ROOT = 'actor-autocomplete'
|
const RQKEY_ROOT = 'actor-autocomplete'
|
||||||
export const RQKEY = (prefix: string) => [RQKEY_ROOT, prefix]
|
export const RQKEY = (prefix: string) => [RQKEY_ROOT, prefix]
|
||||||
|
|
||||||
@@ -24,7 +28,6 @@ export function useActorAutocompleteQuery(
|
|||||||
) {
|
) {
|
||||||
const moderationOpts = useModerationOpts()
|
const moderationOpts = useModerationOpts()
|
||||||
const agent = useAgent()
|
const agent = useAgent()
|
||||||
const {data: preferences} = usePreferencesQuery()
|
|
||||||
|
|
||||||
prefix = prefix.toLowerCase().trim()
|
prefix = prefix.toLowerCase().trim()
|
||||||
if (prefix.endsWith('.')) {
|
if (prefix.endsWith('.')) {
|
||||||
@@ -49,15 +52,10 @@ export function useActorAutocompleteQuery(
|
|||||||
return computeSuggestions({
|
return computeSuggestions({
|
||||||
q: prefix,
|
q: prefix,
|
||||||
searched: data,
|
searched: data,
|
||||||
moderationOpts: moderationOpts || {
|
moderationOpts: moderationOpts || DEFAULT_MOD_OPTS,
|
||||||
userDid: undefined,
|
|
||||||
prefs:
|
|
||||||
preferences?.moderationPrefs ||
|
|
||||||
DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
[prefix, moderationOpts, preferences],
|
[prefix, moderationOpts],
|
||||||
),
|
),
|
||||||
placeholderData: maintainData ? keepPreviousData : undefined,
|
placeholderData: maintainData ? keepPreviousData : undefined,
|
||||||
})
|
})
|
||||||
@@ -68,7 +66,6 @@ export function useActorAutocompleteFn() {
|
|||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const moderationOpts = useModerationOpts()
|
const moderationOpts = useModerationOpts()
|
||||||
const agent = useAgent()
|
const agent = useAgent()
|
||||||
const {data: preferences} = usePreferencesQuery()
|
|
||||||
|
|
||||||
return React.useCallback(
|
return React.useCallback(
|
||||||
async ({query, limit = 8}: {query: string; limit?: number}) => {
|
async ({query, limit = 8}: {query: string; limit?: number}) => {
|
||||||
@@ -95,15 +92,10 @@ export function useActorAutocompleteFn() {
|
|||||||
return computeSuggestions({
|
return computeSuggestions({
|
||||||
q: query,
|
q: query,
|
||||||
searched: res?.data.actors,
|
searched: res?.data.actors,
|
||||||
moderationOpts: moderationOpts || {
|
moderationOpts: moderationOpts || DEFAULT_MOD_OPTS,
|
||||||
userDid: undefined,
|
|
||||||
prefs:
|
|
||||||
preferences?.moderationPrefs ||
|
|
||||||
DEFAULT_LOGGED_OUT_PREFERENCES.moderationPrefs,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
[queryClient, moderationOpts, agent, preferences],
|
[queryClient, moderationOpts, agent],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user