From 93809e45431d4ea5458c3b75d9ae7104e7e78698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Thu, 23 Oct 2025 14:07:54 +0200 Subject: [PATCH] pl-fe: auth gate some queries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-fe/src/components/status-action-bar.tsx | 2 +- packages/pl-fe/src/components/translate-button.tsx | 2 +- .../ui/components/panels/who-to-follow-panel.tsx | 2 +- .../src/queries/accounts/use-birthday-reminders.ts | 3 +++ .../queries/instance/use-translation-languages.ts | 7 +------ packages/pl-fe/src/queries/suggestions.ts | 12 ++++-------- packages/pl-fe/src/queries/trends.ts | 4 +--- 7 files changed, 12 insertions(+), 20 deletions(-) diff --git a/packages/pl-fe/src/components/status-action-bar.tsx b/packages/pl-fe/src/components/status-action-bar.tsx index ce32eee89..d7995f8d5 100644 --- a/packages/pl-fe/src/components/status-action-bar.tsx +++ b/packages/pl-fe/src/components/status-action-bar.tsx @@ -585,7 +585,7 @@ const MenuButton: React.FC = ({ const instance = useInstance(); const { autoTranslate, deleteModal, knownLanguages } = useSettings(); - const { translationLanguages } = useTranslationLanguages(); + const { data: translationLanguages = {} } = useTranslationLanguages(); const { mutate: reblogStatus } = useReblogStatus(status.id); const { mutate: unreblogStatus } = useUnreblogStatus(status.id); diff --git a/packages/pl-fe/src/components/translate-button.tsx b/packages/pl-fe/src/components/translate-button.tsx index 7f572a7f0..da907e7cd 100644 --- a/packages/pl-fe/src/components/translate-button.tsx +++ b/packages/pl-fe/src/components/translate-button.tsx @@ -27,7 +27,7 @@ const TranslateButton: React.FC = ({ status }) => { const knownLanguages = autoTranslate ? [...settings.knownLanguages, intl.locale] : [intl.locale]; const me = useAppSelector((state) => state.me); - const { translationLanguages } = useTranslationLanguages(); + const { data: translationLanguages = {} } = useTranslationLanguages(); const { fetchTranslation, hideTranslation } = useStatusMetaActions(); const { targetLanguage } = useStatusMeta(status.id); diff --git a/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx index c0de9bb02..328d9f585 100644 --- a/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx +++ b/packages/pl-fe/src/features/ui/components/panels/who-to-follow-panel.tsx @@ -23,7 +23,7 @@ const WhoToFollowPanel = ({ limit }: IWhoToFollowPanel) => { const features = useFeatures(); const intl = useIntl(); - const { data: suggestions, isFetching } = useSuggestions(); + const { data: suggestions = [], isFetching } = useSuggestions(); const dismissSuggestion = useDismissSuggestion(); const suggestionsToRender = suggestions.slice(0, limit); diff --git a/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts b/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts index e80405779..67f370ee1 100644 --- a/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts +++ b/packages/pl-fe/src/queries/accounts/use-birthday-reminders.ts @@ -4,10 +4,12 @@ import { useQuery } from '@tanstack/react-query'; import { importEntities } from 'pl-fe/actions/importer'; import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; import { useClient } from 'pl-fe/hooks/use-client'; +import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; const useBirthdayReminders = (month: number, day: number) => { const client = useClient(); const dispatch = useAppDispatch(); + const { isLoggedIn } = useLoggedIn(); return useQuery({ queryKey: ['accountsLists', 'birthdayReminders', month, day], @@ -16,6 +18,7 @@ const useBirthdayReminders = (month: number, day: number) => { return accounts.map(({ id }) => id); }), + enabled: isLoggedIn, }); }; diff --git a/packages/pl-fe/src/queries/instance/use-translation-languages.ts b/packages/pl-fe/src/queries/instance/use-translation-languages.ts index 0fcdc3fab..bf04fa77a 100644 --- a/packages/pl-fe/src/queries/instance/use-translation-languages.ts +++ b/packages/pl-fe/src/queries/instance/use-translation-languages.ts @@ -24,17 +24,12 @@ const useTranslationLanguages = () => { return client.instance.getInstanceTranslationLanguages(); }; - const { data, ...result } = useQuery({ + return useQuery({ queryKey: ['translationLanguages'], queryFn: getTranslationLanguages, placeholderData: {}, enabled: isLoggedIn && features.translations, }); - - return { - translationLanguages: data || {}, - ...result, - }; }; export { useTranslationLanguages }; diff --git a/packages/pl-fe/src/queries/suggestions.ts b/packages/pl-fe/src/queries/suggestions.ts index abdeccbae..0d8690e14 100644 --- a/packages/pl-fe/src/queries/suggestions.ts +++ b/packages/pl-fe/src/queries/suggestions.ts @@ -4,6 +4,7 @@ import { fetchRelationships } from 'pl-fe/actions/accounts'; import { importEntities } from 'pl-fe/actions/importer'; import { useAppDispatch } from 'pl-fe/hooks/use-app-dispatch'; import { useClient } from 'pl-fe/hooks/use-client'; +import { useLoggedIn } from 'pl-fe/hooks/use-logged-in'; import { removePageItem } from '../utils/queries'; @@ -14,6 +15,7 @@ const SuggestionKeys = { const useSuggestions = () => { const client = useClient(); const dispatch = useAppDispatch(); + const { isLoggedIn } = useLoggedIn(); const getSuggestions = async () => { const response = await client.myAccount.getSuggestions(); @@ -26,18 +28,12 @@ const useSuggestions = () => { return response.map(({ account, ...x }) => ({ ...x, account_id: account.id })); }; - const result = useQuery({ + return useQuery({ queryKey: SuggestionKeys.suggestions, queryFn: () => getSuggestions(), placeholderData: keepPreviousData, + enabled: isLoggedIn, }); - - const data = result.data; - - return { - ...result, - data: data || [], - }; }; const useDismissSuggestion = () => { diff --git a/packages/pl-fe/src/queries/trends.ts b/packages/pl-fe/src/queries/trends.ts index cfffe3018..6e22e4b67 100644 --- a/packages/pl-fe/src/queries/trends.ts +++ b/packages/pl-fe/src/queries/trends.ts @@ -11,15 +11,13 @@ const useTrends = () => { const features = useFeatures(); const { isLoggedIn } = useLoggedIn(); - const result = useQuery>({ + return useQuery>({ queryKey: ['trends', 'tags'], queryFn: () => client.trends.getTrendingTags(), placeholderData: [], staleTime: 600000, // 10 minutes enabled: isLoggedIn && features.trends, }); - - return result; }; export { useTrends as default };