diff --git a/src/api/hooks/accounts/useAccount.ts b/src/api/hooks/accounts/useAccount.ts index 5876e3fc5..17cdb35c8 100644 --- a/src/api/hooks/accounts/useAccount.ts +++ b/src/api/hooks/accounts/useAccount.ts @@ -3,7 +3,9 @@ import { useHistory } from 'react-router-dom'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { type Account, accountSchema } from 'soapbox/schemas/index.ts'; import { useRelationship } from './useRelationship.ts'; diff --git a/src/api/hooks/accounts/useAccountList.ts b/src/api/hooks/accounts/useAccountList.ts index 541227b1f..9d4d1392c 100644 --- a/src/api/hooks/accounts/useAccountList.ts +++ b/src/api/hooks/accounts/useAccountList.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { Account, accountSchema } from 'soapbox/schemas/index.ts'; import { useRelationships } from './useRelationships.ts'; diff --git a/src/api/hooks/accounts/useAccountLookup.ts b/src/api/hooks/accounts/useAccountLookup.ts index d317147cc..ad3605d27 100644 --- a/src/api/hooks/accounts/useAccountLookup.ts +++ b/src/api/hooks/accounts/useAccountLookup.ts @@ -3,7 +3,9 @@ import { useHistory } from 'react-router-dom'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntityLookup } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { type Account, accountSchema } from 'soapbox/schemas/index.ts'; import { useRelationship } from './useRelationship.ts'; diff --git a/src/api/hooks/accounts/useFollow.ts b/src/api/hooks/accounts/useFollow.ts index 142f73d8b..c0cce5c07 100644 --- a/src/api/hooks/accounts/useFollow.ts +++ b/src/api/hooks/accounts/useFollow.ts @@ -1,7 +1,9 @@ import { importEntities } from 'soapbox/entity-store/actions.ts'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useTransaction } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useAppDispatch, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { relationshipSchema } from 'soapbox/schemas/index.ts'; interface FollowOpts { diff --git a/src/api/hooks/accounts/usePatronUser.ts b/src/api/hooks/accounts/usePatronUser.ts index 9ccfe8b84..ff9eb58e2 100644 --- a/src/api/hooks/accounts/usePatronUser.ts +++ b/src/api/hooks/accounts/usePatronUser.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { type PatronUser, patronUserSchema } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/accounts/useRelationship.ts b/src/api/hooks/accounts/useRelationship.ts index d76446258..b1e80fad0 100644 --- a/src/api/hooks/accounts/useRelationship.ts +++ b/src/api/hooks/accounts/useRelationship.ts @@ -2,7 +2,7 @@ import { z } from 'zod'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { type Relationship, relationshipSchema } from 'soapbox/schemas/index.ts'; interface UseRelationshipOpts { diff --git a/src/api/hooks/accounts/useRelationships.ts b/src/api/hooks/accounts/useRelationships.ts index a88508a9c..fbded4a59 100644 --- a/src/api/hooks/accounts/useRelationships.ts +++ b/src/api/hooks/accounts/useRelationships.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useBatchedEntities } from 'soapbox/entity-store/hooks/useBatchedEntities.ts'; -import { useApi, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { type Relationship, relationshipSchema } from 'soapbox/schemas/index.ts'; function useRelationships(listKey: string[], ids: string[]) { diff --git a/src/api/hooks/admin/useAdminAccounts.ts b/src/api/hooks/admin/useAdminAccounts.ts index 59b0c040f..2c4b2bf42 100644 --- a/src/api/hooks/admin/useAdminAccounts.ts +++ b/src/api/hooks/admin/useAdminAccounts.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { adminAccountSchema } from 'soapbox/schemas/admin-account.ts'; interface MastodonAdminFilters { diff --git a/src/api/hooks/admin/useAnnouncements.ts b/src/api/hooks/admin/useAnnouncements.ts index 049800655..96544d5e0 100644 --- a/src/api/hooks/admin/useAnnouncements.ts +++ b/src/api/hooks/admin/useAnnouncements.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { adminAnnouncementSchema, type AdminAnnouncement } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/admin/useCreateDomain.ts b/src/api/hooks/admin/useCreateDomain.ts index c07f49619..3fc066920 100644 --- a/src/api/hooks/admin/useCreateDomain.ts +++ b/src/api/hooks/admin/useCreateDomain.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useCreateEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { domainSchema } from 'soapbox/schemas/index.ts'; interface CreateDomainParams { diff --git a/src/api/hooks/admin/useDeleteDomain.ts b/src/api/hooks/admin/useDeleteDomain.ts index 85ad41c8e..7e05c6bc1 100644 --- a/src/api/hooks/admin/useDeleteDomain.ts +++ b/src/api/hooks/admin/useDeleteDomain.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useDeleteEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; const useDeleteDomain = () => { const api = useApi(); diff --git a/src/api/hooks/admin/useDomains.ts b/src/api/hooks/admin/useDomains.ts index 167e8d398..8312b038b 100644 --- a/src/api/hooks/admin/useDomains.ts +++ b/src/api/hooks/admin/useDomains.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { domainSchema, type Domain } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/admin/useManageZapSplit.ts b/src/api/hooks/admin/useManageZapSplit.ts index e6a8420f6..5a891e600 100644 --- a/src/api/hooks/admin/useManageZapSplit.ts +++ b/src/api/hooks/admin/useManageZapSplit.ts @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import { defineMessages } from 'react-intl'; import { type INewAccount } from 'soapbox/features/admin/manage-zap-split.tsx'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { baseZapAccountSchema, ZapSplitData } from 'soapbox/schemas/zap-split.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/api/hooks/admin/useModerationLog.ts b/src/api/hooks/admin/useModerationLog.ts index 9e7c7bc4b..3c3408927 100644 --- a/src/api/hooks/admin/useModerationLog.ts +++ b/src/api/hooks/admin/useModerationLog.ts @@ -1,6 +1,6 @@ import { useInfiniteQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { moderationLogEntrySchema, type ModerationLogEntry } from 'soapbox/schemas/index.ts'; interface ModerationLogResult { diff --git a/src/api/hooks/admin/useRelays.ts b/src/api/hooks/admin/useRelays.ts index 1a1d57099..ee119caa1 100644 --- a/src/api/hooks/admin/useRelays.ts +++ b/src/api/hooks/admin/useRelays.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { relaySchema, type Relay } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/admin/useRules.ts b/src/api/hooks/admin/useRules.ts index c7c1db0c5..4cce7129a 100644 --- a/src/api/hooks/admin/useRules.ts +++ b/src/api/hooks/admin/useRules.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { adminRuleSchema, type AdminRule } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/admin/useSuggest.ts b/src/api/hooks/admin/useSuggest.ts index 5358e2771..46a2727ed 100644 --- a/src/api/hooks/admin/useSuggest.ts +++ b/src/api/hooks/admin/useSuggest.ts @@ -1,6 +1,7 @@ import { useTransaction } from 'soapbox/entity-store/hooks/index.ts'; import { EntityCallbacks } from 'soapbox/entity-store/hooks/types.ts'; -import { useApi, useGetState } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useGetState } from 'soapbox/hooks/useGetState.ts'; import { accountIdsToAccts } from 'soapbox/selectors/index.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/admin/useUpdateDomain.ts b/src/api/hooks/admin/useUpdateDomain.ts index 30c639112..8ac43cc97 100644 --- a/src/api/hooks/admin/useUpdateDomain.ts +++ b/src/api/hooks/admin/useUpdateDomain.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useCreateEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { domainSchema } from 'soapbox/schemas/index.ts'; import type { CreateDomainParams } from './useCreateDomain.ts'; diff --git a/src/api/hooks/admin/useVerify.ts b/src/api/hooks/admin/useVerify.ts index ee2da73cb..4fee04daa 100644 --- a/src/api/hooks/admin/useVerify.ts +++ b/src/api/hooks/admin/useVerify.ts @@ -1,6 +1,7 @@ import { useTransaction } from 'soapbox/entity-store/hooks/index.ts'; import { EntityCallbacks } from 'soapbox/entity-store/hooks/types.ts'; -import { useApi, useGetState } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useGetState } from 'soapbox/hooks/useGetState.ts'; import { accountIdsToAccts } from 'soapbox/selectors/index.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/announcements/useAnnouncements.ts b/src/api/hooks/announcements/useAnnouncements.ts index 1ecbdf8b6..b83946579 100644 --- a/src/api/hooks/announcements/useAnnouncements.ts +++ b/src/api/hooks/announcements/useAnnouncements.ts @@ -1,6 +1,6 @@ import { useMutation, useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { announcementReactionSchema, announcementSchema, type Announcement, type AnnouncementReaction } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/captcha/useCaptcha.ts b/src/api/hooks/captcha/useCaptcha.ts index a3509dbd5..d5d9e6339 100644 --- a/src/api/hooks/captcha/useCaptcha.ts +++ b/src/api/hooks/captcha/useCaptcha.ts @@ -3,7 +3,9 @@ import { useEffect, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; import { closeModal } from 'soapbox/actions/modals.ts'; -import { useApi, useAppDispatch, useInstance } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { captchaSchema, type CaptchaData } from 'soapbox/schemas/captcha.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/api/hooks/groups/useCancelMembershipRequest.ts b/src/api/hooks/groups/useCancelMembershipRequest.ts index 59e2943ce..032cb71b6 100644 --- a/src/api/hooks/groups/useCancelMembershipRequest.ts +++ b/src/api/hooks/groups/useCancelMembershipRequest.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useCreateEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import type { Group } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/groups/useDeleteGroupStatus.ts b/src/api/hooks/groups/useDeleteGroupStatus.ts index ed2d610af..95874dc95 100644 --- a/src/api/hooks/groups/useDeleteGroupStatus.ts +++ b/src/api/hooks/groups/useDeleteGroupStatus.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useDeleteEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import type { Group } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/groups/useGroup.ts b/src/api/hooks/groups/useGroup.ts index b437936c3..5da2c4ce5 100644 --- a/src/api/hooks/groups/useGroup.ts +++ b/src/api/hooks/groups/useGroup.ts @@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { type Group, groupSchema } from 'soapbox/schemas/index.ts'; import { useGroupRelationship } from './useGroupRelationship.ts'; diff --git a/src/api/hooks/groups/useGroupMembershipRequests.ts b/src/api/hooks/groups/useGroupMembershipRequests.ts index 6d0771c12..073dfb600 100644 --- a/src/api/hooks/groups/useGroupMembershipRequests.ts +++ b/src/api/hooks/groups/useGroupMembershipRequests.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useDismissEntity, useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import { accountSchema } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/groups/useGroupMutes.ts b/src/api/hooks/groups/useGroupMutes.ts index 7b1364915..13120197c 100644 --- a/src/api/hooks/groups/useGroupMutes.ts +++ b/src/api/hooks/groups/useGroupMutes.ts @@ -1,7 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useFeatures } from 'soapbox/hooks/index.ts'; import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { groupSchema } from 'soapbox/schemas/index.ts'; import type { Group } from 'soapbox/schemas/index.ts'; diff --git a/src/api/hooks/groups/useGroupRelationship.ts b/src/api/hooks/groups/useGroupRelationship.ts index b7846be22..242343674 100644 --- a/src/api/hooks/groups/useGroupRelationship.ts +++ b/src/api/hooks/groups/useGroupRelationship.ts @@ -2,7 +2,7 @@ import { z } from 'zod'; import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas/index.ts'; function useGroupRelationship(groupId: string | undefined) { diff --git a/src/api/hooks/groups/useGroupRelationships.ts b/src/api/hooks/groups/useGroupRelationships.ts index cee6b4f81..2d2dd0321 100644 --- a/src/api/hooks/groups/useGroupRelationships.ts +++ b/src/api/hooks/groups/useGroupRelationships.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useBatchedEntities } from 'soapbox/entity-store/hooks/useBatchedEntities.ts'; -import { useApi, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas/index.ts'; function useGroupRelationships(listKey: string[], ids: string[]) { diff --git a/src/api/hooks/groups/useGroupSearch.ts b/src/api/hooks/groups/useGroupSearch.ts index c13f27b67..6410d902c 100644 --- a/src/api/hooks/groups/useGroupSearch.ts +++ b/src/api/hooks/groups/useGroupSearch.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { groupSchema } from 'soapbox/schemas/index.ts'; import { useGroupRelationships } from './useGroupRelationships.ts'; diff --git a/src/api/hooks/groups/useGroupTag.ts b/src/api/hooks/groups/useGroupTag.ts index 446b3b492..7ed7ac6a1 100644 --- a/src/api/hooks/groups/useGroupTag.ts +++ b/src/api/hooks/groups/useGroupTag.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { type GroupTag, groupTagSchema } from 'soapbox/schemas/index.ts'; function useGroupTag(tagId: string) { diff --git a/src/api/hooks/groups/useGroups.ts b/src/api/hooks/groups/useGroups.ts index 2f2c9de2f..412334290 100644 --- a/src/api/hooks/groups/useGroups.ts +++ b/src/api/hooks/groups/useGroups.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { groupSchema, type Group } from 'soapbox/schemas/group.ts'; diff --git a/src/api/hooks/groups/useGroupsFromTag.ts b/src/api/hooks/groups/useGroupsFromTag.ts index c1b0bfa92..f3229b799 100644 --- a/src/api/hooks/groups/useGroupsFromTag.ts +++ b/src/api/hooks/groups/useGroupsFromTag.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { groupSchema } from 'soapbox/schemas/index.ts'; import { useGroupRelationships } from './useGroupRelationships.ts'; diff --git a/src/api/hooks/groups/usePendingGroups.ts b/src/api/hooks/groups/usePendingGroups.ts index 06c805362..5d4f30111 100644 --- a/src/api/hooks/groups/usePendingGroups.ts +++ b/src/api/hooks/groups/usePendingGroups.ts @@ -1,6 +1,8 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { Group, groupSchema } from 'soapbox/schemas/index.ts'; function usePendingGroups() { diff --git a/src/api/hooks/groups/usePopularTags.ts b/src/api/hooks/groups/usePopularTags.ts index 2126a57d2..a3d4fb617 100644 --- a/src/api/hooks/groups/usePopularTags.ts +++ b/src/api/hooks/groups/usePopularTags.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { type GroupTag, groupTagSchema } from 'soapbox/schemas/index.ts'; function usePopularTags() { diff --git a/src/api/hooks/groups/useSuggestedGroups.ts b/src/api/hooks/groups/useSuggestedGroups.ts index a54fbffd2..de0a64525 100644 --- a/src/api/hooks/groups/useSuggestedGroups.ts +++ b/src/api/hooks/groups/useSuggestedGroups.ts @@ -1,6 +1,7 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi, useFeatures } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { type Group, groupSchema } from 'soapbox/schemas/index.ts'; import { useGroupRelationships } from './useGroupRelationships.ts'; diff --git a/src/api/hooks/instance/useInstanceV1.ts b/src/api/hooks/instance/useInstanceV1.ts index 45b014fe9..1aef6cd29 100644 --- a/src/api/hooks/instance/useInstanceV1.ts +++ b/src/api/hooks/instance/useInstanceV1.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { InstanceV1, instanceV1Schema } from 'soapbox/schemas/instance.ts'; interface Opts { diff --git a/src/api/hooks/instance/useInstanceV2.ts b/src/api/hooks/instance/useInstanceV2.ts index 5667bf022..8c0518318 100644 --- a/src/api/hooks/instance/useInstanceV2.ts +++ b/src/api/hooks/instance/useInstanceV2.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { InstanceV2, instanceV2Schema } from 'soapbox/schemas/instance.ts'; interface Opts { diff --git a/src/api/hooks/statuses/useBookmarkFolder.ts b/src/api/hooks/statuses/useBookmarkFolder.ts index dd5e5fc56..4706a1550 100644 --- a/src/api/hooks/statuses/useBookmarkFolder.ts +++ b/src/api/hooks/statuses/useBookmarkFolder.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { selectEntity } from 'soapbox/entity-store/selectors.ts'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { type BookmarkFolder } from 'soapbox/schemas/bookmark-folder.ts'; import { useBookmarkFolders } from './useBookmarkFolders.ts'; diff --git a/src/api/hooks/statuses/useBookmarkFolders.ts b/src/api/hooks/statuses/useBookmarkFolders.ts index c48ac9e15..5b307f46c 100644 --- a/src/api/hooks/statuses/useBookmarkFolders.ts +++ b/src/api/hooks/statuses/useBookmarkFolders.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useEntities } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { bookmarkFolderSchema, type BookmarkFolder } from 'soapbox/schemas/bookmark-folder.ts'; diff --git a/src/api/hooks/statuses/useCreateBookmarkFolder.ts b/src/api/hooks/statuses/useCreateBookmarkFolder.ts index 477c1fe45..b80303c0b 100644 --- a/src/api/hooks/statuses/useCreateBookmarkFolder.ts +++ b/src/api/hooks/statuses/useCreateBookmarkFolder.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useCreateEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { bookmarkFolderSchema } from 'soapbox/schemas/bookmark-folder.ts'; interface CreateBookmarkFolderParams { diff --git a/src/api/hooks/statuses/useUpdateBookmarkFolder.ts b/src/api/hooks/statuses/useUpdateBookmarkFolder.ts index d21aac1f9..254d098a6 100644 --- a/src/api/hooks/statuses/useUpdateBookmarkFolder.ts +++ b/src/api/hooks/statuses/useUpdateBookmarkFolder.ts @@ -1,6 +1,6 @@ import { Entities } from 'soapbox/entity-store/entities.ts'; import { useCreateEntity } from 'soapbox/entity-store/hooks/index.ts'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { bookmarkFolderSchema } from 'soapbox/schemas/bookmark-folder.ts'; interface UpdateBookmarkFolderParams { diff --git a/src/api/hooks/streaming/useListStream.ts b/src/api/hooks/streaming/useListStream.ts index 4b859b8d6..e6808ffd8 100644 --- a/src/api/hooks/streaming/useListStream.ts +++ b/src/api/hooks/streaming/useListStream.ts @@ -1,4 +1,4 @@ -import { useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { useTimelineStream } from './useTimelineStream.ts'; diff --git a/src/api/hooks/streaming/useTimelineStream.ts b/src/api/hooks/streaming/useTimelineStream.ts index 8225e1da3..28aedbecf 100644 --- a/src/api/hooks/streaming/useTimelineStream.ts +++ b/src/api/hooks/streaming/useTimelineStream.ts @@ -1,7 +1,9 @@ import { useEffect, useRef } from 'react'; import { connectTimelineStream } from 'soapbox/actions/streaming.ts'; -import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { getAccessToken } from 'soapbox/utils/auth.ts'; function useTimelineStream(...args: Parameters) { diff --git a/src/api/hooks/streaming/useUserStream.ts b/src/api/hooks/streaming/useUserStream.ts index 9554917bc..1030403d2 100644 --- a/src/api/hooks/streaming/useUserStream.ts +++ b/src/api/hooks/streaming/useUserStream.ts @@ -1,7 +1,7 @@ import { expandNotifications } from 'soapbox/actions/notifications.ts'; import { expandHomeTimeline } from 'soapbox/actions/timelines.ts'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; -import { useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { useTimelineStream } from './useTimelineStream.ts'; diff --git a/src/api/hooks/zap-split/useZapSplit.ts b/src/api/hooks/zap-split/useZapSplit.ts index 3261907fe..773932d86 100644 --- a/src/api/hooks/zap-split/useZapSplit.ts +++ b/src/api/hooks/zap-split/useZapSplit.ts @@ -1,6 +1,6 @@ import { useState, useEffect } from 'react'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { baseZapAccountSchema, type ZapSplitData } from 'soapbox/schemas/zap-split.ts'; import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/components/account.tsx b/src/components/account.tsx index cb7b917f0..4dba320de 100644 --- a/src/components/account.tsx +++ b/src/components/account.tsx @@ -13,7 +13,7 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; import ActionButton from 'soapbox/features/ui/components/action-button.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { getAcct } from 'soapbox/utils/accounts.ts'; import { displayFqn } from 'soapbox/utils/state.ts'; diff --git a/src/components/animated-number.tsx b/src/components/animated-number.tsx index 123599246..42edcf5e3 100644 --- a/src/components/animated-number.tsx +++ b/src/components/animated-number.tsx @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { FormattedNumber } from 'react-intl'; import { TransitionMotion, spring } from 'react-motion'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; const obfuscatedCount = (count: number) => { if (count < 0) { diff --git a/src/components/announcements/announcement.tsx b/src/components/announcements/announcement.tsx index 7272d1c77..35aa9f4f1 100644 --- a/src/components/announcements/announcement.tsx +++ b/src/components/announcements/announcement.tsx @@ -2,7 +2,7 @@ import { FormattedDate } from 'react-intl'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { getTextDirection } from 'soapbox/utils/rtl.ts'; import AnnouncementContent from './announcement-content.tsx'; diff --git a/src/components/announcements/announcements-panel.tsx b/src/components/announcements/announcements-panel.tsx index 65412c1fe..5d6cb66e2 100644 --- a/src/components/announcements/announcements-panel.tsx +++ b/src/components/announcements/announcements-panel.tsx @@ -9,7 +9,7 @@ import { useAnnouncements } from 'soapbox/api/hooks/announcements/index.ts'; import { Card } from 'soapbox/components/ui/card.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Announcement from './announcement.tsx'; diff --git a/src/components/announcements/emoji.tsx b/src/components/announcements/emoji.tsx index eb267038c..927278484 100644 --- a/src/components/announcements/emoji.tsx +++ b/src/components/announcements/emoji.tsx @@ -1,5 +1,5 @@ import unicodeMapping from 'soapbox/features/emoji/mapping.ts'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { joinPublicPath } from 'soapbox/utils/static.ts'; import type { Map as ImmutableMap } from 'immutable'; diff --git a/src/components/announcements/reactions-bar.tsx b/src/components/announcements/reactions-bar.tsx index ed4a5756a..18f7243d4 100644 --- a/src/components/announcements/reactions-bar.tsx +++ b/src/components/announcements/reactions-bar.tsx @@ -3,7 +3,7 @@ import { TransitionMotion, spring } from 'react-motion'; import { useAnnouncements } from 'soapbox/api/hooks/announcements/index.ts'; import EmojiPickerDropdown from 'soapbox/features/emoji/containers/emoji-picker-dropdown-container.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import Reaction from './reaction.tsx'; diff --git a/src/components/attachment-thumbs.tsx b/src/components/attachment-thumbs.tsx index a0a97a5c8..4829b7688 100644 --- a/src/components/attachment-thumbs.tsx +++ b/src/components/attachment-thumbs.tsx @@ -2,7 +2,7 @@ import { Suspense } from 'react'; import { openModal } from 'soapbox/actions/modals.ts'; import { MediaGallery } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { List as ImmutableList } from 'immutable'; import type { Attachment } from 'soapbox/types/entities.ts'; diff --git a/src/components/autosuggest-account-input.tsx b/src/components/autosuggest-account-input.tsx index f0199e8d5..ecd3f8ae2 100644 --- a/src/components/autosuggest-account-input.tsx +++ b/src/components/autosuggest-account-input.tsx @@ -4,7 +4,7 @@ import { useState, useRef, useCallback, useEffect } from 'react'; import { accountSearch } from 'soapbox/actions/accounts.ts'; import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { Menu } from 'soapbox/components/dropdown-menu/index.ts'; import type { InputThemes } from 'soapbox/components/ui/input.tsx'; diff --git a/src/components/autosuggest-location.tsx b/src/components/autosuggest-location.tsx index 453ffc99e..f6df0a191 100644 --- a/src/components/autosuggest-location.tsx +++ b/src/components/autosuggest-location.tsx @@ -8,7 +8,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; export const ADDRESS_ICONS: Record = { house: homeIcon, diff --git a/src/components/avatar-stack.tsx b/src/components/avatar-stack.tsx index 6fc3d9b66..0163bc329 100644 --- a/src/components/avatar-stack.tsx +++ b/src/components/avatar-stack.tsx @@ -3,7 +3,7 @@ import { List as ImmutableList, OrderedSet as ImmutableOrderedSet } from 'immuta import Avatar from 'soapbox/components/ui/avatar.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetAccount } from 'soapbox/selectors/index.ts'; import type { Account } from 'soapbox/types/entities.ts'; diff --git a/src/components/birthday-input.tsx b/src/components/birthday-input.tsx index cab17abcc..b5737f650 100644 --- a/src/components/birthday-input.tsx +++ b/src/components/birthday-input.tsx @@ -1,7 +1,8 @@ import { useMemo } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useInstance, useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { Datetime } from './ui/datetime.tsx'; diff --git a/src/components/birthday-panel.tsx b/src/components/birthday-panel.tsx index 1278ce981..9235752df 100644 --- a/src/components/birthday-panel.tsx +++ b/src/components/birthday-panel.tsx @@ -5,7 +5,8 @@ import { FormattedMessage } from 'react-intl'; import { fetchBirthdayReminders } from 'soapbox/actions/accounts.ts'; import Widget from 'soapbox/components/ui/widget.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const timeToMidnight = () => { const now = new Date(); diff --git a/src/components/display-name-inline.tsx b/src/components/display-name-inline.tsx index d0bf71513..356deca27 100644 --- a/src/components/display-name-inline.tsx +++ b/src/components/display-name-inline.tsx @@ -1,6 +1,6 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { getAcct } from '../utils/accounts.ts'; diff --git a/src/components/display-name.tsx b/src/components/display-name.tsx index a57f66b3e..3d8c7ef9c 100644 --- a/src/components/display-name.tsx +++ b/src/components/display-name.tsx @@ -1,7 +1,7 @@ import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { getAcct } from '../utils/accounts.ts'; diff --git a/src/components/domain.tsx b/src/components/domain.tsx index 220a4f80f..81a9f5938 100644 --- a/src/components/domain.tsx +++ b/src/components/domain.tsx @@ -5,7 +5,7 @@ import { unblockDomain } from 'soapbox/actions/domain-blocks.ts'; import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const messages = defineMessages({ blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' }, diff --git a/src/components/dropdown-menu/dropdown-menu.tsx b/src/components/dropdown-menu/dropdown-menu.tsx index bc4f8e424..161d92307 100644 --- a/src/components/dropdown-menu/dropdown-menu.tsx +++ b/src/components/dropdown-menu/dropdown-menu.tsx @@ -9,7 +9,7 @@ import { closeDropdownMenu as closeDropdownMenuRedux, openDropdownMenu } from 's import { closeModal, openModal } from 'soapbox/actions/modals.ts'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Portal from 'soapbox/components/ui/portal.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { userTouching } from 'soapbox/is-mobile.ts'; import DropdownMenuItem, { MenuItem } from './dropdown-menu-item.tsx'; diff --git a/src/components/event-preview.tsx b/src/components/event-preview.tsx index e10e194dc..7eddcf061 100644 --- a/src/components/event-preview.tsx +++ b/src/components/event-preview.tsx @@ -9,7 +9,7 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import EventActionButton from 'soapbox/features/event/components/event-action-button.tsx'; import EventDate from 'soapbox/features/event/components/event-date.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Icon from './icon.tsx'; import VerificationBadge from './verification-badge.tsx'; diff --git a/src/components/gdpr-banner.tsx b/src/components/gdpr-banner.tsx index 5622f7972..8e723b903 100644 --- a/src/components/gdpr-banner.tsx +++ b/src/components/gdpr-banner.tsx @@ -7,7 +7,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useInstance, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; const acceptedGdpr = !!localStorage.getItem('soapbox:gdpr'); diff --git a/src/components/helmet.tsx b/src/components/helmet.tsx index 286ad79dd..1a664ba93 100644 --- a/src/components/helmet.tsx +++ b/src/components/helmet.tsx @@ -2,7 +2,9 @@ import { useMemo, useEffect } from 'react'; import { Helmet as ReactHelmet } from 'react-helmet'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; -import { useAppSelector, useInstance, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { RootState } from 'soapbox/store.ts'; import FaviconService from 'soapbox/utils/favicon-service.ts'; diff --git a/src/components/hover-ref-wrapper.tsx b/src/components/hover-ref-wrapper.tsx index 4e175533b..c1e1173b4 100644 --- a/src/components/hover-ref-wrapper.tsx +++ b/src/components/hover-ref-wrapper.tsx @@ -7,7 +7,7 @@ import { openProfileHoverCard, closeProfileHoverCard, } from 'soapbox/actions/profile-hover-card.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { isMobile } from 'soapbox/is-mobile.ts'; const showProfileHoverCard = debounce((dispatch, ref, accountId) => { diff --git a/src/components/location-search.tsx b/src/components/location-search.tsx index ca476f8a3..124b19ba6 100644 --- a/src/components/location-search.tsx +++ b/src/components/location-search.tsx @@ -9,7 +9,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { locationSearch } from 'soapbox/actions/events.ts'; import AutosuggestInput, { AutoSuggestion } from 'soapbox/components/autosuggest-input.tsx'; import Icon from 'soapbox/components/icon.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import AutosuggestLocation from './autosuggest-location.tsx'; diff --git a/src/components/media-gallery.tsx b/src/components/media-gallery.tsx index 8a02ccc23..085d95e61 100644 --- a/src/components/media-gallery.tsx +++ b/src/components/media-gallery.tsx @@ -6,7 +6,8 @@ import { useState, useRef, useLayoutEffect, CSSProperties } from 'react'; import Blurhash from 'soapbox/components/blurhash.tsx'; import StillImage from 'soapbox/components/still-image.tsx'; import { MIMETYPE_ICONS } from 'soapbox/components/upload.tsx'; -import { useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { Attachment } from 'soapbox/types/entities.ts'; import { truncateFilename } from 'soapbox/utils/media.ts'; diff --git a/src/components/modal-root.tsx b/src/components/modal-root.tsx index 31388efd0..c2f077c65 100644 --- a/src/components/modal-root.tsx +++ b/src/components/modal-root.tsx @@ -7,7 +7,8 @@ import { useHistory } from 'react-router-dom'; import { cancelReplyCompose } from 'soapbox/actions/compose.ts'; import { cancelEventCompose } from 'soapbox/actions/events.ts'; import { openModal, closeModal } from 'soapbox/actions/modals.ts'; -import { useAppDispatch, usePrevious } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { usePrevious } from 'soapbox/hooks/usePrevious.ts'; import type { ModalType } from 'soapbox/features/ui/components/modal-root.tsx'; import type { ReducerRecord as ReducerComposeEvent } from 'soapbox/reducers/compose-event.ts'; diff --git a/src/components/navlinks.tsx b/src/components/navlinks.tsx index f26ade226..d21dea832 100644 --- a/src/components/navlinks.tsx +++ b/src/components/navlinks.tsx @@ -1,7 +1,8 @@ import { Link } from 'react-router-dom'; import Text from 'soapbox/components/ui/text.tsx'; -import { useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; interface INavlinks { type: string; diff --git a/src/components/polls/poll-footer.tsx b/src/components/polls/poll-footer.tsx index e0e5d41cb..4722a3eff 100644 --- a/src/components/polls/poll-footer.tsx +++ b/src/components/polls/poll-footer.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { Poll as PollEntity } from 'soapbox/types/entities.ts'; diff --git a/src/components/polls/poll.tsx b/src/components/polls/poll.tsx index 9bfa30d32..382f4b3cf 100644 --- a/src/components/polls/poll.tsx +++ b/src/components/polls/poll.tsx @@ -5,7 +5,8 @@ import { openModal } from 'soapbox/actions/modals.ts'; import { vote } from 'soapbox/actions/polls.ts'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import PollFooter from './poll-footer.tsx'; import PollOption from './poll-option.tsx'; diff --git a/src/components/profile-hover-card.tsx b/src/components/profile-hover-card.tsx index 2c2e05c5a..c6b9eae76 100644 --- a/src/components/profile-hover-card.tsx +++ b/src/components/profile-hover-card.tsx @@ -20,7 +20,8 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import ActionButton from 'soapbox/features/ui/components/action-button.tsx'; import { UserPanel } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { showProfileHoverCard } from './hover-ref-wrapper.tsx'; import { dateFormatOptions } from './relative-timestamp.tsx'; diff --git a/src/components/quoted-status-indicator.tsx b/src/components/quoted-status-indicator.tsx index 9c589087d..0444c9a76 100644 --- a/src/components/quoted-status-indicator.tsx +++ b/src/components/quoted-status-indicator.tsx @@ -4,7 +4,7 @@ import { useCallback } from 'react'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; interface IQuotedStatusIndicator { diff --git a/src/components/quoted-status.tsx b/src/components/quoted-status.tsx index 4afd496ae..657240f3b 100644 --- a/src/components/quoted-status.tsx +++ b/src/components/quoted-status.tsx @@ -7,7 +7,7 @@ import { useHistory } from 'react-router-dom'; import StatusMedia from 'soapbox/components/status-media.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { defaultMediaVisibility } from 'soapbox/utils/status.ts'; import EventPreview from './event-preview.tsx'; diff --git a/src/components/scroll-top-button.tsx b/src/components/scroll-top-button.tsx index 88e6ee9f3..3bbaf4663 100644 --- a/src/components/scroll-top-button.tsx +++ b/src/components/scroll-top-button.tsx @@ -5,7 +5,7 @@ import { useIntl, MessageDescriptor } from 'react-intl'; import Icon from 'soapbox/components/ui/icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; interface IScrollTopButton { /** Callback when clicked, and also when scrolled to the top. */ diff --git a/src/components/scrollable-list.tsx b/src/components/scrollable-list.tsx index 4f5dc6f60..2b0f2dcb8 100644 --- a/src/components/scrollable-list.tsx +++ b/src/components/scrollable-list.tsx @@ -5,7 +5,7 @@ import { Virtuoso, Components, VirtuosoProps, VirtuosoHandle, ListRange, IndexLo import { Card } from 'soapbox/components/ui/card.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import LoadMore from './load-more.tsx'; diff --git a/src/components/sentry-feedback-form.tsx b/src/components/sentry-feedback-form.tsx index 6d5796ee8..ea1eb1db9 100644 --- a/src/components/sentry-feedback-form.tsx +++ b/src/components/sentry-feedback-form.tsx @@ -7,7 +7,7 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { captureSentryFeedback } from 'soapbox/sentry.ts'; interface ISentryFeedbackForm { diff --git a/src/components/sidebar-menu.tsx b/src/components/sidebar-menu.tsx index 6643ecd89..21e58efde 100644 --- a/src/components/sidebar-menu.tsx +++ b/src/components/sidebar-menu.tsx @@ -33,7 +33,10 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import ProfileStats from 'soapbox/features/ui/components/profile-stats.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts'; import { makeGetOtherAccounts } from 'soapbox/selectors/index.ts'; diff --git a/src/components/sidebar-navigation.tsx b/src/components/sidebar-navigation.tsx index bb87365d3..e5c857a2a 100644 --- a/src/components/sidebar-navigation.tsx +++ b/src/components/sidebar-navigation.tsx @@ -25,7 +25,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import Stack from 'soapbox/components/ui/stack.tsx'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; import ComposeButton from 'soapbox/features/ui/components/compose-button.tsx'; -import { useAppSelector, useFeatures, useOwnAccount, useSettings, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts'; import DropdownMenu, { Menu } from './dropdown-menu/index.ts'; diff --git a/src/components/site-error-boundary.tsx b/src/components/site-error-boundary.tsx index cc35977be..15186694b 100644 --- a/src/components/site-error-boundary.tsx +++ b/src/components/site-error-boundary.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { captureSentryException } from 'soapbox/sentry.ts'; import KVStore from 'soapbox/storage/kv-store.ts'; import sourceCode from 'soapbox/utils/code.ts'; diff --git a/src/components/site-logo.tsx b/src/components/site-logo.tsx index 4b1ebc323..eeaebe94d 100644 --- a/src/components/site-logo.tsx +++ b/src/components/site-logo.tsx @@ -2,7 +2,9 @@ import clsx from 'clsx'; import soapboxLogoWhiteSrc from 'soapbox/assets/images/soapbox-logo-white.svg'; import soapboxLogoSrc from 'soapbox/assets/images/soapbox-logo.svg'; -import { useSoapboxConfig, useSettings, useTheme } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; interface ISiteLogo extends React.ComponentProps<'img'> { /** Extra class names for the element. */ diff --git a/src/components/status-action-bar.tsx b/src/components/status-action-bar.tsx index 7de04b424..3878cd43d 100644 --- a/src/components/status-action-bar.tsx +++ b/src/components/status-action-bar.tsx @@ -50,7 +50,12 @@ import DropdownMenu from 'soapbox/components/dropdown-menu/index.ts'; import StatusActionButton from 'soapbox/components/status-action-button.tsx'; import StatusReactionWrapper from 'soapbox/components/status-reaction-wrapper.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; import copy from 'soapbox/utils/copy.ts'; diff --git a/src/components/status-hover-card.tsx b/src/components/status-hover-card.tsx index d6d04ceba..5c8990610 100644 --- a/src/components/status-hover-card.tsx +++ b/src/components/status-hover-card.tsx @@ -10,7 +10,8 @@ import { import { fetchStatus } from 'soapbox/actions/statuses.ts'; import { Card, CardBody } from 'soapbox/components/ui/card.tsx'; import StatusContainer from 'soapbox/containers/status-container.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { showStatusHoverCard } from './hover-status-wrapper.tsx'; diff --git a/src/components/status-list.tsx b/src/components/status-list.tsx index b634b703f..0afc1966d 100644 --- a/src/components/status-list.tsx +++ b/src/components/status-list.tsx @@ -9,7 +9,7 @@ import StatusContainer from 'soapbox/containers/status-container.tsx'; import FeedSuggestions from 'soapbox/features/feed-suggestions/feed-suggestions.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; import PendingStatus from 'soapbox/features/ui/components/pending-status.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; import type { VirtuosoHandle } from 'react-virtuoso'; diff --git a/src/components/status-media.tsx b/src/components/status-media.tsx index ad725ed1c..eba27de25 100644 --- a/src/components/status-media.tsx +++ b/src/components/status-media.tsx @@ -7,7 +7,7 @@ import PreviewCard from 'soapbox/components/preview-card.tsx'; import { GroupLinkPreview } from 'soapbox/features/groups/components/group-link-preview.tsx'; import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card.tsx'; import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { List as ImmutableList } from 'immutable'; import type { Status, Attachment } from 'soapbox/types/entities.ts'; diff --git a/src/components/status-reaction-wrapper.tsx b/src/components/status-reaction-wrapper.tsx index 134b21cba..d39de8297 100644 --- a/src/components/status-reaction-wrapper.tsx +++ b/src/components/status-reaction-wrapper.tsx @@ -4,7 +4,10 @@ import { simpleEmojiReact } from 'soapbox/actions/emoji-reacts.ts'; import { openModal } from 'soapbox/actions/modals.ts'; import EmojiSelector from 'soapbox/components/ui/emoji-selector.tsx'; import Portal from 'soapbox/components/ui/portal.tsx'; -import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { userTouching } from 'soapbox/is-mobile.ts'; import { getReactForStatus } from 'soapbox/utils/emoji-reacts.ts'; diff --git a/src/components/status-reply-mentions.tsx b/src/components/status-reply-mentions.tsx index 5179d8e7e..7e11bc86e 100644 --- a/src/components/status-reply-mentions.tsx +++ b/src/components/status-reply-mentions.tsx @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; import { openModal } from 'soapbox/actions/modals.ts'; import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper.tsx'; import HoverStatusWrapper from 'soapbox/components/hover-status-wrapper.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { shortenNostr } from 'soapbox/utils/nostr.ts'; import type { Status } from 'soapbox/types/entities.ts'; diff --git a/src/components/status.tsx b/src/components/status.tsx index 70e38d033..212a508c8 100644 --- a/src/components/status.tsx +++ b/src/components/status.tsx @@ -18,7 +18,8 @@ import Text from 'soapbox/components/ui/text.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container.tsx'; import { HotKeys } from 'soapbox/features/ui/components/hotkeys.tsx'; -import { useAppDispatch, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { defaultMediaVisibility, textForScreenReader, getActualStatus } from 'soapbox/utils/status.ts'; import EventPreview from './event-preview.tsx'; diff --git a/src/components/statuses/sensitive-content-overlay.tsx b/src/components/statuses/sensitive-content-overlay.tsx index b7f103b83..fb0838296 100644 --- a/src/components/statuses/sensitive-content-overlay.tsx +++ b/src/components/statuses/sensitive-content-overlay.tsx @@ -13,7 +13,10 @@ import DropdownMenu from 'soapbox/components/dropdown-menu/index.ts'; import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useOwnAccount, useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { defaultMediaVisibility } from 'soapbox/utils/status.ts'; import type { Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/components/still-image.tsx b/src/components/still-image.tsx index f142e7c35..080d4533a 100644 --- a/src/components/still-image.tsx +++ b/src/components/still-image.tsx @@ -1,7 +1,7 @@ import clsx from 'clsx'; import { useRef } from 'react'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; export interface IStillImage { /** Image alt text. */ diff --git a/src/components/thumb-navigation.tsx b/src/components/thumb-navigation.tsx index cfa577c42..0ed1a51af 100644 --- a/src/components/thumb-navigation.tsx +++ b/src/components/thumb-navigation.tsx @@ -13,7 +13,9 @@ import { FormattedMessage } from 'react-intl'; import ThumbNavigationLink from 'soapbox/components/thumb-navigation-link.tsx'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; -import { useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; const ThumbNavigation: React.FC = (): JSX.Element => { const { account } = useOwnAccount(); diff --git a/src/components/translate-button.tsx b/src/components/translate-button.tsx index 452926a8f..b386d8967 100644 --- a/src/components/translate-button.tsx +++ b/src/components/translate-button.tsx @@ -5,7 +5,10 @@ import { translateStatus, undoStatusTranslation } from 'soapbox/actions/statuses import Button from 'soapbox/components/ui/button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import type { Status } from 'soapbox/types/entities.ts'; diff --git a/src/components/ui/carousel.tsx b/src/components/ui/carousel.tsx index 3bd7b5737..0935b3321 100644 --- a/src/components/ui/carousel.tsx +++ b/src/components/ui/carousel.tsx @@ -2,7 +2,7 @@ import chevronLeftIcon from '@tabler/icons/outline/chevron-left.svg'; import chevronRightIcon from '@tabler/icons/outline/chevron-right.svg'; import { useEffect, useState } from 'react'; -import { useDimensions } from 'soapbox/hooks/index.ts'; +import { useDimensions } from 'soapbox/hooks/useDimensions.ts'; import HStack from './hstack.tsx'; import Icon from './icon.tsx'; diff --git a/src/components/ui/column.tsx b/src/components/ui/column.tsx index 6dbb33a1b..92415faf8 100644 --- a/src/components/ui/column.tsx +++ b/src/components/ui/column.tsx @@ -4,7 +4,7 @@ import { forwardRef, useCallback, useEffect, useState } from 'react'; import { useHistory } from 'react-router-dom'; import Helmet from 'soapbox/components/helmet.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { Card, CardBody, CardHeader, CardTitle, type CardSizes } from './card.tsx'; diff --git a/src/components/ui/emoji-selector.tsx b/src/components/ui/emoji-selector.tsx index 997677bdc..77d0cea4c 100644 --- a/src/components/ui/emoji-selector.tsx +++ b/src/components/ui/emoji-selector.tsx @@ -7,7 +7,9 @@ import EmojiComponent from 'soapbox/components/ui/emoji.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import EmojiPickerDropdown from 'soapbox/features/emoji/components/emoji-picker-dropdown.tsx'; -import { useClickOutside, useFeatures, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useClickOutside } from 'soapbox/hooks/useClickOutside.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import type { Emoji } from 'soapbox/features/emoji/index.ts'; diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx index fa1f4d2f6..11bbcc66f 100644 --- a/src/components/ui/input.tsx +++ b/src/components/ui/input.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import React, { forwardRef, useCallback, useState } from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import { useLocale } from 'soapbox/hooks/index.ts'; +import { useLocale } from 'soapbox/hooks/useLocale.ts'; import { getTextDirection } from 'soapbox/utils/rtl.ts'; import Icon from './icon.tsx'; diff --git a/src/components/ui/language-dropdown.tsx b/src/components/ui/language-dropdown.tsx index 88c24c8f3..ee9f4638d 100644 --- a/src/components/ui/language-dropdown.tsx +++ b/src/components/ui/language-dropdown.tsx @@ -4,7 +4,7 @@ import { openDropdownMenu } from 'soapbox/actions/dropdown-menu.ts'; import DropdownMenu, { MenuItem } from 'soapbox/components/dropdown-menu/index.ts'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; import { languages } from 'soapbox/features/preferences/index.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; function formatLanguages(languageMap: Record) { const langCodes = Object.keys(languageMap).sort().map((sig) => { diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx index 94d1a7d02..cafa7ba94 100644 --- a/src/components/ui/textarea.tsx +++ b/src/components/ui/textarea.tsx @@ -2,7 +2,7 @@ import clsx from 'clsx'; import { forwardRef, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { useLocale } from 'soapbox/hooks/index.ts'; +import { useLocale } from 'soapbox/hooks/useLocale.ts'; import { getTextDirection } from 'soapbox/utils/rtl.ts'; import Stack from './stack.tsx'; diff --git a/src/components/upload.tsx b/src/components/upload.tsx index acf01b312..53aa79d91 100644 --- a/src/components/upload.tsx +++ b/src/components/upload.tsx @@ -22,7 +22,8 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Motion from 'soapbox/features/ui/util/optional-motion.tsx'; -import { useAppDispatch, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { Attachment } from 'soapbox/types/entities.ts'; export const MIMETYPE_ICONS: Record = { diff --git a/src/components/verification-badge.tsx b/src/components/verification-badge.tsx index 54158bdd7..b64ef163b 100644 --- a/src/components/verification-badge.tsx +++ b/src/components/verification-badge.tsx @@ -3,7 +3,7 @@ import { useIntl, defineMessages } from 'react-intl'; import verifiedIcon from 'soapbox/assets/icons/verified.svg'; import Icon from 'soapbox/components/ui/icon.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; const messages = defineMessages({ verified: { id: 'account.verified', defaultMessage: 'Verified Account' }, diff --git a/src/containers/status-container.tsx b/src/containers/status-container.tsx index 46ffff09a..8be001464 100644 --- a/src/containers/status-container.tsx +++ b/src/containers/status-container.tsx @@ -1,7 +1,7 @@ import { useCallback } from 'react'; import Status, { IStatus } from 'soapbox/components/status.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; interface IStatusContainer extends Omit { diff --git a/src/contexts/chat-context.tsx b/src/contexts/chat-context.tsx index 069320b75..be68d000e 100644 --- a/src/contexts/chat-context.tsx +++ b/src/contexts/chat-context.tsx @@ -2,7 +2,9 @@ import { createContext, useContext, useEffect, useMemo, useState } from 'react'; import { useHistory, useParams } from 'react-router-dom'; import { toggleMainWindow } from 'soapbox/actions/chats.ts'; -import { useAppDispatch, useOwnAccount, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { IChat, useChat } from 'soapbox/queries/chats.ts'; const ChatContext = createContext({ diff --git a/src/entity-store/selectors.ts b/src/entity-store/selectors.ts index 78aba6ff2..8499cb8d6 100644 --- a/src/entity-store/selectors.ts +++ b/src/entity-store/selectors.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { EntitiesPath } from './hooks/types.ts'; import type { Entity, EntityListState } from './types.ts'; diff --git a/src/features/about/index.tsx b/src/features/about/index.tsx index 132d1d03f..03c1994a1 100644 --- a/src/features/about/index.tsx +++ b/src/features/about/index.tsx @@ -5,7 +5,9 @@ import { useParams } from 'react-router-dom'; import { fetchAboutPage } from 'soapbox/actions/about.ts'; import { Navlinks } from 'soapbox/components/navlinks.tsx'; import { Card } from 'soapbox/components/ui/card.tsx'; -import { useSoapboxConfig, useSettings, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { languages } from '../preferences/index.tsx'; diff --git a/src/features/account-gallery/components/media-item.tsx b/src/features/account-gallery/components/media-item.tsx index e922a7203..ed751a393 100644 --- a/src/features/account-gallery/components/media-item.tsx +++ b/src/features/account-gallery/components/media-item.tsx @@ -6,7 +6,7 @@ import { useState } from 'react'; import Blurhash from 'soapbox/components/blurhash.tsx'; import StillImage from 'soapbox/components/still-image.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { isIOS } from 'soapbox/is-mobile.ts'; import type { Attachment } from 'soapbox/types/entities.ts'; diff --git a/src/features/account-gallery/index.tsx b/src/features/account-gallery/index.tsx index f9ef1b4a3..281ea821b 100644 --- a/src/features/account-gallery/index.tsx +++ b/src/features/account-gallery/index.tsx @@ -10,7 +10,8 @@ import LoadMore from 'soapbox/components/load-more.tsx'; import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { getAccountGallery } from 'soapbox/selectors/index.ts'; import MediaItem from './components/media-item.tsx'; diff --git a/src/features/account-timeline/index.tsx b/src/features/account-timeline/index.tsx index 319b5bb95..843809a4c 100644 --- a/src/features/account-timeline/index.tsx +++ b/src/features/account-timeline/index.tsx @@ -11,7 +11,11 @@ import StatusList from 'soapbox/components/status-list.tsx'; import { Card, CardBody } from 'soapbox/components/ui/card.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { makeGetStatusIds } from 'soapbox/selectors/index.ts'; const getStatusIds = makeGetStatusIds(); diff --git a/src/features/account/components/header.tsx b/src/features/account/components/header.tsx index ebe82c46f..76f8919a4 100644 --- a/src/features/account/components/header.tsx +++ b/src/features/account/components/header.tsx @@ -44,7 +44,10 @@ import VerificationBadge from 'soapbox/components/verification-badge.tsx'; import MovedNote from 'soapbox/features/account-timeline/components/moved-note.tsx'; import ActionButton from 'soapbox/features/ui/components/action-button.tsx'; import SubscriptionButton from 'soapbox/features/ui/components/subscription-button.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { normalizeAttachment } from 'soapbox/normalizers/index.ts'; import { ChatKeys, useChats } from 'soapbox/queries/chats.ts'; import { queryClient } from 'soapbox/queries/client.ts'; diff --git a/src/features/admin/announcements.tsx b/src/features/admin/announcements.tsx index b31a68a46..60e371b14 100644 --- a/src/features/admin/announcements.tsx +++ b/src/features/admin/announcements.tsx @@ -9,7 +9,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { AdminAnnouncement } from 'soapbox/schemas/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/admin/components/admin-tabs.tsx b/src/features/admin/components/admin-tabs.tsx index fb5c2bef4..32c635672 100644 --- a/src/features/admin/components/admin-tabs.tsx +++ b/src/features/admin/components/admin-tabs.tsx @@ -2,7 +2,7 @@ import { useIntl, defineMessages } from 'react-intl'; import { useRouteMatch } from 'react-router-dom'; import Tabs from 'soapbox/components/ui/tabs.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ dashboard: { id: 'admin_nav.dashboard', defaultMessage: 'Dashboard' }, diff --git a/src/features/admin/components/registration-mode-picker.tsx b/src/features/admin/components/registration-mode-picker.tsx index e9ee8a72d..2e027182e 100644 --- a/src/features/admin/components/registration-mode-picker.tsx +++ b/src/features/admin/components/registration-mode-picker.tsx @@ -2,7 +2,8 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { updateConfig } from 'soapbox/actions/admin.ts'; import { RadioGroup, RadioItem } from 'soapbox/components/radio.tsx'; -import { useAppDispatch, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { InstanceV2 } from 'soapbox/schemas/instance.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/admin/components/report-status.tsx b/src/features/admin/components/report-status.tsx index fb80750f1..33079ce37 100644 --- a/src/features/admin/components/report-status.tsx +++ b/src/features/admin/components/report-status.tsx @@ -9,7 +9,7 @@ import StatusContent from 'soapbox/components/status-content.tsx'; import StatusMedia from 'soapbox/components/status-media.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { AdminReport, Status } from 'soapbox/types/entities.ts'; diff --git a/src/features/admin/components/report.tsx b/src/features/admin/components/report.tsx index 5bb8f2cce..42c8b1f52 100644 --- a/src/features/admin/components/report.tsx +++ b/src/features/admin/components/report.tsx @@ -15,7 +15,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetReport } from 'soapbox/selectors/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/admin/components/unapproved-account.tsx b/src/features/admin/components/unapproved-account.tsx index 0338789e9..a11019e38 100644 --- a/src/features/admin/components/unapproved-account.tsx +++ b/src/features/admin/components/unapproved-account.tsx @@ -2,7 +2,8 @@ import { approveUser, rejectUser } from 'soapbox/actions/admin.ts'; import { useAccount } from 'soapbox/api/hooks/index.ts'; import Account from 'soapbox/components/account.tsx'; import { AuthorizeRejectButtons } from 'soapbox/components/authorize-reject-buttons.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IUnapprovedAccount { accountId: string; diff --git a/src/features/admin/domains.tsx b/src/features/admin/domains.tsx index 5db2a1f96..a352c2bc0 100644 --- a/src/features/admin/domains.tsx +++ b/src/features/admin/domains.tsx @@ -11,7 +11,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import Indicator from '../developers/components/indicator.tsx'; diff --git a/src/features/admin/hooks/useAdminNostrRelays.ts b/src/features/admin/hooks/useAdminNostrRelays.ts index 8ef6326c7..5a8a06ef0 100644 --- a/src/features/admin/hooks/useAdminNostrRelays.ts +++ b/src/features/admin/hooks/useAdminNostrRelays.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query'; import { z } from 'zod'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; const relayEntitySchema = z.object({ url: z.string().url(), diff --git a/src/features/admin/index.tsx b/src/features/admin/index.tsx index 2e703aa8d..e6e33dcef 100644 --- a/src/features/admin/index.tsx +++ b/src/features/admin/index.tsx @@ -2,7 +2,7 @@ import { defineMessages, useIntl } from 'react-intl'; import { Switch, Route } from 'react-router-dom'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import AdminTabs from './components/admin-tabs.tsx'; import Waitlist from './tabs/awaiting-approval.tsx'; diff --git a/src/features/admin/nostr-relays.tsx b/src/features/admin/nostr-relays.tsx index 3c8a9320e..7d90c1c49 100644 --- a/src/features/admin/nostr-relays.tsx +++ b/src/features/admin/nostr-relays.tsx @@ -8,7 +8,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import RelayEditor, { RelayData } from 'soapbox/features/nostr-relays/components/relay-editor.tsx'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { useAdminNostrRelays } from './hooks/useAdminNostrRelays.ts'; diff --git a/src/features/admin/rules.tsx b/src/features/admin/rules.tsx index 150d960d3..515b90358 100644 --- a/src/features/admin/rules.tsx +++ b/src/features/admin/rules.tsx @@ -9,7 +9,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { AdminRule } from 'soapbox/schemas/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/admin/tabs/awaiting-approval.tsx b/src/features/admin/tabs/awaiting-approval.tsx index eead7067c..7fda9f6ab 100644 --- a/src/features/admin/tabs/awaiting-approval.tsx +++ b/src/features/admin/tabs/awaiting-approval.tsx @@ -3,7 +3,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { fetchUsers } from 'soapbox/actions/admin.ts'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import UnapprovedAccount from '../components/unapproved-account.tsx'; diff --git a/src/features/admin/tabs/dashboard.tsx b/src/features/admin/tabs/dashboard.tsx index e859acb11..74f1731f6 100644 --- a/src/features/admin/tabs/dashboard.tsx +++ b/src/features/admin/tabs/dashboard.tsx @@ -9,7 +9,9 @@ import { CardTitle } from 'soapbox/components/ui/card.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppDispatch, useOwnAccount, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import sourceCode from 'soapbox/utils/code.ts'; import { download } from 'soapbox/utils/download.ts'; import { parseVersion } from 'soapbox/utils/features.ts'; diff --git a/src/features/admin/tabs/reports.tsx b/src/features/admin/tabs/reports.tsx index 28f6f7874..55bc1c815 100644 --- a/src/features/admin/tabs/reports.tsx +++ b/src/features/admin/tabs/reports.tsx @@ -3,7 +3,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { fetchReports } from 'soapbox/actions/admin.ts'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Report from '../components/report.tsx'; diff --git a/src/features/aliases/components/account.tsx b/src/features/aliases/components/account.tsx index cd3153efe..8a208b64d 100644 --- a/src/features/aliases/components/account.tsx +++ b/src/features/aliases/components/account.tsx @@ -6,7 +6,9 @@ import { useAccount } from 'soapbox/api/hooks/index.ts'; import AccountComponent from 'soapbox/components/account.tsx'; import IconButton from 'soapbox/components/icon-button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; const messages = defineMessages({ add: { id: 'aliases.account.add', defaultMessage: 'Create alias' }, diff --git a/src/features/aliases/components/search.tsx b/src/features/aliases/components/search.tsx index 1d88b1f49..511c66a91 100644 --- a/src/features/aliases/components/search.tsx +++ b/src/features/aliases/components/search.tsx @@ -5,7 +5,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { fetchAliasesSuggestions, clearAliasesSuggestions, changeAliasesSuggestions } from 'soapbox/actions/aliases.ts'; import Icon from 'soapbox/components/icon.tsx'; import Button from 'soapbox/components/ui/button.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ search: { id: 'aliases.search', defaultMessage: 'Search your old account' }, diff --git a/src/features/aliases/index.tsx b/src/features/aliases/index.tsx index e078100a1..b2ecab4d6 100644 --- a/src/features/aliases/index.tsx +++ b/src/features/aliases/index.tsx @@ -9,7 +9,10 @@ import { CardHeader, CardTitle } from 'soapbox/components/ui/card.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import Account from './components/account.tsx'; import Search from './components/search.tsx'; diff --git a/src/features/auth-login/components/captcha.tsx b/src/features/auth-login/components/captcha.tsx index db350e39a..8c1bdf8cb 100644 --- a/src/features/auth-login/components/captcha.tsx +++ b/src/features/auth-login/components/captcha.tsx @@ -6,7 +6,7 @@ import { fetchCaptcha } from 'soapbox/actions/auth.ts'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { AxiosResponse } from 'axios'; diff --git a/src/features/auth-login/components/consumer-button.tsx b/src/features/auth-login/components/consumer-button.tsx index d16224d0c..a5f904e68 100644 --- a/src/features/auth-login/components/consumer-button.tsx +++ b/src/features/auth-login/components/consumer-button.tsx @@ -10,7 +10,7 @@ import { useIntl, defineMessages } from 'react-intl'; import { prepareRequest } from 'soapbox/actions/consumer-auth.ts'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { capitalize } from 'soapbox/utils/strings.ts'; const messages = defineMessages({ diff --git a/src/features/auth-login/components/consumers-list.tsx b/src/features/auth-login/components/consumers-list.tsx index 1869920c2..4b91c69bb 100644 --- a/src/features/auth-login/components/consumers-list.tsx +++ b/src/features/auth-login/components/consumers-list.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import { Card } from 'soapbox/components/ui/card.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import ConsumerButton from './consumer-button.tsx'; diff --git a/src/features/auth-login/components/login-form.tsx b/src/features/auth-login/components/login-form.tsx index 16e2e9761..2ab22fa40 100644 --- a/src/features/auth-login/components/login-form.tsx +++ b/src/features/auth-login/components/login-form.tsx @@ -6,7 +6,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; const messages = defineMessages({ username: { diff --git a/src/features/auth-login/components/login-page.tsx b/src/features/auth-login/components/login-page.tsx index e73776739..9fcdb9e7c 100644 --- a/src/features/auth-login/components/login-page.tsx +++ b/src/features/auth-login/components/login-page.tsx @@ -6,7 +6,10 @@ import { logIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth.ts import { fetchInstance } from 'soapbox/actions/instance.ts'; import { closeModal, openModal } from 'soapbox/actions/modals.ts'; import { BigCard } from 'soapbox/components/big-card.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { getRedirectUrl } from 'soapbox/utils/redirect.ts'; import ConsumersList from './consumers-list.tsx'; diff --git a/src/features/auth-login/components/otp-auth-form.tsx b/src/features/auth-login/components/otp-auth-form.tsx index 9779dc8a1..f5f524b9d 100644 --- a/src/features/auth-login/components/otp-auth-form.tsx +++ b/src/features/auth-login/components/otp-auth-form.tsx @@ -9,7 +9,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const messages = defineMessages({ otpCodeHint: { id: 'login.fields.otp_code_hint', defaultMessage: 'Enter the two-factor code generated by your phone app or use one of your recovery codes' }, diff --git a/src/features/auth-login/components/password-reset-confirm.tsx b/src/features/auth-login/components/password-reset-confirm.tsx index ff7ac175c..d3a29cb0b 100644 --- a/src/features/auth-login/components/password-reset-confirm.tsx +++ b/src/features/auth-login/components/password-reset-confirm.tsx @@ -9,7 +9,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const token = new URLSearchParams(window.location.search).get('reset_password_token'); diff --git a/src/features/auth-login/components/password-reset.tsx b/src/features/auth-login/components/password-reset.tsx index c7790cf6b..f5466b11b 100644 --- a/src/features/auth-login/components/password-reset.tsx +++ b/src/features/auth-login/components/password-reset.tsx @@ -9,7 +9,8 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/auth-login/components/registration-form.tsx b/src/features/auth-login/components/registration-form.tsx index 8ab3d2eb9..3609dbe8f 100644 --- a/src/features/auth-login/components/registration-form.tsx +++ b/src/features/auth-login/components/registration-form.tsx @@ -20,7 +20,10 @@ import Input from 'soapbox/components/ui/input.tsx'; import Select from 'soapbox/components/ui/select.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import CaptchaField from 'soapbox/features/auth-login/components/captcha.tsx'; -import { useAppDispatch, useSettings, useFeatures, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; const messages = defineMessages({ username: { id: 'registration.fields.username_placeholder', defaultMessage: 'Username' }, diff --git a/src/features/auth-login/components/registration-page.tsx b/src/features/auth-login/components/registration-page.tsx index 94e4e0adc..857ab3f3b 100644 --- a/src/features/auth-login/components/registration-page.tsx +++ b/src/features/auth-login/components/registration-page.tsx @@ -4,7 +4,10 @@ import { Redirect } from 'react-router-dom'; import { openModal } from 'soapbox/actions/modals.ts'; import { BigCard } from 'soapbox/components/big-card.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useFeatures, useInstance, useRegistrationStatus } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; import RegistrationForm from './registration-form.tsx'; diff --git a/src/features/auth-token-list/index.tsx b/src/features/auth-token-list/index.tsx index 31974734c..2e1532661 100644 --- a/src/features/auth-token-list/index.tsx +++ b/src/features/auth-token-list/index.tsx @@ -11,7 +11,8 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { Token } from 'soapbox/reducers/security.ts'; const messages = defineMessages({ diff --git a/src/features/backups/index.tsx b/src/features/backups/index.tsx index f1f80589f..df96afeff 100644 --- a/src/features/backups/index.tsx +++ b/src/features/backups/index.tsx @@ -10,7 +10,8 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { Backup as BackupEntity } from 'soapbox/reducers/backups.ts'; diff --git a/src/features/bookmark-folders/index.tsx b/src/features/bookmark-folders/index.tsx index 132f6be85..c48ae5925 100644 --- a/src/features/bookmark-folders/index.tsx +++ b/src/features/bookmark-folders/index.tsx @@ -11,7 +11,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import NewFolderForm from './components/new-folder-form.tsx'; diff --git a/src/features/bookmarks/index.tsx b/src/features/bookmarks/index.tsx index 17fac5245..0b1880e9d 100644 --- a/src/features/bookmarks/index.tsx +++ b/src/features/bookmarks/index.tsx @@ -14,8 +14,10 @@ import DropdownMenu from 'soapbox/components/dropdown-menu/index.ts'; import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import StatusList from 'soapbox/components/status-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useAppDispatch, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/chats/components/chat-composer.tsx b/src/features/chats/components/chat-composer.tsx index a940f0879..e7f2ce998 100644 --- a/src/features/chats/components/chat-composer.tsx +++ b/src/features/chats/components/chat-composer.tsx @@ -13,7 +13,9 @@ import Text from 'soapbox/components/ui/text.tsx'; import { useChatContext } from 'soapbox/contexts/chat-context.tsx'; import UploadButton from 'soapbox/features/compose/components/upload-button.tsx'; import emojiSearch from 'soapbox/features/emoji/search.ts'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { Attachment } from 'soapbox/types/entities.ts'; import { textAtCursorMatchesToken } from 'soapbox/utils/suggestions.ts'; diff --git a/src/features/chats/components/chat-list-item.tsx b/src/features/chats/components/chat-list-item.tsx index 60fb5eae8..fec072142 100644 --- a/src/features/chats/components/chat-list-item.tsx +++ b/src/features/chats/components/chat-list-item.tsx @@ -14,7 +14,9 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; import { useChatContext } from 'soapbox/contexts/chat-context.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { IChat, useChatActions } from 'soapbox/queries/chats.ts'; import type { Menu } from 'soapbox/components/dropdown-menu/index.ts'; diff --git a/src/features/chats/components/chat-list.tsx b/src/features/chats/components/chat-list.tsx index c9388e740..1ae71b883 100644 --- a/src/features/chats/components/chat-list.tsx +++ b/src/features/chats/components/chat-list.tsx @@ -7,7 +7,7 @@ import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderChat from 'soapbox/features/placeholder/components/placeholder-chat.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { useChats } from 'soapbox/queries/chats.ts'; import ChatListItem from './chat-list-item.tsx'; diff --git a/src/features/chats/components/chat-message-list-intro.tsx b/src/features/chats/components/chat-message-list-intro.tsx index 69a4d970d..46c4274f9 100644 --- a/src/features/chats/components/chat-message-list-intro.tsx +++ b/src/features/chats/components/chat-message-list-intro.tsx @@ -12,7 +12,8 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import { useChatContext } from 'soapbox/contexts/chat-context.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { useChatActions } from 'soapbox/queries/chats.ts'; import { secondsToDays } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/chats/components/chat-message-list.tsx b/src/features/chats/components/chat-message-list.tsx index 0c3463eb9..f24c21912 100644 --- a/src/features/chats/components/chat-message-list.tsx +++ b/src/features/chats/components/chat-message-list.tsx @@ -9,7 +9,8 @@ import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import PlaceholderChatMessage from 'soapbox/features/placeholder/components/placeholder-chat-message.tsx'; -import { useAppSelector, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { IChat, useChatActions, useChatMessages } from 'soapbox/queries/chats.ts'; import ChatMessageListIntro from './chat-message-list-intro.tsx'; diff --git a/src/features/chats/components/chat-message.tsx b/src/features/chats/components/chat-message.tsx index 4b9b8b5e1..8e1f7e091 100644 --- a/src/features/chats/components/chat-message.tsx +++ b/src/features/chats/components/chat-message.tsx @@ -21,7 +21,9 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import emojify from 'soapbox/features/emoji/index.ts'; import { MediaGallery } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { ChatKeys, IChat, useChatActions } from 'soapbox/queries/chats.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { stripHTML } from 'soapbox/utils/html.ts'; diff --git a/src/features/chats/components/chat-page/chat-page.tsx b/src/features/chats/components/chat-page/chat-page.tsx index fa744ba17..c8443b655 100644 --- a/src/features/chats/components/chat-page/chat-page.tsx +++ b/src/features/chats/components/chat-page/chat-page.tsx @@ -3,7 +3,7 @@ import { useEffect, useLayoutEffect, useRef, useState } from 'react'; import { matchPath, Route, Switch, useHistory } from 'react-router-dom'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import ChatPageMain from './components/chat-page-main.tsx'; import ChatPageNew from './components/chat-page-new.tsx'; diff --git a/src/features/chats/components/chat-page/components/chat-page-main.tsx b/src/features/chats/components/chat-page/components/chat-page-main.tsx index f9b3abc57..a859766e0 100644 --- a/src/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/src/features/chats/components/chat-page/components/chat-page-main.tsx @@ -19,7 +19,9 @@ import Text from 'soapbox/components/ui/text.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; import { useChatContext } from 'soapbox/contexts/chat-context.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { MessageExpirationValues, useChat, useChatActions, useChats } from 'soapbox/queries/chats.ts'; import { secondsToDays } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/chats/components/chat-page/components/chat-page-settings.tsx b/src/features/chats/components/chat-page/components/chat-page-settings.tsx index fb883fe6f..8b1a26b73 100644 --- a/src/features/chats/components/chat-page/components/chat-page-settings.tsx +++ b/src/features/chats/components/chat-page/components/chat-page-settings.tsx @@ -13,7 +13,9 @@ import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import SettingToggle from 'soapbox/features/notifications/components/setting-toggle.tsx'; -import { useAppDispatch, useOwnAccount, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { useUpdateCredentials } from 'soapbox/queries/accounts.ts'; type FormData = { diff --git a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx index 82279ee85..f900007ea 100644 --- a/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx +++ b/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx @@ -8,7 +8,8 @@ import { CardTitle } from 'soapbox/components/ui/card.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useDebounce, useFeatures } from 'soapbox/hooks/index.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { IChat } from 'soapbox/queries/chats.ts'; import ChatList from '../../chat-list.tsx'; diff --git a/src/features/chats/components/chat-page/components/welcome.tsx b/src/features/chats/components/chat-page/components/welcome.tsx index 6b0c3c4f0..7fd76c834 100644 --- a/src/features/chats/components/chat-page/components/welcome.tsx +++ b/src/features/chats/components/chat-page/components/welcome.tsx @@ -8,7 +8,7 @@ import Form from 'soapbox/components/ui/form.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { useUpdateCredentials } from 'soapbox/queries/accounts.ts'; type FormData = { diff --git a/src/features/chats/components/chat-pane/chat-pane.tsx b/src/features/chats/components/chat-pane/chat-pane.tsx index 54e246003..c051aec68 100644 --- a/src/features/chats/components/chat-pane/chat-pane.tsx +++ b/src/features/chats/components/chat-pane/chat-pane.tsx @@ -5,7 +5,8 @@ import { FormattedMessage } from 'react-intl'; import Stack from 'soapbox/components/ui/stack.tsx'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context.tsx'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; -import { useDebounce, useFeatures } from 'soapbox/hooks/index.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { IChat, useChats } from 'soapbox/queries/chats.ts'; import ChatList from '../chat-list.tsx'; diff --git a/src/features/chats/components/chat-search/chat-search.tsx b/src/features/chats/components/chat-search/chat-search.tsx index d3faefdc9..98a735b42 100644 --- a/src/features/chats/components/chat-search/chat-search.tsx +++ b/src/features/chats/components/chat-search/chat-search.tsx @@ -10,7 +10,7 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context.tsx'; -import { useDebounce } from 'soapbox/hooks/index.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; import { useChats, ChatKeys } from 'soapbox/queries/chats.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import useAccountSearch from 'soapbox/queries/search.ts'; diff --git a/src/features/chats/components/chat-upload.tsx b/src/features/chats/components/chat-upload.tsx index da67e2074..4caf51998 100644 --- a/src/features/chats/components/chat-upload.tsx +++ b/src/features/chats/components/chat-upload.tsx @@ -5,7 +5,7 @@ import { List as ImmutableList } from 'immutable'; import { openModal } from 'soapbox/actions/modals.ts'; import Blurhash from 'soapbox/components/blurhash.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import ChatUploadPreview from './chat-upload-preview.tsx'; diff --git a/src/features/chats/components/chat-widget/chat-settings.tsx b/src/features/chats/components/chat-widget/chat-settings.tsx index ba96c53cc..1ec687cb3 100644 --- a/src/features/chats/components/chat-widget/chat-settings.tsx +++ b/src/features/chats/components/chat-widget/chat-settings.tsx @@ -13,7 +13,9 @@ import Select from 'soapbox/components/ui/select.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { messageExpirationOptions, MessageExpirationValues, useChatActions } from 'soapbox/queries/chats.ts'; import { secondsToDays } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/chats/components/chat-widget/chat-widget.tsx b/src/features/chats/components/chat-widget/chat-widget.tsx index 05d8f68f3..4ae193e6b 100644 --- a/src/features/chats/components/chat-widget/chat-widget.tsx +++ b/src/features/chats/components/chat-widget/chat-widget.tsx @@ -1,7 +1,7 @@ import { useHistory } from 'react-router-dom'; import { ChatProvider } from 'soapbox/contexts/chat-context.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import ChatPane from '../chat-pane/chat-pane.tsx'; diff --git a/src/features/chats/components/chat.tsx b/src/features/chats/components/chat.tsx index 0cf9898f6..821bd7555 100644 --- a/src/features/chats/components/chat.tsx +++ b/src/features/chats/components/chat.tsx @@ -5,7 +5,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { uploadMedia } from 'soapbox/actions/media.ts'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { normalizeAttachment } from 'soapbox/normalizers/index.ts'; import { IChat, useChatActions } from 'soapbox/queries/chats.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/community-timeline/index.tsx b/src/features/community-timeline/index.tsx index d01a8276e..3840b3468 100644 --- a/src/features/community-timeline/index.tsx +++ b/src/features/community-timeline/index.tsx @@ -5,8 +5,12 @@ import { expandCommunityTimeline } from 'soapbox/actions/timelines.ts'; import { useCommunityStream } from 'soapbox/api/hooks/index.ts'; import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useAppDispatch, useSettings, useTheme, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/compose/components/compose-form.tsx b/src/features/compose/components/compose-form.tsx index 1b369404d..fa693bb68 100644 --- a/src/features/compose/components/compose-form.tsx +++ b/src/features/compose/components/compose-form.tsx @@ -21,7 +21,13 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import EmojiPickerDropdown from 'soapbox/features/emoji/containers/emoji-picker-dropdown-container.tsx'; import { ComposeEditor } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles, useFeatures, useInstance, usePrevious } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { usePrevious } from 'soapbox/hooks/usePrevious.ts'; import QuotedStatusContainer from '../containers/quoted-status-container.tsx'; import ReplyIndicatorContainer from '../containers/reply-indicator-container.ts'; diff --git a/src/features/compose/components/markdown-button.tsx b/src/features/compose/components/markdown-button.tsx index 4ce407b94..15b4c5531 100644 --- a/src/features/compose/components/markdown-button.tsx +++ b/src/features/compose/components/markdown-button.tsx @@ -2,7 +2,8 @@ import markdownIcon from '@tabler/icons/outline/markdown.svg'; import { defineMessages, useIntl } from 'react-intl'; import { changeComposeContentType } from 'soapbox/actions/compose.ts'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import ComposeFormButton from './compose-form-button.tsx'; diff --git a/src/features/compose/components/poll-button.tsx b/src/features/compose/components/poll-button.tsx index a541b8851..96d642cf7 100644 --- a/src/features/compose/components/poll-button.tsx +++ b/src/features/compose/components/poll-button.tsx @@ -2,7 +2,8 @@ import chartBarIcon from '@tabler/icons/outline/chart-bar.svg'; import { defineMessages, useIntl } from 'react-intl'; import { addPoll, removePoll } from 'soapbox/actions/compose.ts'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import ComposeFormButton from './compose-form-button.tsx'; diff --git a/src/features/compose/components/polls/poll-form.tsx b/src/features/compose/components/polls/poll-form.tsx index bd7e2888b..4ef1043aa 100644 --- a/src/features/compose/components/polls/poll-form.tsx +++ b/src/features/compose/components/polls/poll-form.tsx @@ -8,7 +8,9 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch, useCompose, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import DurationSelector from './duration-selector.tsx'; diff --git a/src/features/compose/components/privacy-dropdown.tsx b/src/features/compose/components/privacy-dropdown.tsx index cb4a4ba8d..252a904bc 100644 --- a/src/features/compose/components/privacy-dropdown.tsx +++ b/src/features/compose/components/privacy-dropdown.tsx @@ -14,7 +14,8 @@ import { changeComposeVisibility } from 'soapbox/actions/compose.ts'; import { closeModal, openModal } from 'soapbox/actions/modals.ts'; import Icon from 'soapbox/components/icon.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import { userTouching } from 'soapbox/is-mobile.ts'; import Motion from '../../ui/util/optional-motion.tsx'; diff --git a/src/features/compose/components/reply-group-indicator.tsx b/src/features/compose/components/reply-group-indicator.tsx index 0dec91155..ae58dd341 100644 --- a/src/features/compose/components/reply-group-indicator.tsx +++ b/src/features/compose/components/reply-group-indicator.tsx @@ -3,7 +3,7 @@ import { FormattedMessage } from 'react-intl'; import Link from 'soapbox/components/link.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { Group } from 'soapbox/schemas/index.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; diff --git a/src/features/compose/components/reply-mentions.tsx b/src/features/compose/components/reply-mentions.tsx index d802e07ad..d0b7b3e06 100644 --- a/src/features/compose/components/reply-mentions.tsx +++ b/src/features/compose/components/reply-mentions.tsx @@ -2,7 +2,11 @@ import { useCallback } from 'react'; import { FormattedList, FormattedMessage } from 'react-intl'; import { openModal } from 'soapbox/actions/modals.ts'; -import { useAppDispatch, useAppSelector, useCompose, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { statusToMentionsAccountIdsArray } from 'soapbox/reducers/compose.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import { shortenNostr } from 'soapbox/utils/nostr.ts'; diff --git a/src/features/compose/components/schedule-button.tsx b/src/features/compose/components/schedule-button.tsx index fbb37fa98..17bb7efec 100644 --- a/src/features/compose/components/schedule-button.tsx +++ b/src/features/compose/components/schedule-button.tsx @@ -2,7 +2,8 @@ import calendarStatsIcon from '@tabler/icons/outline/calendar-stats.svg'; import { defineMessages, useIntl } from 'react-intl'; import { addSchedule, removeSchedule } from 'soapbox/actions/compose.ts'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import ComposeFormButton from './compose-form-button.tsx'; diff --git a/src/features/compose/components/schedule-form.tsx b/src/features/compose/components/schedule-form.tsx index a3ce3d23a..801d2b151 100644 --- a/src/features/compose/components/schedule-form.tsx +++ b/src/features/compose/components/schedule-form.tsx @@ -7,7 +7,8 @@ import { Datetime } from 'soapbox/components/ui/datetime.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; const messages = defineMessages({ schedule: { id: 'schedule.post_time', defaultMessage: 'Post Date/Time' }, diff --git a/src/features/compose/components/search-results.tsx b/src/features/compose/components/search-results.tsx index e2611aa4b..039a939be 100644 --- a/src/features/compose/components/search-results.tsx +++ b/src/features/compose/components/search-results.tsx @@ -18,7 +18,8 @@ import StatusContainer from 'soapbox/containers/status-container.tsx'; import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account.tsx'; import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder-hashtag.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { OrderedSet as ImmutableOrderedSet } from 'immutable'; import type { VirtuosoHandle } from 'react-virtuoso'; diff --git a/src/features/compose/components/search-zap-split.tsx b/src/features/compose/components/search-zap-split.tsx index 8b66eaa64..b5a63e6fb 100644 --- a/src/features/compose/components/search-zap-split.tsx +++ b/src/features/compose/components/search-zap-split.tsx @@ -15,7 +15,8 @@ import { import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { Account } from 'soapbox/schemas/index.ts'; import { selectAccount } from 'soapbox/selectors/index.ts'; import { RootState } from 'soapbox/store.ts'; diff --git a/src/features/compose/components/search.tsx b/src/features/compose/components/search.tsx index 3d43c1560..775cc7178 100644 --- a/src/features/compose/components/search.tsx +++ b/src/features/compose/components/search.tsx @@ -17,7 +17,8 @@ import { import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-input.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { selectAccount } from 'soapbox/selectors/index.ts'; import { AppDispatch, RootState } from 'soapbox/store.ts'; diff --git a/src/features/compose/components/spoiler-button.tsx b/src/features/compose/components/spoiler-button.tsx index 7e2dbf915..e23e497ac 100644 --- a/src/features/compose/components/spoiler-button.tsx +++ b/src/features/compose/components/spoiler-button.tsx @@ -2,7 +2,8 @@ import alertTriangleIcon from '@tabler/icons/outline/alert-triangle.svg'; import { defineMessages, useIntl } from 'react-intl'; import { changeComposeSpoilerness } from 'soapbox/actions/compose.ts'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import ComposeFormButton from './compose-form-button.tsx'; diff --git a/src/features/compose/components/spoiler-input.tsx b/src/features/compose/components/spoiler-input.tsx index b52fd953a..46b7b6e28 100644 --- a/src/features/compose/components/spoiler-input.tsx +++ b/src/features/compose/components/spoiler-input.tsx @@ -7,7 +7,8 @@ import AutosuggestInput, { IAutosuggestInput } from 'soapbox/components/autosugg import Divider from 'soapbox/components/ui/divider.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; const messages = defineMessages({ title: { id: 'compose_form.spoiler_title', defaultMessage: 'Sensitive content' }, diff --git a/src/features/compose/components/upload-button.tsx b/src/features/compose/components/upload-button.tsx index 04ae2452a..dc9a463d7 100644 --- a/src/features/compose/components/upload-button.tsx +++ b/src/features/compose/components/upload-button.tsx @@ -4,7 +4,7 @@ import { useRef } from 'react'; import { defineMessages, IntlShape, useIntl } from 'react-intl'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; const messages = defineMessages({ upload: { id: 'upload_button.label', defaultMessage: 'Add media attachment' }, diff --git a/src/features/compose/components/upload-form.tsx b/src/features/compose/components/upload-form.tsx index d4ceb0e83..290d0b3b8 100644 --- a/src/features/compose/components/upload-form.tsx +++ b/src/features/compose/components/upload-form.tsx @@ -3,7 +3,8 @@ import { useCallback, useRef } from 'react'; import { changeMediaOrder } from 'soapbox/actions/compose.ts'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import UploadProgress from './upload-progress.tsx'; import Upload from './upload.tsx'; diff --git a/src/features/compose/components/upload-progress.tsx b/src/features/compose/components/upload-progress.tsx index d26a1ef98..d581dff5e 100644 --- a/src/features/compose/components/upload-progress.tsx +++ b/src/features/compose/components/upload-progress.tsx @@ -1,5 +1,5 @@ import UploadProgress from 'soapbox/components/upload-progress.tsx'; -import { useCompose } from 'soapbox/hooks/index.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; interface IComposeUploadProgress { composeId: string; diff --git a/src/features/compose/components/upload.tsx b/src/features/compose/components/upload.tsx index f0e5cb6f5..1f35e101e 100644 --- a/src/features/compose/components/upload.tsx +++ b/src/features/compose/components/upload.tsx @@ -2,7 +2,9 @@ import { useCallback } from 'react'; import { undoUploadCompose, changeUploadCompose } from 'soapbox/actions/compose.ts'; import Upload from 'soapbox/components/upload.tsx'; -import { useAppDispatch, useCompose, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; interface IUploadCompose { id: string; diff --git a/src/features/compose/containers/quoted-status-container.tsx b/src/features/compose/containers/quoted-status-container.tsx index bd43b961b..3fdd0f66a 100644 --- a/src/features/compose/containers/quoted-status-container.tsx +++ b/src/features/compose/containers/quoted-status-container.tsx @@ -2,7 +2,8 @@ import { useCallback } from 'react'; import { cancelQuoteCompose } from 'soapbox/actions/compose.ts'; import QuotedStatus from 'soapbox/components/quoted-status.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; interface IQuotedStatusContainer { diff --git a/src/features/compose/containers/warning-container.tsx b/src/features/compose/containers/warning-container.tsx index f51f4971f..66a7d6c21 100644 --- a/src/features/compose/containers/warning-container.tsx +++ b/src/features/compose/containers/warning-container.tsx @@ -1,7 +1,11 @@ import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router-dom'; -import { useAppSelector, useCompose, useFeatures, useOwnAccount, useSettingsNotifications } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts'; import { selectOwnAccount } from 'soapbox/selectors/index.ts'; import Warning from '../components/warning.tsx'; diff --git a/src/features/compose/editor/index.tsx b/src/features/compose/editor/index.tsx index 54085027a..944672ca9 100644 --- a/src/features/compose/editor/index.tsx +++ b/src/features/compose/editor/index.tsx @@ -18,7 +18,7 @@ import { $createParagraphNode, $createTextNode, $getRoot, type LexicalEditor } f import { forwardRef, useMemo, useState } from 'react'; import { FormattedMessage } from 'react-intl'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { useNodes } from './nodes/index.ts'; import AutosuggestPlugin from './plugins/autosuggest-plugin.tsx'; diff --git a/src/features/compose/editor/plugins/autosuggest-plugin.tsx b/src/features/compose/editor/plugins/autosuggest-plugin.tsx index 717abd357..677e64702 100644 --- a/src/features/compose/editor/plugins/autosuggest-plugin.tsx +++ b/src/features/compose/editor/plugins/autosuggest-plugin.tsx @@ -36,7 +36,8 @@ import ReactDOM from 'react-dom'; import { clearComposeSuggestions, fetchComposeSuggestions } from 'soapbox/actions/compose.ts'; import { chooseEmoji } from 'soapbox/actions/emojis.ts'; import AutosuggestEmoji from 'soapbox/components/autosuggest-emoji.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; import { selectAccount } from 'soapbox/selectors/index.ts'; import { textAtCursorMatchesToken } from 'soapbox/utils/suggestions.ts'; diff --git a/src/features/compose/editor/plugins/state-plugin.tsx b/src/features/compose/editor/plugins/state-plugin.tsx index fb366bdb2..6940eeb66 100644 --- a/src/features/compose/editor/plugins/state-plugin.tsx +++ b/src/features/compose/editor/plugins/state-plugin.tsx @@ -3,7 +3,7 @@ import { $getRoot } from 'lexical'; import { useEffect } from 'react'; import { setEditorState } from 'soapbox/actions/compose.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; interface IStatePlugin { composeId: string; diff --git a/src/features/conversations/components/conversation.tsx b/src/features/conversations/components/conversation.tsx index 6c5c55346..7f6866f71 100644 --- a/src/features/conversations/components/conversation.tsx +++ b/src/features/conversations/components/conversation.tsx @@ -2,7 +2,8 @@ import { useHistory } from 'react-router-dom'; import { markConversationRead } from 'soapbox/actions/conversations.ts'; import StatusContainer from 'soapbox/containers/status-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { selectAccount } from 'soapbox/selectors/index.ts'; interface IConversation { diff --git a/src/features/conversations/components/conversations-list.tsx b/src/features/conversations/components/conversations-list.tsx index 645064ad6..261ded52d 100644 --- a/src/features/conversations/components/conversations-list.tsx +++ b/src/features/conversations/components/conversations-list.tsx @@ -4,7 +4,8 @@ import { FormattedMessage } from 'react-intl'; import { expandConversations } from 'soapbox/actions/conversations.ts'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Conversation from './conversation.tsx'; diff --git a/src/features/conversations/index.tsx b/src/features/conversations/index.tsx index 2c6ef1547..2c6c64546 100644 --- a/src/features/conversations/index.tsx +++ b/src/features/conversations/index.tsx @@ -6,7 +6,7 @@ import { mountConversations, unmountConversations, expandConversations } from 's import { useDirectStream } from 'soapbox/api/hooks/index.ts'; import AccountSearch from 'soapbox/components/account-search.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import ConversationsList from './components/conversations-list.tsx'; diff --git a/src/features/crypto-donate/components/crypto-address.tsx b/src/features/crypto-donate/components/crypto-address.tsx index 30bbb1809..5aa46fc47 100644 --- a/src/features/crypto-donate/components/crypto-address.tsx +++ b/src/features/crypto-donate/components/crypto-address.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { getExplorerUrl } from '../utils/block-explorer.ts'; import { getTitle } from '../utils/coin-db.ts'; diff --git a/src/features/crypto-donate/components/crypto-donate-panel.tsx b/src/features/crypto-donate/components/crypto-donate-panel.tsx index 53983cc78..c74cdd122 100644 --- a/src/features/crypto-donate/components/crypto-donate-panel.tsx +++ b/src/features/crypto-donate/components/crypto-donate-panel.tsx @@ -3,7 +3,8 @@ import { useHistory } from 'react-router-dom'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useInstance, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import SiteWallet from './site-wallet.tsx'; diff --git a/src/features/crypto-donate/components/site-wallet.tsx b/src/features/crypto-donate/components/site-wallet.tsx index 936ecf1d0..97f920bb8 100644 --- a/src/features/crypto-donate/components/site-wallet.tsx +++ b/src/features/crypto-donate/components/site-wallet.tsx @@ -1,5 +1,5 @@ import Stack from 'soapbox/components/ui/stack.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import CryptoAddress from './crypto-address.tsx'; diff --git a/src/features/crypto-donate/index.tsx b/src/features/crypto-donate/index.tsx index e95f5beaa..39064aa83 100644 --- a/src/features/crypto-donate/index.tsx +++ b/src/features/crypto-donate/index.tsx @@ -4,7 +4,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl'; import Accordion from 'soapbox/components/ui/accordion.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import SiteWallet from './components/site-wallet.tsx'; diff --git a/src/features/delete-account/index.tsx b/src/features/delete-account/index.tsx index e3cf5e62d..8b86c5c9a 100644 --- a/src/features/delete-account/index.tsx +++ b/src/features/delete-account/index.tsx @@ -10,7 +10,8 @@ import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/developers/apps/create.tsx b/src/features/developers/apps/create.tsx index 6ce750bc8..2c862b846 100644 --- a/src/features/developers/apps/create.tsx +++ b/src/features/developers/apps/create.tsx @@ -12,7 +12,8 @@ import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { getBaseURL } from 'soapbox/utils/accounts.ts'; const messages = defineMessages({ diff --git a/src/features/developers/developers-challenge.tsx b/src/features/developers/developers-challenge.tsx index f2a16309e..ea2010389 100644 --- a/src/features/developers/developers-challenge.tsx +++ b/src/features/developers/developers-challenge.tsx @@ -9,7 +9,7 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/developers/developers-menu.tsx b/src/features/developers/developers-menu.tsx index 9449647bf..bdfc04dfd 100644 --- a/src/features/developers/developers-menu.tsx +++ b/src/features/developers/developers-menu.tsx @@ -13,7 +13,7 @@ import { changeSettingImmediate } from 'soapbox/actions/settings.ts'; import { Column } from 'soapbox/components/ui/column.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import sourceCode from 'soapbox/utils/code.ts'; diff --git a/src/features/developers/index.tsx b/src/features/developers/index.tsx index 9db7b7f07..12615db7b 100644 --- a/src/features/developers/index.tsx +++ b/src/features/developers/index.tsx @@ -1,5 +1,5 @@ import { getSettings } from 'soapbox/actions/settings.ts'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import DevelopersChallenge from './developers-challenge.tsx'; import DevelopersMenu from './developers-menu.tsx'; diff --git a/src/features/developers/settings-store.tsx b/src/features/developers/settings-store.tsx index 24ddc90c8..ce4e04d66 100644 --- a/src/features/developers/settings-store.tsx +++ b/src/features/developers/settings-store.tsx @@ -12,7 +12,9 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import SettingToggle from 'soapbox/features/notifications/components/setting-toggle.tsx'; -import { useAppSelector, useAppDispatch, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import toast from 'soapbox/toast.tsx'; const isJSONValid = (text: any): boolean => { diff --git a/src/features/direct-timeline/index.tsx b/src/features/direct-timeline/index.tsx index 7e0b1e348..0fbe55d00 100644 --- a/src/features/direct-timeline/index.tsx +++ b/src/features/direct-timeline/index.tsx @@ -6,7 +6,8 @@ import { expandDirectTimeline } from 'soapbox/actions/timelines.ts'; import { useDirectStream } from 'soapbox/api/hooks/index.ts'; import AccountSearch from 'soapbox/components/account-search.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/directory/components/account-card.tsx b/src/features/directory/components/account-card.tsx index 9f3de14da..721d4fc83 100644 --- a/src/features/directory/components/account-card.tsx +++ b/src/features/directory/components/account-card.tsx @@ -8,7 +8,7 @@ import RelativeTimestamp from 'soapbox/components/relative-timestamp.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import ActionButton from 'soapbox/features/ui/components/action-button.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; interface IAccountCard { diff --git a/src/features/directory/index.tsx b/src/features/directory/index.tsx index 0c7d91301..6b507c3a4 100644 --- a/src/features/directory/index.tsx +++ b/src/features/directory/index.tsx @@ -9,7 +9,10 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import RadioButton from 'soapbox/components/ui/radio-button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import AccountCard from './components/account-card.tsx'; diff --git a/src/features/domain-blocks/index.tsx b/src/features/domain-blocks/index.tsx index 97f5040b9..9b6ac6e88 100644 --- a/src/features/domain-blocks/index.tsx +++ b/src/features/domain-blocks/index.tsx @@ -7,7 +7,8 @@ import Domain from 'soapbox/components/domain.tsx'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ heading: { id: 'column.domain_blocks', defaultMessage: 'Hidden domains' }, diff --git a/src/features/edit-email/index.tsx b/src/features/edit-email/index.tsx index 6dabf8c71..462ddba55 100644 --- a/src/features/edit-email/index.tsx +++ b/src/features/edit-email/index.tsx @@ -8,7 +8,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/edit-identity/index.tsx b/src/features/edit-identity/index.tsx index 21ca51753..451dc16af 100644 --- a/src/features/edit-identity/index.tsx +++ b/src/features/edit-identity/index.tsx @@ -16,7 +16,11 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; -import { useApi, useAppDispatch, useInstance, useOwnAccount, useSettings } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { queryClient } from 'soapbox/queries/client.ts'; import { adminAccountSchema } from 'soapbox/schemas/admin-account.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/edit-password/index.tsx b/src/features/edit-password/index.tsx index 2f0760e4b..6ef9ba123 100644 --- a/src/features/edit-password/index.tsx +++ b/src/features/edit-password/index.tsx @@ -8,7 +8,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/edit-profile/components/avatar-picker.tsx b/src/features/edit-profile/components/avatar-picker.tsx index e855d195d..99673476b 100644 --- a/src/features/edit-profile/components/avatar-picker.tsx +++ b/src/features/edit-profile/components/avatar-picker.tsx @@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl'; import Avatar from 'soapbox/components/ui/avatar.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; -import { useDraggedFiles } from 'soapbox/hooks/index.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; interface IMediaInput { className?: string; diff --git a/src/features/edit-profile/components/header-picker.tsx b/src/features/edit-profile/components/header-picker.tsx index e3c21aa15..0a510e2de 100644 --- a/src/features/edit-profile/components/header-picker.tsx +++ b/src/features/edit-profile/components/header-picker.tsx @@ -8,7 +8,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useDraggedFiles } from 'soapbox/hooks/index.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; const messages = defineMessages({ title: { id: 'group.upload_banner.title', defaultMessage: 'Upload background picture' }, diff --git a/src/features/edit-profile/index.tsx b/src/features/edit-profile/index.tsx index f043ec8cb..5127fa7cd 100644 --- a/src/features/edit-profile/index.tsx +++ b/src/features/edit-profile/index.tsx @@ -16,7 +16,11 @@ import Streamfield from 'soapbox/components/ui/streamfield.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import { useImageField } from 'soapbox/hooks/forms/index.ts'; -import { useAppDispatch, useOwnAccount, useFeatures, useInstance, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts.ts'; diff --git a/src/features/email-confirmation/index.tsx b/src/features/email-confirmation/index.tsx index b863a5b76..5be0f39ff 100644 --- a/src/features/email-confirmation/index.tsx +++ b/src/features/email-confirmation/index.tsx @@ -4,7 +4,7 @@ import { Redirect } from 'react-router-dom'; import { confirmChangedEmail } from 'soapbox/actions/security.ts'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import { buildErrorMessage } from 'soapbox/utils/errors.ts'; diff --git a/src/features/embedded-status/index.tsx b/src/features/embedded-status/index.tsx index 76963a627..f204a6abe 100644 --- a/src/features/embedded-status/index.tsx +++ b/src/features/embedded-status/index.tsx @@ -6,7 +6,8 @@ import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import SiteLogo from 'soapbox/components/site-logo.tsx'; import Status from 'soapbox/components/status.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { iframeId } from 'soapbox/iframe.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; diff --git a/src/features/emoji/components/emoji-picker-dropdown.tsx b/src/features/emoji/components/emoji-picker-dropdown.tsx index 692cdd665..fcc9c05c3 100644 --- a/src/features/emoji/components/emoji-picker-dropdown.tsx +++ b/src/features/emoji/components/emoji-picker-dropdown.tsx @@ -7,7 +7,9 @@ import { chooseEmoji } from 'soapbox/actions/emojis.ts'; import { changeSetting } from 'soapbox/actions/settings.ts'; import { buildCustomEmojis } from 'soapbox/features/emoji/index.ts'; import { EmojiPicker } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch, useAppSelector, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import { RootState } from 'soapbox/store.ts'; import type { Emoji, CustomEmoji, NativeEmoji } from 'soapbox/features/emoji/index.ts'; diff --git a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx index 3a17c0804..235e6c2a5 100644 --- a/src/features/emoji/containers/emoji-picker-dropdown-container.tsx +++ b/src/features/emoji/containers/emoji-picker-dropdown-container.tsx @@ -6,7 +6,7 @@ import { createPortal } from 'react-dom'; import { defineMessages, useIntl } from 'react-intl'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; -import { useClickOutside } from 'soapbox/hooks/index.ts'; +import { useClickOutside } from 'soapbox/hooks/useClickOutside.ts'; import EmojiPickerDropdown, { IEmojiPickerDropdown } from '../components/emoji-picker-dropdown.tsx'; diff --git a/src/features/event/components/event-action-button.tsx b/src/features/event/components/event-action-button.tsx index 8c71b7705..ffcd99460 100644 --- a/src/features/event/components/event-action-button.tsx +++ b/src/features/event/components/event-action-button.tsx @@ -5,7 +5,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { joinEvent, leaveEvent } from 'soapbox/actions/events.ts'; import { openModal } from 'soapbox/actions/modals.ts'; import Button from 'soapbox/components/ui/button.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { ButtonThemes } from 'soapbox/components/ui/useButtonStyles.ts'; import type { Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/event/components/event-header.tsx b/src/features/event/components/event-header.tsx index 167448bf0..58056c2cb 100644 --- a/src/features/event/components/event-header.tsx +++ b/src/features/event/components/event-header.tsx @@ -45,7 +45,10 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; -import { useAppDispatch, useFeatures, useOwnAccount, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import copy from 'soapbox/utils/copy.ts'; import { download } from 'soapbox/utils/download.ts'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/event/event-discussion.tsx b/src/features/event/event-discussion.tsx index 80db30bea..3b8cbc573 100644 --- a/src/features/event/event-discussion.tsx +++ b/src/features/event/event-discussion.tsx @@ -11,7 +11,8 @@ import Tombstone from 'soapbox/components/tombstone.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; import PendingStatus from 'soapbox/features/ui/components/pending-status.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import ComposeForm from '../compose/components/compose-form.tsx'; diff --git a/src/features/event/event-information.tsx b/src/features/event/event-information.tsx index 99fc6b518..9c5cadc40 100644 --- a/src/features/event/event-information.tsx +++ b/src/features/event/event-information.tsx @@ -15,7 +15,10 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container.tsx'; -import { useAppDispatch, useAppSelector, useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import { defaultMediaVisibility } from 'soapbox/utils/status.ts'; diff --git a/src/features/events/components/event-carousel.tsx b/src/features/events/components/event-carousel.tsx index d6de89fe3..1bf4846bd 100644 --- a/src/features/events/components/event-carousel.tsx +++ b/src/features/events/components/event-carousel.tsx @@ -7,7 +7,7 @@ import ReactSwipeableViews from 'react-swipeable-views'; import EventPreview from 'soapbox/components/event-preview.tsx'; import { Card } from 'soapbox/components/ui/card.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import PlaceholderEventPreview from '../../placeholder/components/placeholder-event-preview.tsx'; diff --git a/src/features/events/index.tsx b/src/features/events/index.tsx index 715a0335e..0c735817c 100644 --- a/src/features/events/index.tsx +++ b/src/features/events/index.tsx @@ -7,7 +7,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import { CardBody, CardHeader, CardTitle } from 'soapbox/components/ui/card.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import EventCarousel from './components/event-carousel.tsx'; diff --git a/src/features/export-data/components/csv-exporter.tsx b/src/features/export-data/components/csv-exporter.tsx index 1a638cb9f..4c2fd85c0 100644 --- a/src/features/export-data/components/csv-exporter.tsx +++ b/src/features/export-data/components/csv-exporter.tsx @@ -5,7 +5,7 @@ import Button from 'soapbox/components/ui/button.tsx'; import FormActions from 'soapbox/components/ui/form-actions.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { AppDispatch, RootState } from 'soapbox/store.ts'; interface ICSVExporter { diff --git a/src/features/external-login/components/external-login-form.tsx b/src/features/external-login/components/external-login-form.tsx index f4318c434..5060d0831 100644 --- a/src/features/external-login/components/external-login-form.tsx +++ b/src/features/external-login/components/external-login-form.tsx @@ -8,7 +8,7 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import type { AxiosError } from 'axios'; diff --git a/src/features/favourited-statuses/index.tsx b/src/features/favourited-statuses/index.tsx index 2b2a8bb6f..b841b43a0 100644 --- a/src/features/favourited-statuses/index.tsx +++ b/src/features/favourited-statuses/index.tsx @@ -9,7 +9,9 @@ import { useAccountLookup } from 'soapbox/api/hooks/index.ts'; import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import StatusList from 'soapbox/components/status-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppDispatch, useAppSelector, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; const messages = defineMessages({ heading: { id: 'column.favourited_statuses', defaultMessage: 'Liked posts' }, diff --git a/src/features/federation-restrictions/components/instance-restrictions.tsx b/src/features/federation-restrictions/components/instance-restrictions.tsx index 5d5133100..f3a71a25a 100644 --- a/src/features/federation-restrictions/components/instance-restrictions.tsx +++ b/src/features/federation-restrictions/components/instance-restrictions.tsx @@ -11,7 +11,7 @@ import Icon from 'soapbox/components/icon.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import type { RemoteInstance } from 'soapbox/selectors/index.ts'; diff --git a/src/features/federation-restrictions/components/restricted-instance.tsx b/src/features/federation-restrictions/components/restricted-instance.tsx index 41d4fe869..62cd315c8 100644 --- a/src/features/federation-restrictions/components/restricted-instance.tsx +++ b/src/features/federation-restrictions/components/restricted-instance.tsx @@ -4,7 +4,7 @@ import clsx from 'clsx'; import { useState } from 'react'; import Icon from 'soapbox/components/icon.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetRemoteInstance } from 'soapbox/selectors/index.ts'; import InstanceRestrictions from './instance-restrictions.tsx'; diff --git a/src/features/federation-restrictions/index.tsx b/src/features/federation-restrictions/index.tsx index 862020edc..087d53da3 100644 --- a/src/features/federation-restrictions/index.tsx +++ b/src/features/federation-restrictions/index.tsx @@ -4,7 +4,8 @@ import { defineMessages, useIntl } from 'react-intl'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Accordion from 'soapbox/components/ui/accordion.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { makeGetHosts } from 'soapbox/selectors/index.ts'; import { federationRestrictionsDisclosed } from 'soapbox/utils/state.ts'; diff --git a/src/features/feed-suggestions/feed-suggestions.tsx b/src/features/feed-suggestions/feed-suggestions.tsx index 1a8695eb9..6f4f10f38 100644 --- a/src/features/feed-suggestions/feed-suggestions.tsx +++ b/src/features/feed-suggestions/feed-suggestions.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import ActionButton from '../ui/components/action-button.tsx'; import { HotKeys } from '../ui/components/hotkeys.tsx'; diff --git a/src/features/filters/edit-filter.tsx b/src/features/filters/edit-filter.tsx index b5575efbc..31aaac6e6 100644 --- a/src/features/filters/edit-filter.tsx +++ b/src/features/filters/edit-filter.tsx @@ -16,7 +16,8 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Streamfield from 'soapbox/components/ui/streamfield.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { normalizeFilter } from 'soapbox/normalizers/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/filters/index.tsx b/src/features/filters/index.tsx index 47198dd2a..13eb36a50 100644 --- a/src/features/filters/index.tsx +++ b/src/features/filters/index.tsx @@ -10,7 +10,9 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/follow-recommendations/index.tsx b/src/features/follow-recommendations/index.tsx index cc0900c7f..4cf6865bf 100644 --- a/src/features/follow-recommendations/index.tsx +++ b/src/features/follow-recommendations/index.tsx @@ -8,7 +8,8 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ heading: { id: 'follow_recommendations.heading', defaultMessage: 'Suggested Profiles' }, diff --git a/src/features/follow-requests/components/account-authorize.tsx b/src/features/follow-requests/components/account-authorize.tsx index 72e44bdd2..7b25f346c 100644 --- a/src/features/follow-requests/components/account-authorize.tsx +++ b/src/features/follow-requests/components/account-authorize.tsx @@ -2,7 +2,7 @@ import { authorizeFollowRequest, rejectFollowRequest } from 'soapbox/actions/acc import { useAccount } from 'soapbox/api/hooks/index.ts'; import Account from 'soapbox/components/account.tsx'; import { AuthorizeRejectButtons } from 'soapbox/components/authorize-reject-buttons.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; interface IAccountAuthorize { id: string; diff --git a/src/features/follow-requests/index.tsx b/src/features/follow-requests/index.tsx index 8bdf3f5cc..2f4b29498 100644 --- a/src/features/follow-requests/index.tsx +++ b/src/features/follow-requests/index.tsx @@ -6,7 +6,8 @@ import { fetchFollowRequests, expandFollowRequests } from 'soapbox/actions/accou import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import AccountAuthorize from './components/account-authorize.tsx'; diff --git a/src/features/followed-tags/index.tsx b/src/features/followed-tags/index.tsx index 82173ac46..5bd30fdda 100644 --- a/src/features/followed-tags/index.tsx +++ b/src/features/followed-tags/index.tsx @@ -7,7 +7,8 @@ import Hashtag from 'soapbox/components/hashtag.tsx'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder-hashtag.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ heading: { id: 'column.followed_tags', defaultMessage: 'Followed hashtags' }, diff --git a/src/features/group/components/group-action-button.tsx b/src/features/group/components/group-action-button.tsx index 02bb3109a..12462d6b5 100644 --- a/src/features/group/components/group-action-button.tsx +++ b/src/features/group/components/group-action-button.tsx @@ -6,7 +6,7 @@ import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup, usePendingGrou import Button from 'soapbox/components/ui/button.tsx'; import { importEntities } from 'soapbox/entity-store/actions.ts'; import { Entities } from 'soapbox/entity-store/entities.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/group/components/group-header.tsx b/src/features/group/components/group-header.tsx index 5c2a764e9..0067d54ab 100644 --- a/src/features/group/components/group-header.tsx +++ b/src/features/group/components/group-header.tsx @@ -10,7 +10,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { normalizeAttachment } from 'soapbox/normalizers/index.ts'; import { isDefaultHeader } from 'soapbox/utils/accounts.ts'; diff --git a/src/features/group/components/group-member-list-item.tsx b/src/features/group/components/group-member-list-item.tsx index 5c4ef3a38..2db2a43f3 100644 --- a/src/features/group/components/group-member-list-item.tsx +++ b/src/features/group/components/group-member-list-item.tsx @@ -14,7 +14,8 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import { deleteEntities } from 'soapbox/entity-store/actions.ts'; import { Entities } from 'soapbox/entity-store/entities.ts'; import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; import { MAX_ADMIN_COUNT } from 'soapbox/utils/groups.ts'; diff --git a/src/features/group/components/group-options-button.tsx b/src/features/group/components/group-options-button.tsx index 5a35e28cb..eb792d185 100644 --- a/src/features/group/components/group-options-button.tsx +++ b/src/features/group/components/group-options-button.tsx @@ -11,7 +11,8 @@ import { initReport, ReportableEntities } from 'soapbox/actions/reports.ts'; import { useLeaveGroup, useMuteGroup, useUnmuteGroup } from 'soapbox/api/hooks/index.ts'; import DropdownMenu, { Menu } from 'soapbox/components/dropdown-menu/index.ts'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/group/components/group-tag-list-item.tsx b/src/features/group/components/group-tag-list-item.tsx index 901595a26..c4b2f44da 100644 --- a/src/features/group/components/group-tag-list-item.tsx +++ b/src/features/group/components/group-tag-list-item.tsx @@ -14,7 +14,7 @@ import Text from 'soapbox/components/ui/text.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; import { importEntities } from 'soapbox/entity-store/actions.ts'; import { Entities } from 'soapbox/entity-store/entities.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/group/edit-group.tsx b/src/features/group/edit-group.tsx index c6ebbef46..659dd758f 100644 --- a/src/features/group/edit-group.tsx +++ b/src/features/group/edit-group.tsx @@ -13,7 +13,8 @@ import Input from 'soapbox/components/ui/input.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import { useImageField, useTextField } from 'soapbox/hooks/forms/index.ts'; -import { useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import toast from 'soapbox/toast.tsx'; import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts.ts'; diff --git a/src/features/group/group-blocked-members.tsx b/src/features/group/group-blocked-members.tsx index 55ea8a706..8c09f2eae 100644 --- a/src/features/group/group-blocked-members.tsx +++ b/src/features/group/group-blocked-members.tsx @@ -9,7 +9,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import toast from 'soapbox/toast.tsx'; import ColumnForbidden from '../ui/components/column-forbidden.tsx'; diff --git a/src/features/group/group-gallery.tsx b/src/features/group/group-gallery.tsx index 466aa4cbf..bfdd804ae 100644 --- a/src/features/group/group-gallery.tsx +++ b/src/features/group/group-gallery.tsx @@ -6,7 +6,7 @@ import LoadMore from 'soapbox/components/load-more.tsx'; import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import MediaItem from '../account-gallery/components/media-item.tsx'; diff --git a/src/features/group/group-members.tsx b/src/features/group/group-members.tsx index 66efb16e3..03e981345 100644 --- a/src/features/group/group-members.tsx +++ b/src/features/group/group-members.tsx @@ -4,7 +4,7 @@ import { useMemo } from 'react'; import { useGroup, useGroupMembers, useGroupMembershipRequests } from 'soapbox/api/hooks/index.ts'; import { PendingItemsRow } from 'soapbox/components/pending-items-row.tsx'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import { MAX_ADMIN_COUNT } from 'soapbox/utils/groups.ts'; diff --git a/src/features/group/group-tag-timeline.tsx b/src/features/group/group-tag-timeline.tsx index 6b73276cc..20c5a9398 100644 --- a/src/features/group/group-tag-timeline.tsx +++ b/src/features/group/group-tag-timeline.tsx @@ -8,7 +8,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/group/group-timeline.tsx b/src/features/group/group-timeline.tsx index 1118aac54..47a5a6a51 100644 --- a/src/features/group/group-timeline.tsx +++ b/src/features/group/group-timeline.tsx @@ -14,7 +14,10 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import ComposeForm from 'soapbox/features/compose/components/compose-form.tsx'; -import { useAppDispatch, useAppSelector, useDraggedFiles, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { makeGetStatusIds } from 'soapbox/selectors/index.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/group/manage-group.tsx b/src/features/group/manage-group.tsx index 0d8f6a804..d9423eb51 100644 --- a/src/features/group/manage-group.tsx +++ b/src/features/group/manage-group.tsx @@ -9,7 +9,8 @@ import { CardBody, CardHeader, CardTitle } from 'soapbox/components/ui/card.tsx' import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useBackend } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useBackend } from 'soapbox/hooks/useBackend.ts'; import { GroupRoles } from 'soapbox/schemas/group-member.ts'; import toast from 'soapbox/toast.tsx'; import { TRUTHSOCIAL } from 'soapbox/utils/features.ts'; diff --git a/src/features/groups/components/discover/search/recent-searches.tsx b/src/features/groups/components/discover/search/recent-searches.tsx index c35353147..665a0617e 100644 --- a/src/features/groups/components/discover/search/recent-searches.tsx +++ b/src/features/groups/components/discover/search/recent-searches.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { groupSearchHistory } from 'soapbox/settings.ts'; import { clearRecentGroupSearches } from 'soapbox/utils/groups.ts'; diff --git a/src/features/groups/components/discover/search/search.tsx b/src/features/groups/components/discover/search/search.tsx index 06584005b..c6d404c8b 100644 --- a/src/features/groups/components/discover/search/search.tsx +++ b/src/features/groups/components/discover/search/search.tsx @@ -4,7 +4,8 @@ import { FormattedMessage } from 'react-intl'; import { useGroupSearch } from 'soapbox/api/hooks/index.ts'; import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search.tsx'; -import { useDebounce, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { saveGroupSearch } from 'soapbox/utils/groups.ts'; import Blankslate from './blankslate.tsx'; diff --git a/src/features/groups/components/pending-groups-row.tsx b/src/features/groups/components/pending-groups-row.tsx index 96881a6df..3b1ae37eb 100644 --- a/src/features/groups/components/pending-groups-row.tsx +++ b/src/features/groups/components/pending-groups-row.tsx @@ -1,7 +1,7 @@ import { usePendingGroups } from 'soapbox/api/hooks/index.ts'; import { PendingItemsRow } from 'soapbox/components/pending-items-row.tsx'; import Divider from 'soapbox/components/ui/divider.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; export default () => { const features = useFeatures(); diff --git a/src/features/groups/index.tsx b/src/features/groups/index.tsx index cbe819e4b..0af2987b7 100644 --- a/src/features/groups/index.tsx +++ b/src/features/groups/index.tsx @@ -11,7 +11,10 @@ import Button from 'soapbox/components/ui/button.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useDebounce, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions.ts'; import PlaceholderGroupCard from '../placeholder/components/placeholder-group-card.tsx'; diff --git a/src/features/hashtag-timeline/index.tsx b/src/features/hashtag-timeline/index.tsx index edb81235f..2416495b8 100644 --- a/src/features/hashtag-timeline/index.tsx +++ b/src/features/hashtag-timeline/index.tsx @@ -8,8 +8,12 @@ import List, { ListItem } from 'soapbox/components/list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import Timeline from 'soapbox/features/ui/components/timeline.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useLoggedIn, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; interface IHashtagTimeline { params?: { diff --git a/src/features/home-timeline/index.tsx b/src/features/home-timeline/index.tsx index 36e1371f4..426b46c8c 100644 --- a/src/features/home-timeline/index.tsx +++ b/src/features/home-timeline/index.tsx @@ -8,8 +8,12 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Timeline from 'soapbox/features/ui/components/timeline.tsx'; -import { useAppSelector, useAppDispatch, useFeatures, useInstance, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; const messages = defineMessages({ title: { id: 'column.home', defaultMessage: 'Home' }, diff --git a/src/features/import-data/components/csv-importer.tsx b/src/features/import-data/components/csv-importer.tsx index ffdf12a4f..313e4ba16 100644 --- a/src/features/import-data/components/csv-importer.tsx +++ b/src/features/import-data/components/csv-importer.tsx @@ -7,7 +7,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { AppDispatch, RootState } from 'soapbox/store.ts'; diff --git a/src/features/landing-timeline/components/site-banner.tsx b/src/features/landing-timeline/components/site-banner.tsx index 6611ea146..d4c486559 100644 --- a/src/features/landing-timeline/components/site-banner.tsx +++ b/src/features/landing-timeline/components/site-banner.tsx @@ -2,7 +2,7 @@ import DOMPurify from 'isomorphic-dompurify'; import Markup from 'soapbox/components/markup.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { getTextDirection } from 'soapbox/utils/rtl.ts'; import { LogoText } from './logo-text.tsx'; diff --git a/src/features/landing-timeline/index.tsx b/src/features/landing-timeline/index.tsx index 874db76d7..8bd19a80c 100644 --- a/src/features/landing-timeline/index.tsx +++ b/src/features/landing-timeline/index.tsx @@ -5,8 +5,11 @@ import { expandCommunityTimeline } from 'soapbox/actions/timelines.ts'; import { useCommunityStream } from 'soapbox/api/hooks/index.ts'; import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useAppDispatch, useInstance, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import AboutPage from '../about/index.tsx'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/list-adder/components/list.tsx b/src/features/list-adder/components/list.tsx index d7b064c0b..53bc7a7ad 100644 --- a/src/features/list-adder/components/list.tsx +++ b/src/features/list-adder/components/list.tsx @@ -6,7 +6,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { removeFromListAdder, addToListAdder } from 'soapbox/actions/lists.ts'; import IconButton from 'soapbox/components/icon-button.tsx'; import Icon from 'soapbox/components/icon.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, diff --git a/src/features/list-adder/index.tsx b/src/features/list-adder/index.tsx index 08ce271b8..4fe0886dd 100644 --- a/src/features/list-adder/index.tsx +++ b/src/features/list-adder/index.tsx @@ -6,7 +6,8 @@ import { setupListAdder, resetListAdder } from 'soapbox/actions/lists.ts'; import { CardHeader, CardTitle } from 'soapbox/components/ui/card.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import NewListForm from '../lists/components/new-list-form.tsx'; diff --git a/src/features/list-editor/components/account.tsx b/src/features/list-editor/components/account.tsx index af41238c7..fe1d424df 100644 --- a/src/features/list-editor/components/account.tsx +++ b/src/features/list-editor/components/account.tsx @@ -6,7 +6,8 @@ import { removeFromListEditor, addToListEditor } from 'soapbox/actions/lists.ts' import IconButton from 'soapbox/components/icon-button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ remove: { id: 'lists.account.remove', defaultMessage: 'Remove from list' }, diff --git a/src/features/list-editor/components/edit-list-form.tsx b/src/features/list-editor/components/edit-list-form.tsx index 00a177006..96c45a45b 100644 --- a/src/features/list-editor/components/edit-list-form.tsx +++ b/src/features/list-editor/components/edit-list-form.tsx @@ -5,7 +5,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ title: { id: 'lists.edit.submit', defaultMessage: 'Change title' }, diff --git a/src/features/list-editor/components/search.tsx b/src/features/list-editor/components/search.tsx index 423cffe04..9910225c7 100644 --- a/src/features/list-editor/components/search.tsx +++ b/src/features/list-editor/components/search.tsx @@ -8,7 +8,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ search: { id: 'lists.search', defaultMessage: 'Search among people you follow' }, diff --git a/src/features/list-editor/index.tsx b/src/features/list-editor/index.tsx index 729b658db..f8051ce02 100644 --- a/src/features/list-editor/index.tsx +++ b/src/features/list-editor/index.tsx @@ -4,7 +4,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { setupListEditor, resetListEditor } from 'soapbox/actions/lists.ts'; import { CardHeader, CardTitle } from 'soapbox/components/ui/card.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import Account from './components/account.tsx'; import EditListForm from './components/edit-list-form.tsx'; diff --git a/src/features/list-timeline/index.tsx b/src/features/list-timeline/index.tsx index 167d554ac..cbcecd06b 100644 --- a/src/features/list-timeline/index.tsx +++ b/src/features/list-timeline/index.tsx @@ -10,8 +10,10 @@ import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import Button from 'soapbox/components/ui/button.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/lists/components/new-list-form.tsx b/src/features/lists/components/new-list-form.tsx index 4ce241a1a..bd05b15b0 100644 --- a/src/features/lists/components/new-list-form.tsx +++ b/src/features/lists/components/new-list-form.tsx @@ -5,7 +5,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Input from 'soapbox/components/ui/input.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; const messages = defineMessages({ label: { id: 'lists.new.title_placeholder', defaultMessage: 'New list title' }, diff --git a/src/features/lists/index.tsx b/src/features/lists/index.tsx index b7386a673..fa667fd9b 100644 --- a/src/features/lists/index.tsx +++ b/src/features/lists/index.tsx @@ -13,7 +13,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import NewListForm from './components/new-list-form.tsx'; diff --git a/src/features/migration/index.tsx b/src/features/migration/index.tsx index ead73511a..a1ebf42b5 100644 --- a/src/features/migration/index.tsx +++ b/src/features/migration/index.tsx @@ -10,7 +10,8 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/mutes/index.tsx b/src/features/mutes/index.tsx index e2a961ad6..7bff02461 100644 --- a/src/features/mutes/index.tsx +++ b/src/features/mutes/index.tsx @@ -7,7 +7,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Tabs from 'soapbox/components/ui/tabs.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import GroupListItem from './components/group-list-item.tsx'; diff --git a/src/features/new-status/index.tsx b/src/features/new-status/index.tsx index a574426d4..c30938bfa 100644 --- a/src/features/new-status/index.tsx +++ b/src/features/new-status/index.tsx @@ -2,7 +2,7 @@ import { useEffect } from 'react'; import { Redirect } from 'react-router-dom'; import { openModal } from 'soapbox/actions/modals.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const NewStatus = () => { const dispatch = useAppDispatch(); diff --git a/src/features/nostr-relays/components/relay-editor.tsx b/src/features/nostr-relays/components/relay-editor.tsx index 5d060e9fb..6503202e3 100644 --- a/src/features/nostr-relays/components/relay-editor.tsx +++ b/src/features/nostr-relays/components/relay-editor.tsx @@ -4,7 +4,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Select from 'soapbox/components/ui/select.tsx'; import Streamfield, { StreamfieldComponent } from 'soapbox/components/ui/streamfield.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; interface IRelayEditor { relays: RelayData[]; diff --git a/src/features/nostr-relays/index.tsx b/src/features/nostr-relays/index.tsx index b174b90b0..1877aea3d 100644 --- a/src/features/nostr-relays/index.tsx +++ b/src/features/nostr-relays/index.tsx @@ -8,8 +8,8 @@ import Form from 'soapbox/components/ui/form.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; import { useNostrReq } from 'soapbox/features/nostr/hooks/useNostrReq.ts'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; import { useSigner } from 'soapbox/hooks/nostr/useSigner.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import RelayEditor, { RelayData } from './components/relay-editor.tsx'; diff --git a/src/features/nostr/nostr-bunker-login.tsx b/src/features/nostr/nostr-bunker-login.tsx index b32edf263..cec86c110 100644 --- a/src/features/nostr/nostr-bunker-login.tsx +++ b/src/features/nostr/nostr-bunker-login.tsx @@ -8,7 +8,7 @@ import Button from 'soapbox/components/ui/button.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; export const NostrBunkerLogin: React.FC = () => { const history = useHistory(); diff --git a/src/features/notifications/components/filter-bar.tsx b/src/features/notifications/components/filter-bar.tsx index 95c5c5cab..006d7eb31 100644 --- a/src/features/notifications/components/filter-bar.tsx +++ b/src/features/notifications/components/filter-bar.tsx @@ -10,7 +10,9 @@ import { defineMessages, useIntl } from 'react-intl'; import { setFilter } from 'soapbox/actions/notifications.ts'; import Icon from 'soapbox/components/icon.tsx'; import Tabs from 'soapbox/components/ui/tabs.tsx'; -import { useAppDispatch, useFeatures, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import type { Item } from 'soapbox/components/ui/tabs.tsx'; diff --git a/src/features/notifications/components/notification.tsx b/src/features/notifications/components/notification.tsx index ac7046cc6..24d48b7ca 100644 --- a/src/features/notifications/components/notification.tsx +++ b/src/features/notifications/components/notification.tsx @@ -32,7 +32,9 @@ import Text from 'soapbox/components/ui/text.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; import StatusContainer from 'soapbox/containers/status-container.tsx'; import { HotKeys } from 'soapbox/features/ui/components/hotkeys.tsx'; -import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { makeGetNotification } from 'soapbox/selectors/index.ts'; import toast from 'soapbox/toast.tsx'; import { NotificationType, validType } from 'soapbox/utils/notification.ts'; diff --git a/src/features/notifications/index.tsx b/src/features/notifications/index.tsx index f56a7d2ed..f444d3507 100644 --- a/src/features/notifications/index.tsx +++ b/src/features/notifications/index.tsx @@ -17,8 +17,11 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Portal from 'soapbox/components/ui/portal.tsx'; import PlaceholderNotification from 'soapbox/features/placeholder/components/placeholder-notification.tsx'; -import { useAppDispatch, useAppSelector, useSettings, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import FilterBar from './components/filter-bar.tsx'; import Notification from './components/notification.tsx'; diff --git a/src/features/pinned-statuses/index.tsx b/src/features/pinned-statuses/index.tsx index a988a9e3b..e73d5617d 100644 --- a/src/features/pinned-statuses/index.tsx +++ b/src/features/pinned-statuses/index.tsx @@ -6,7 +6,8 @@ import { fetchPinnedStatuses } from 'soapbox/actions/pin-statuses.ts'; import MissingIndicator from 'soapbox/components/missing-indicator.tsx'; import StatusList from 'soapbox/components/status-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { selectOwnAccount } from 'soapbox/selectors/index.ts'; const messages = defineMessages({ diff --git a/src/features/preferences/index.tsx b/src/features/preferences/index.tsx index 113f0d6f3..e52921d40 100644 --- a/src/features/preferences/index.tsx +++ b/src/features/preferences/index.tsx @@ -6,7 +6,9 @@ import List, { ListItem } from 'soapbox/components/list.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import { SelectDropdown } from 'soapbox/features/forms/index.tsx'; import SettingToggle from 'soapbox/features/notifications/components/setting-toggle.tsx'; -import { useAppDispatch, useFeatures, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import ThemeToggle from '../ui/components/theme-toggle.tsx'; diff --git a/src/features/public-timeline/index.tsx b/src/features/public-timeline/index.tsx index 3717a8a6b..31fb04e53 100644 --- a/src/features/public-timeline/index.tsx +++ b/src/features/public-timeline/index.tsx @@ -10,8 +10,13 @@ import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import Accordion from 'soapbox/components/ui/accordion.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import { LanguageDropdown } from 'soapbox/components/ui/language-dropdown.tsx'; -import { useAppSelector, useAppDispatch, useInstance, useSettings, useTheme, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import PinnedHostsPicker from '../remote-timeline/components/pinned-hosts-picker.tsx'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/quotes/index.tsx b/src/features/quotes/index.tsx index 669b142d4..adf14fc59 100644 --- a/src/features/quotes/index.tsx +++ b/src/features/quotes/index.tsx @@ -7,8 +7,10 @@ import { useParams } from 'react-router-dom'; import { expandStatusQuotes, fetchStatusQuotes } from 'soapbox/actions/status-quotes.ts'; import StatusList from 'soapbox/components/status-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppDispatch, useAppSelector, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; const messages = defineMessages({ heading: { id: 'column.quotes', defaultMessage: 'Post quotes' }, diff --git a/src/features/register-invite/index.tsx b/src/features/register-invite/index.tsx index b704aa892..3ba7d10bf 100644 --- a/src/features/register-invite/index.tsx +++ b/src/features/register-invite/index.tsx @@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom'; import { BigCard } from 'soapbox/components/big-card.tsx'; import RegistrationForm from 'soapbox/features/auth-login/components/registration-form.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; interface RegisterInviteParams { token: string; diff --git a/src/features/remote-timeline/components/pinned-hosts-picker.tsx b/src/features/remote-timeline/components/pinned-hosts-picker.tsx index 9f428f78c..023512809 100644 --- a/src/features/remote-timeline/components/pinned-hosts-picker.tsx +++ b/src/features/remote-timeline/components/pinned-hosts-picker.tsx @@ -1,6 +1,6 @@ import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; interface IPinnedHostsPicker { /** The active host among pinned hosts. */ diff --git a/src/features/remote-timeline/index.tsx b/src/features/remote-timeline/index.tsx index a9657e177..8b04b7f86 100644 --- a/src/features/remote-timeline/index.tsx +++ b/src/features/remote-timeline/index.tsx @@ -9,8 +9,11 @@ import IconButton from 'soapbox/components/icon-button.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector, useAppDispatch, useSettings, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import Timeline from '../ui/components/timeline.tsx'; diff --git a/src/features/reply-mentions/account.tsx b/src/features/reply-mentions/account.tsx index 793dbcf8b..5fee68893 100644 --- a/src/features/reply-mentions/account.tsx +++ b/src/features/reply-mentions/account.tsx @@ -9,7 +9,8 @@ import { useAccount } from 'soapbox/api/hooks/index.ts'; import AccountComponent from 'soapbox/components/account.tsx'; import IconButton from 'soapbox/components/icon-button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useCompose } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; const messages = defineMessages({ remove: { id: 'reply_mentions.account.remove', defaultMessage: 'Remove from mentions' }, diff --git a/src/features/report/components/status-check-box.tsx b/src/features/report/components/status-check-box.tsx index 1ddc3ab1d..dc94ef6bc 100644 --- a/src/features/report/components/status-check-box.tsx +++ b/src/features/report/components/status-check-box.tsx @@ -4,7 +4,8 @@ import { Suspense } from 'react'; import { toggleStatusReport } from 'soapbox/actions/reports.ts'; import StatusContent from 'soapbox/components/status-content.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { MediaGallery, Video, Audio } from '../../ui/util/async-components.ts'; diff --git a/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx b/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx index d18c14e70..f57988fbd 100644 --- a/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx +++ b/src/features/scheduled-statuses/components/scheduled-status-action-bar.tsx @@ -6,7 +6,7 @@ import { cancelScheduledStatus } from 'soapbox/actions/scheduled-statuses.ts'; import { getSettings } from 'soapbox/actions/settings.ts'; import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/scheduled-statuses/components/scheduled-status.tsx b/src/features/scheduled-statuses/components/scheduled-status.tsx index 4a79bfe21..8cdee03b9 100644 --- a/src/features/scheduled-statuses/components/scheduled-status.tsx +++ b/src/features/scheduled-statuses/components/scheduled-status.tsx @@ -7,7 +7,7 @@ import StatusReplyMentions from 'soapbox/components/status-reply-mentions.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import PollPreview from 'soapbox/features/ui/components/poll-preview.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { buildStatus } from '../builder.tsx'; diff --git a/src/features/scheduled-statuses/index.tsx b/src/features/scheduled-statuses/index.tsx index c11040ef2..9c142c6fe 100644 --- a/src/features/scheduled-statuses/index.tsx +++ b/src/features/scheduled-statuses/index.tsx @@ -5,7 +5,8 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl'; import { fetchScheduledStatuses, expandScheduledStatuses } from 'soapbox/actions/scheduled-statuses.ts'; import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import ScheduledStatus from './components/scheduled-status.tsx'; diff --git a/src/features/search/index.tsx b/src/features/search/index.tsx index feaf8b594..8e36d18a1 100644 --- a/src/features/search/index.tsx +++ b/src/features/search/index.tsx @@ -4,8 +4,8 @@ import { defineMessages, useIntl } from 'react-intl'; import { Column } from 'soapbox/components/ui/column.tsx'; import SearchResults from 'soapbox/features/compose/components/search-results.tsx'; import Search from 'soapbox/features/compose/components/search.tsx'; -import { useTheme } from 'soapbox/hooks/index.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; const messages = defineMessages({ heading: { id: 'column.search', defaultMessage: 'Discover' }, diff --git a/src/features/security/mfa-form.tsx b/src/features/security/mfa-form.tsx index e9f26e9b2..5dd50850f 100644 --- a/src/features/security/mfa-form.tsx +++ b/src/features/security/mfa-form.tsx @@ -4,7 +4,8 @@ import { useIntl, defineMessages } from 'react-intl'; import { fetchMfa } from 'soapbox/actions/mfa.ts'; import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import DisableOtpForm from './mfa/disable-otp-form.tsx'; import EnableOtpForm from './mfa/enable-otp-form.tsx'; diff --git a/src/features/security/mfa/disable-otp-form.tsx b/src/features/security/mfa/disable-otp-form.tsx index b8fef1f7e..4a63d91e5 100644 --- a/src/features/security/mfa/disable-otp-form.tsx +++ b/src/features/security/mfa/disable-otp-form.tsx @@ -10,7 +10,7 @@ import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/security/mfa/enable-otp-form.tsx b/src/features/security/mfa/enable-otp-form.tsx index ee819ac09..7f2b3247a 100644 --- a/src/features/security/mfa/enable-otp-form.tsx +++ b/src/features/security/mfa/enable-otp-form.tsx @@ -8,7 +8,7 @@ import FormActions from 'soapbox/components/ui/form-actions.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/security/mfa/otp-confirm-form.tsx b/src/features/security/mfa/otp-confirm-form.tsx index 6100f080b..f9d284a43 100644 --- a/src/features/security/mfa/otp-confirm-form.tsx +++ b/src/features/security/mfa/otp-confirm-form.tsx @@ -14,7 +14,7 @@ import Form from 'soapbox/components/ui/form.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; const messages = defineMessages({ diff --git a/src/features/server-info/index.tsx b/src/features/server-info/index.tsx index 19e1e00bc..092d25354 100644 --- a/src/features/server-info/index.tsx +++ b/src/features/server-info/index.tsx @@ -4,7 +4,7 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Divider from 'soapbox/components/ui/divider.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useInstance } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import LinkFooter from '../ui/components/link-footer.tsx'; import PromoPanel from '../ui/components/promo-panel.tsx'; diff --git a/src/features/settings/components/messages-settings.tsx b/src/features/settings/components/messages-settings.tsx index ee9812f72..c18da1627 100644 --- a/src/features/settings/components/messages-settings.tsx +++ b/src/features/settings/components/messages-settings.tsx @@ -2,7 +2,7 @@ import { defineMessages, useIntl } from 'react-intl'; import List, { ListItem } from 'soapbox/components/list.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { useUpdateCredentials } from 'soapbox/queries/accounts.ts'; const messages = defineMessages({ diff --git a/src/features/settings/index.tsx b/src/features/settings/index.tsx index 0e725220a..72b755683 100644 --- a/src/features/settings/index.tsx +++ b/src/features/settings/index.tsx @@ -9,7 +9,11 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import Counter from 'soapbox/components/ui/counter.tsx'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts'; import Preferences from '../preferences/index.tsx'; diff --git a/src/features/share/index.tsx b/src/features/share/index.tsx index a5e1a3d0f..aabe6c226 100644 --- a/src/features/share/index.tsx +++ b/src/features/share/index.tsx @@ -1,7 +1,7 @@ import { Redirect, useLocation } from 'react-router-dom'; import { openComposeWithText } from 'soapbox/actions/compose.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const Share = () => { const dispatch = useAppDispatch(); diff --git a/src/features/soapbox-config/components/site-preview.tsx b/src/features/soapbox-config/components/site-preview.tsx index 5ea6c7ef6..20e524c9a 100644 --- a/src/features/soapbox-config/components/site-preview.tsx +++ b/src/features/soapbox-config/components/site-preview.tsx @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import { defaultSettings } from 'soapbox/actions/settings.ts'; import SiteLogo from 'soapbox/components/site-logo.tsx'; import BackgroundShapes from 'soapbox/features/ui/components/background-shapes.tsx'; -import { useSystemTheme } from 'soapbox/hooks/index.ts'; +import { useSystemTheme } from 'soapbox/hooks/useSystemTheme.ts'; import { normalizeSoapboxConfig } from 'soapbox/normalizers/index.ts'; import { generateThemeCss } from 'soapbox/utils/theme.ts'; diff --git a/src/features/soapbox-config/index.tsx b/src/features/soapbox-config/index.tsx index 3bd729ab1..e822ca8d8 100644 --- a/src/features/soapbox-config/index.tsx +++ b/src/features/soapbox-config/index.tsx @@ -18,7 +18,9 @@ import Streamfield from 'soapbox/components/ui/streamfield.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import ThemeSelector from 'soapbox/features/ui/components/theme-selector.tsx'; -import { useAppSelector, useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { normalizeSoapboxConfig } from 'soapbox/normalizers/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/status/components/status-interaction-bar.tsx b/src/features/status/components/status-interaction-bar.tsx index 430d3e338..39a9e1c64 100644 --- a/src/features/status/components/status-interaction-bar.tsx +++ b/src/features/status/components/status-interaction-bar.tsx @@ -5,7 +5,10 @@ import { openModal } from 'soapbox/actions/modals.ts'; import Emoji from 'soapbox/components/ui/emoji.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector, useSoapboxConfig, useFeatures, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { reduceEmoji } from 'soapbox/utils/emoji-reacts.ts'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; diff --git a/src/features/status/components/thread-login-cta.tsx b/src/features/status/components/thread-login-cta.tsx index aa7e98572..f488d8a1d 100644 --- a/src/features/status/components/thread-login-cta.tsx +++ b/src/features/status/components/thread-login-cta.tsx @@ -4,7 +4,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import { Card, CardTitle } from 'soapbox/components/ui/card.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useInstance, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; /** Prompts logged-out users to log in when viewing a thread. */ const ThreadLoginCta: React.FC = () => { diff --git a/src/features/status/components/thread-status.tsx b/src/features/status/components/thread-status.tsx index 3b49a6850..a5ff00e7f 100644 --- a/src/features/status/components/thread-status.tsx +++ b/src/features/status/components/thread-status.tsx @@ -3,7 +3,7 @@ import { OrderedSet as ImmutableOrderedSet } from 'immutable'; import StatusContainer from 'soapbox/containers/status-container.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IThreadStatus { id: string; diff --git a/src/features/status/components/thread.tsx b/src/features/status/components/thread.tsx index 9a2d8c98e..9d43b255b 100644 --- a/src/features/status/components/thread.tsx +++ b/src/features/status/components/thread.tsx @@ -18,7 +18,9 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; import { HotKeys } from 'soapbox/features/ui/components/hotkeys.tsx'; import PendingStatus from 'soapbox/features/ui/components/pending-status.tsx'; -import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { RootState } from 'soapbox/store.ts'; import { type Account, type Status } from 'soapbox/types/entities.ts'; import { defaultMediaVisibility, textForScreenReader } from 'soapbox/utils/status.ts'; diff --git a/src/features/status/containers/quoted-status-container.tsx b/src/features/status/containers/quoted-status-container.tsx index 2ed95f78c..2b45ea2d8 100644 --- a/src/features/status/containers/quoted-status-container.tsx +++ b/src/features/status/containers/quoted-status-container.tsx @@ -2,7 +2,7 @@ import { useCallback } from 'react'; import QuotedStatus from 'soapbox/components/quoted-status.tsx'; import Tombstone from 'soapbox/components/tombstone.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; interface IQuotedStatusContainer { diff --git a/src/features/status/index.tsx b/src/features/status/index.tsx index 0ce594d0a..3c7382192 100644 --- a/src/features/status/index.tsx +++ b/src/features/status/index.tsx @@ -12,7 +12,9 @@ import PullToRefresh from 'soapbox/components/pull-to-refresh.tsx'; import { Column } from 'soapbox/components/ui/column.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; -import { useAppDispatch, useAppSelector, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import ThreadLoginCta from './components/thread-login-cta.tsx'; diff --git a/src/features/test-timeline/index.tsx b/src/features/test-timeline/index.tsx index f5731a57d..066a5174c 100644 --- a/src/features/test-timeline/index.tsx +++ b/src/features/test-timeline/index.tsx @@ -11,8 +11,9 @@ import { importFetchedStatuses } from 'soapbox/actions/importer/index.ts'; import { expandTimelineSuccess } from 'soapbox/actions/timelines.ts'; import { Column } from 'soapbox/components/ui/column.tsx'; import Timeline from 'soapbox/features/ui/components/timeline.tsx'; -import { useAppDispatch, useTheme } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; const messages = defineMessages({ title: { id: 'column.test', defaultMessage: 'Test timeline' }, diff --git a/src/features/theme-editor/components/palette.tsx b/src/features/theme-editor/components/palette.tsx index 70d1830e6..748a80b76 100644 --- a/src/features/theme-editor/components/palette.tsx +++ b/src/features/theme-editor/components/palette.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Slider from 'soapbox/components/ui/slider.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { usePrevious } from 'soapbox/hooks/index.ts'; +import { usePrevious } from 'soapbox/hooks/usePrevious.ts'; import { compareId } from 'soapbox/utils/comparators.ts'; import { hueShift } from 'soapbox/utils/theme.ts'; diff --git a/src/features/theme-editor/index.tsx b/src/features/theme-editor/index.tsx index 95060f712..6aa036b4a 100644 --- a/src/features/theme-editor/index.tsx +++ b/src/features/theme-editor/index.tsx @@ -14,7 +14,9 @@ import { Column } from 'soapbox/components/ui/column.tsx'; import FormActions from 'soapbox/components/ui/form-actions.tsx'; import Form from 'soapbox/components/ui/form.tsx'; import ColorWithPicker from 'soapbox/features/soapbox-config/components/color-with-picker.tsx'; -import { useAppDispatch, useAppSelector, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { normalizeSoapboxConfig } from 'soapbox/normalizers/index.ts'; import toast from 'soapbox/toast.tsx'; import { download } from 'soapbox/utils/download.ts'; diff --git a/src/features/ui/components/action-button.tsx b/src/features/ui/components/action-button.tsx index 90495f58c..8a2f6144c 100644 --- a/src/features/ui/components/action-button.tsx +++ b/src/features/ui/components/action-button.tsx @@ -14,7 +14,9 @@ import { openModal } from 'soapbox/actions/modals.ts'; import { useFollow } from 'soapbox/api/hooks/index.ts'; import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch, useFeatures, useLoggedIn } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/compose-button.tsx b/src/features/ui/components/compose-button.tsx index 02420daf8..e3855e075 100644 --- a/src/features/ui/components/compose-button.tsx +++ b/src/features/ui/components/compose-button.tsx @@ -7,7 +7,7 @@ import { useGroupLookup } from 'soapbox/api/hooks/index.ts'; import Avatar from 'soapbox/components/ui/avatar.tsx'; import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const ComposeButton = () => { const location = useLocation(); diff --git a/src/features/ui/components/cta-banner.tsx b/src/features/ui/components/cta-banner.tsx index 7dd84a37c..3924bb3e1 100644 --- a/src/features/ui/components/cta-banner.tsx +++ b/src/features/ui/components/cta-banner.tsx @@ -5,7 +5,10 @@ import Button from 'soapbox/components/ui/button.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector, useInstance, useRegistrationStatus, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; const CtaBanner = () => { const { instance } = useInstance(); diff --git a/src/features/ui/components/floating-action-button.tsx b/src/features/ui/components/floating-action-button.tsx index f6e6e2b07..d83a6ef24 100644 --- a/src/features/ui/components/floating-action-button.tsx +++ b/src/features/ui/components/floating-action-button.tsx @@ -9,7 +9,7 @@ import { useGroupLookup } from 'soapbox/api/hooks/index.ts'; import Avatar from 'soapbox/components/ui/avatar.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const messages = defineMessages({ publish: { id: 'compose_form.publish', defaultMessage: 'Post' }, diff --git a/src/features/ui/components/funding-panel.tsx b/src/features/ui/components/funding-panel.tsx index cebc57e7a..f55087d31 100644 --- a/src/features/ui/components/funding-panel.tsx +++ b/src/features/ui/components/funding-panel.tsx @@ -7,7 +7,8 @@ import ProgressBar from 'soapbox/components/ui/progress-bar.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; /** Open link in a new tab. */ // https://stackoverflow.com/a/28374344/8811886 diff --git a/src/features/ui/components/group-media-panel.tsx b/src/features/ui/components/group-media-panel.tsx index f892eab21..801bb403e 100644 --- a/src/features/ui/components/group-media-panel.tsx +++ b/src/features/ui/components/group-media-panel.tsx @@ -7,7 +7,8 @@ import { expandGroupMediaTimeline } from 'soapbox/actions/timelines.ts'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { getGroupGallery } from 'soapbox/selectors/index.ts'; import MediaItem from '../../account-gallery/components/media-item.tsx'; diff --git a/src/features/ui/components/instance-info-panel.tsx b/src/features/ui/components/instance-info-panel.tsx index a68eb5382..b5f1c12bf 100644 --- a/src/features/ui/components/instance-info-panel.tsx +++ b/src/features/ui/components/instance-info-panel.tsx @@ -4,7 +4,9 @@ import { useIntl, defineMessages } from 'react-intl'; import { pinHost, unpinHost } from 'soapbox/actions/remote-timeline.ts'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppSelector, useAppDispatch, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import { makeGetRemoteInstance } from 'soapbox/selectors/index.ts'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/src/features/ui/components/instance-moderation-panel.tsx b/src/features/ui/components/instance-moderation-panel.tsx index bc801be2e..ebc572321 100644 --- a/src/features/ui/components/instance-moderation-panel.tsx +++ b/src/features/ui/components/instance-moderation-panel.tsx @@ -6,7 +6,9 @@ import { openModal } from 'soapbox/actions/modals.ts'; import DropdownMenu from 'soapbox/components/dropdown-menu/index.ts'; import Widget from 'soapbox/components/ui/widget.tsx'; import InstanceRestrictions from 'soapbox/features/federation-restrictions/components/instance-restrictions.tsx'; -import { useAppSelector, useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { makeGetRemoteInstance } from 'soapbox/selectors/index.ts'; const getRemoteInstance = makeGetRemoteInstance(); diff --git a/src/features/ui/components/link-footer.tsx b/src/features/ui/components/link-footer.tsx index 5c18fcbc5..d8d6b6abb 100644 --- a/src/features/ui/components/link-footer.tsx +++ b/src/features/ui/components/link-footer.tsx @@ -5,7 +5,10 @@ import { Link } from 'react-router-dom'; import { logOut } from 'soapbox/actions/auth.ts'; import Text from 'soapbox/components/ui/text.tsx'; import emojify from 'soapbox/features/emoji/index.ts'; -import { useSoapboxConfig, useOwnAccount, useFeatures, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import sourceCode from 'soapbox/utils/code.ts'; interface IFooterLink { diff --git a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx index 65d1ec7d9..1fc8c1ddf 100644 --- a/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx +++ b/src/features/ui/components/modals/account-moderation-modal/account-moderation-modal.tsx @@ -16,7 +16,9 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import { getBadges } from 'soapbox/utils/badges.ts'; diff --git a/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx b/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx index 150fae4bf..f5bd7d3c9 100644 --- a/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx +++ b/src/features/ui/components/modals/account-moderation-modal/staff-role-picker.tsx @@ -3,7 +3,7 @@ import { defineMessages, MessageDescriptor, useIntl } from 'react-intl'; import { setRole } from 'soapbox/actions/admin.ts'; import { SelectDropdown } from 'soapbox/features/forms/index.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import type { Account as AccountEntity } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/modals/birthdays-modal.tsx b/src/features/ui/components/modals/birthdays-modal.tsx index ca7eca4f5..a98aba752 100644 --- a/src/features/ui/components/modals/birthdays-modal.tsx +++ b/src/features/ui/components/modals/birthdays-modal.tsx @@ -4,7 +4,7 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Account from 'soapbox/features/birthdays/account.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IBirthdaysModal { onClose: (string: string) => void; diff --git a/src/features/ui/components/modals/compare-history-modal.tsx b/src/features/ui/components/modals/compare-history-modal.tsx index 929cf312d..1eec1fe0a 100644 --- a/src/features/ui/components/modals/compare-history-modal.tsx +++ b/src/features/ui/components/modals/compare-history-modal.tsx @@ -10,7 +10,8 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { StatusEdit as StatusEditEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx b/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx index 423c37a0b..440045481 100644 --- a/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx +++ b/src/features/ui/components/modals/compose-event-modal/compose-event-modal.tsx @@ -40,7 +40,8 @@ import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; import { ComposeEditor } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import UploadButton from './upload-button.tsx'; diff --git a/src/features/ui/components/modals/compose-event-modal/upload-button.tsx b/src/features/ui/components/modals/compose-event-modal/upload-button.tsx index 5779ebd3c..acdfee743 100644 --- a/src/features/ui/components/modals/compose-event-modal/upload-button.tsx +++ b/src/features/ui/components/modals/compose-event-modal/upload-button.tsx @@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl'; import Icon from 'soapbox/components/icon.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IUploadButton { disabled?: boolean; diff --git a/src/features/ui/components/modals/compose-modal.tsx b/src/features/ui/components/modals/compose-modal.tsx index f7862633d..58e85a496 100644 --- a/src/features/ui/components/modals/compose-modal.tsx +++ b/src/features/ui/components/modals/compose-modal.tsx @@ -11,7 +11,10 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; import ComposeForm from '../../../compose/components/compose-form.tsx'; diff --git a/src/features/ui/components/modals/dislikes-modal.tsx b/src/features/ui/components/modals/dislikes-modal.tsx index 9f9cef6ac..000f3dce1 100644 --- a/src/features/ui/components/modals/dislikes-modal.tsx +++ b/src/features/ui/components/modals/dislikes-modal.tsx @@ -6,7 +6,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IDislikesModal { onClose: (type: string) => void; diff --git a/src/features/ui/components/modals/edit-announcement-modal.tsx b/src/features/ui/components/modals/edit-announcement-modal.tsx index 0917c664b..428dd51fe 100644 --- a/src/features/ui/components/modals/edit-announcement-modal.tsx +++ b/src/features/ui/components/modals/edit-announcement-modal.tsx @@ -12,7 +12,7 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import toast from 'soapbox/toast.tsx'; import type { AdminAnnouncement } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx index 1a5747820..6329e5104 100644 --- a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx +++ b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx @@ -14,7 +14,8 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import EmojiPickerDropdown from 'soapbox/features/emoji/components/emoji-picker-dropdown.tsx'; import { messages as emojiMessages } from 'soapbox/features/emoji/containers/emoji-picker-dropdown-container.tsx'; import { useTextField } from 'soapbox/hooks/forms/index.ts'; -import { useAppDispatch, useClickOutside } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useClickOutside } from 'soapbox/hooks/useClickOutside.ts'; import toast from 'soapbox/toast.tsx'; import type { Emoji as EmojiType } from 'soapbox/features/emoji/index.ts'; diff --git a/src/features/ui/components/modals/edit-domain-modal.tsx b/src/features/ui/components/modals/edit-domain-modal.tsx index 788683260..a2d038f06 100644 --- a/src/features/ui/components/modals/edit-domain-modal.tsx +++ b/src/features/ui/components/modals/edit-domain-modal.tsx @@ -11,7 +11,7 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { Domain } from 'soapbox/schemas/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/ui/components/modals/edit-federation-modal.tsx b/src/features/ui/components/modals/edit-federation-modal.tsx index 3db26ee1b..6ef129446 100644 --- a/src/features/ui/components/modals/edit-federation-modal.tsx +++ b/src/features/ui/components/modals/edit-federation-modal.tsx @@ -5,7 +5,8 @@ import { updateMrf } from 'soapbox/actions/mrf.ts'; import List, { ListItem } from 'soapbox/components/list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetRemoteInstance } from 'soapbox/selectors/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/ui/components/modals/embed-modal.tsx b/src/features/ui/components/modals/embed-modal.tsx index 525c8b80b..ca5c442c3 100644 --- a/src/features/ui/components/modals/embed-modal.tsx +++ b/src/features/ui/components/modals/embed-modal.tsx @@ -8,7 +8,7 @@ import Divider from 'soapbox/components/ui/divider.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import useEmbed from 'soapbox/queries/embed.ts'; interface IEmbedModal { diff --git a/src/features/ui/components/modals/event-map-modal.tsx b/src/features/ui/components/modals/event-map-modal.tsx index cbaf97624..af2207174 100644 --- a/src/features/ui/components/modals/event-map-modal.tsx +++ b/src/features/ui/components/modals/event-map-modal.tsx @@ -9,7 +9,8 @@ import { FormattedMessage } from 'react-intl'; import Button from 'soapbox/components/ui/button.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import type { Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/components/modals/event-participants-modal.tsx b/src/features/ui/components/modals/event-participants-modal.tsx index 04833d821..595198070 100644 --- a/src/features/ui/components/modals/event-participants-modal.tsx +++ b/src/features/ui/components/modals/event-participants-modal.tsx @@ -6,7 +6,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IEventParticipantsModal { onClose: (type: string) => void; diff --git a/src/features/ui/components/modals/familiar-followers-modal.tsx b/src/features/ui/components/modals/familiar-followers-modal.tsx index 986815b52..0322e07ca 100644 --- a/src/features/ui/components/modals/familiar-followers-modal.tsx +++ b/src/features/ui/components/modals/familiar-followers-modal.tsx @@ -5,7 +5,7 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetAccount } from 'soapbox/selectors/index.ts'; const getAccount = makeGetAccount(); diff --git a/src/features/ui/components/modals/favourites-modal.tsx b/src/features/ui/components/modals/favourites-modal.tsx index bc3fed538..dbea9d5a3 100644 --- a/src/features/ui/components/modals/favourites-modal.tsx +++ b/src/features/ui/components/modals/favourites-modal.tsx @@ -6,7 +6,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IFavouritesModal { onClose: (type: string) => void; diff --git a/src/features/ui/components/modals/hotkeys-modal.tsx b/src/features/ui/components/modals/hotkeys-modal.tsx index 79267c8ec..aaa10e1cb 100644 --- a/src/features/ui/components/modals/hotkeys-modal.tsx +++ b/src/features/ui/components/modals/hotkeys-modal.tsx @@ -1,7 +1,7 @@ import { FormattedMessage } from 'react-intl'; import Modal from 'soapbox/components/ui/modal.tsx'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface IHotkeysModal { onClose: () => void; diff --git a/src/features/ui/components/modals/join-event-modal.tsx b/src/features/ui/components/modals/join-event-modal.tsx index f6062b831..b2056fdf1 100644 --- a/src/features/ui/components/modals/join-event-modal.tsx +++ b/src/features/ui/components/modals/join-event-modal.tsx @@ -6,7 +6,7 @@ import { closeModal } from 'soapbox/actions/modals.ts'; import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const messages = defineMessages({ hint: { id: 'join_event.hint', defaultMessage: 'You can tell the organizer why do you want to participate in this event:' }, diff --git a/src/features/ui/components/modals/landing-page-modal.tsx b/src/features/ui/components/modals/landing-page-modal.tsx index afac28bde..b5d944f56 100644 --- a/src/features/ui/components/modals/landing-page-modal.tsx +++ b/src/features/ui/components/modals/landing-page-modal.tsx @@ -7,7 +7,8 @@ import Button from 'soapbox/components/ui/button.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useRegistrationStatus, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; const messages = defineMessages({ download: { id: 'landing_page_modal.download', defaultMessage: 'Download' }, diff --git a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx index 0c702a1ff..a06ac688c 100644 --- a/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx +++ b/src/features/ui/components/modals/manage-group-modal/create-group-modal.tsx @@ -6,7 +6,7 @@ import { HTTPError } from 'soapbox/api/HTTPError.ts'; import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/api/hooks/index.ts'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useDebounce } from 'soapbox/hooks/index.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; import { type Group } from 'soapbox/schemas/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx b/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx index b9ae0e41a..0c65ae246 100644 --- a/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx +++ b/src/features/ui/components/modals/manage-group-modal/steps/details-step.tsx @@ -9,7 +9,9 @@ import AvatarPicker from 'soapbox/features/edit-profile/components/avatar-picker import HeaderPicker from 'soapbox/features/edit-profile/components/header-picker.tsx'; import GroupTagsField from 'soapbox/features/group/components/group-tags-field.tsx'; import { usePreview } from 'soapbox/hooks/forms/index.ts'; -import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useDebounce } from 'soapbox/hooks/useDebounce.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import resizeImage from 'soapbox/utils/resize-image.ts'; const messages = defineMessages({ diff --git a/src/features/ui/components/modals/media-modal.tsx b/src/features/ui/components/modals/media-modal.tsx index 82ce6fd12..e34653231 100644 --- a/src/features/ui/components/modals/media-modal.tsx +++ b/src/features/ui/components/modals/media-modal.tsx @@ -23,7 +23,8 @@ import Audio from 'soapbox/features/audio/index.tsx'; import PlaceholderStatus from 'soapbox/features/placeholder/components/placeholder-status.tsx'; import Thread from 'soapbox/features/status/components/thread.tsx'; import Video from 'soapbox/features/video/index.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { userTouching } from 'soapbox/is-mobile.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; diff --git a/src/features/ui/components/modals/mentions-modal.tsx b/src/features/ui/components/modals/mentions-modal.tsx index 2c16a1632..a2e6eb8a2 100644 --- a/src/features/ui/components/modals/mentions-modal.tsx +++ b/src/features/ui/components/modals/mentions-modal.tsx @@ -7,7 +7,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; interface IMentionsModal { diff --git a/src/features/ui/components/modals/mute-modal.tsx b/src/features/ui/components/modals/mute-modal.tsx index 5aa837773..ceee7062d 100644 --- a/src/features/ui/components/modals/mute-modal.tsx +++ b/src/features/ui/components/modals/mute-modal.tsx @@ -10,7 +10,9 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import DurationSelector from 'soapbox/features/compose/components/polls/duration-selector.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; const MuteModal = () => { const dispatch = useAppDispatch(); diff --git a/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx b/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx index 385505b26..0c0db8b42 100644 --- a/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx +++ b/src/features/ui/components/modals/nostr-login-modal/components/nostr-extension-indicator.tsx @@ -6,7 +6,7 @@ import { nostrExtensionLogIn } from 'soapbox/actions/nostr.ts'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const NostrExtensionIndicator: React.FC = () => { const dispatch = useAppDispatch(); diff --git a/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx b/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx index e6cef188b..b8afa59a9 100644 --- a/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx +++ b/src/features/ui/components/modals/nostr-login-modal/steps/extension-step.tsx @@ -13,7 +13,9 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; -import { useAppDispatch, useInstance, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; interface IExtensionStep { isLogin?: boolean; diff --git a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx index deafd92cc..39d09f148 100644 --- a/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx +++ b/src/features/ui/components/modals/nostr-login-modal/steps/key-add-step.tsx @@ -14,7 +14,7 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; import { keyring } from 'soapbox/features/nostr/keyring.ts'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import NostrExtensionIndicator from '../components/nostr-extension-indicator.tsx'; diff --git a/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx index 2fb64bed6..2ea8ec598 100644 --- a/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx +++ b/src/features/ui/components/modals/nostr-signup-modal/steps/key-step.tsx @@ -7,7 +7,7 @@ import Divider from 'soapbox/components/ui/divider.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import NostrExtensionIndicator from '../../nostr-login-modal/components/nostr-extension-indicator.tsx'; diff --git a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx index e68b0c438..407faf92c 100644 --- a/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx +++ b/src/features/ui/components/modals/nostr-signup-modal/steps/keygen-step.tsx @@ -18,7 +18,8 @@ import Text from 'soapbox/components/ui/text.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; import { keyring } from 'soapbox/features/nostr/keyring.ts'; -import { useAppDispatch, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; import { download } from 'soapbox/utils/download.ts'; import { slugify } from 'soapbox/utils/input.ts'; diff --git a/src/features/ui/components/modals/onboarding-flow-modal/onboarding-flow-modal.tsx b/src/features/ui/components/modals/onboarding-flow-modal/onboarding-flow-modal.tsx index e4a35e4e4..dfd544f19 100644 --- a/src/features/ui/components/modals/onboarding-flow-modal/onboarding-flow-modal.tsx +++ b/src/features/ui/components/modals/onboarding-flow-modal/onboarding-flow-modal.tsx @@ -6,7 +6,7 @@ import { endOnboarding } from 'soapbox/actions/onboarding.ts'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import AvatarSelectionModal from './steps/avatar-step.tsx'; import BioStep from './steps/bio-step.tsx'; diff --git a/src/features/ui/components/modals/onboarding-flow-modal/steps/avatar-step.tsx b/src/features/ui/components/modals/onboarding-flow-modal/steps/avatar-step.tsx index a138d89e6..c3992bfc8 100644 --- a/src/features/ui/components/modals/onboarding-flow-modal/steps/avatar-step.tsx +++ b/src/features/ui/components/modals/onboarding-flow-modal/steps/avatar-step.tsx @@ -12,7 +12,8 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import { isDefaultAvatar } from 'soapbox/utils/accounts.ts'; import resizeImage from 'soapbox/utils/resize-image.ts'; diff --git a/src/features/ui/components/modals/onboarding-flow-modal/steps/bio-step.tsx b/src/features/ui/components/modals/onboarding-flow-modal/steps/bio-step.tsx index 95dacc9cf..922fdfd89 100644 --- a/src/features/ui/components/modals/onboarding-flow-modal/steps/bio-step.tsx +++ b/src/features/ui/components/modals/onboarding-flow-modal/steps/bio-step.tsx @@ -9,7 +9,8 @@ import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import type { AxiosError } from 'axios'; diff --git a/src/features/ui/components/modals/onboarding-flow-modal/steps/cover-photo-selection-step.tsx b/src/features/ui/components/modals/onboarding-flow-modal/steps/cover-photo-selection-step.tsx index 0e6b40bae..5ba42b73d 100644 --- a/src/features/ui/components/modals/onboarding-flow-modal/steps/cover-photo-selection-step.tsx +++ b/src/features/ui/components/modals/onboarding-flow-modal/steps/cover-photo-selection-step.tsx @@ -13,7 +13,8 @@ import Icon from 'soapbox/components/ui/icon.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import { isDefaultHeader } from 'soapbox/utils/accounts.ts'; import resizeImage from 'soapbox/utils/resize-image.ts'; diff --git a/src/features/ui/components/modals/onboarding-flow-modal/steps/display-name-step.tsx b/src/features/ui/components/modals/onboarding-flow-modal/steps/display-name-step.tsx index 891e1d055..27e6ca8ab 100644 --- a/src/features/ui/components/modals/onboarding-flow-modal/steps/display-name-step.tsx +++ b/src/features/ui/components/modals/onboarding-flow-modal/steps/display-name-step.tsx @@ -9,7 +9,8 @@ import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; import type { AxiosError } from 'axios'; diff --git a/src/features/ui/components/modals/reactions-modal.tsx b/src/features/ui/components/modals/reactions-modal.tsx index 5345d6fb4..e399d4176 100644 --- a/src/features/ui/components/modals/reactions-modal.tsx +++ b/src/features/ui/components/modals/reactions-modal.tsx @@ -10,7 +10,8 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Tabs from 'soapbox/components/ui/tabs.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { ReactionRecord } from 'soapbox/reducers/user-lists.ts'; import type { Item } from 'soapbox/components/ui/tabs.tsx'; diff --git a/src/features/ui/components/modals/reblogs-modal.tsx b/src/features/ui/components/modals/reblogs-modal.tsx index d2e9670e1..8d93e5356 100644 --- a/src/features/ui/components/modals/reblogs-modal.tsx +++ b/src/features/ui/components/modals/reblogs-modal.tsx @@ -7,7 +7,8 @@ import ScrollableList from 'soapbox/components/scrollable-list.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; interface IReblogsModal { onClose: (string: string) => void; diff --git a/src/features/ui/components/modals/reply-mentions-modal.tsx b/src/features/ui/components/modals/reply-mentions-modal.tsx index 542f48474..a1da59011 100644 --- a/src/features/ui/components/modals/reply-mentions-modal.tsx +++ b/src/features/ui/components/modals/reply-mentions-modal.tsx @@ -4,7 +4,9 @@ import { FormattedMessage } from 'react-intl'; import Modal from 'soapbox/components/ui/modal.tsx'; import Account from 'soapbox/features/reply-mentions/account.tsx'; -import { useAppSelector, useCompose, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useCompose } from 'soapbox/hooks/useCompose.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { statusToMentionsAccountIdsArray } from 'soapbox/reducers/compose.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; diff --git a/src/features/ui/components/modals/report-modal/report-modal.tsx b/src/features/ui/components/modals/report-modal/report-modal.tsx index 80a288483..ac1244d53 100644 --- a/src/features/ui/components/modals/report-modal/report-modal.tsx +++ b/src/features/ui/components/modals/report-modal/report-modal.tsx @@ -18,7 +18,9 @@ import ProgressBar from 'soapbox/components/ui/progress-bar.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import ConfirmationStep from './steps/confirmation-step.tsx'; import OtherActionsStep from './steps/other-actions-step.tsx'; diff --git a/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx b/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx index dbdd97fe9..95d34fe07 100644 --- a/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx +++ b/src/features/ui/components/modals/report-modal/steps/confirmation-step.tsx @@ -4,7 +4,7 @@ import { ReportableEntities } from 'soapbox/actions/reports.ts'; import { getSoapboxConfig } from 'soapbox/actions/soapbox.ts'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx index 5fef8ce29..7539b854f 100644 --- a/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx +++ b/src/features/ui/components/modals/report-modal/steps/other-actions-step.tsx @@ -12,7 +12,9 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Toggle from 'soapbox/components/ui/toggle.tsx'; import StatusCheckBox from 'soapbox/features/report/components/status-check-box.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { getDomain } from 'soapbox/utils/accounts.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/modals/report-modal/steps/reason-step.tsx b/src/features/ui/components/modals/report-modal/steps/reason-step.tsx index 4d1ed814f..ab4d59900 100644 --- a/src/features/ui/components/modals/report-modal/steps/reason-step.tsx +++ b/src/features/ui/components/modals/report-modal/steps/reason-step.tsx @@ -7,7 +7,9 @@ import FormGroup from 'soapbox/components/ui/form-group.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; -import { useAppDispatch, useAppSelector, useInstance } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import type { Account } from 'soapbox/schemas/index.ts'; import type { Rule } from 'soapbox/schemas/rule.ts'; diff --git a/src/features/ui/components/modals/select-bookmark-folder-modal.tsx b/src/features/ui/components/modals/select-bookmark-folder-modal.tsx index 1b442e471..672cd1a3c 100644 --- a/src/features/ui/components/modals/select-bookmark-folder-modal.tsx +++ b/src/features/ui/components/modals/select-bookmark-folder-modal.tsx @@ -13,7 +13,8 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import NewFolderForm from 'soapbox/features/bookmark-folders/components/new-folder-form.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; import type { Status as StatusEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/components/modals/unauthorized-modal.tsx b/src/features/ui/components/modals/unauthorized-modal.tsx index 13fdab027..069f5653e 100644 --- a/src/features/ui/components/modals/unauthorized-modal.tsx +++ b/src/features/ui/components/modals/unauthorized-modal.tsx @@ -9,7 +9,11 @@ import Input from 'soapbox/components/ui/input.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector, useAppDispatch, useFeatures, useInstance, useRegistrationStatus } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; import { selectAccount } from 'soapbox/selectors/index.ts'; import toast from 'soapbox/toast.tsx'; diff --git a/src/features/ui/components/modals/zap-invoice.tsx b/src/features/ui/components/modals/zap-invoice.tsx index 74109a2c6..3b3ebbc72 100644 --- a/src/features/ui/components/modals/zap-invoice.tsx +++ b/src/features/ui/components/modals/zap-invoice.tsx @@ -13,7 +13,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Modal from 'soapbox/components/ui/modal.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { ZapSplitData } from 'soapbox/schemas/zap-split.ts'; import type { Account as AccountEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/components/modals/zap-split/display-name-row.tsx b/src/features/ui/components/modals/zap-split/display-name-row.tsx index fa0c2cc45..f407d294f 100644 --- a/src/features/ui/components/modals/zap-split/display-name-row.tsx +++ b/src/features/ui/components/modals/zap-split/display-name-row.tsx @@ -1,7 +1,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; -import { useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { getAcct } from 'soapbox/utils/accounts.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/modals/zaps-modal.tsx b/src/features/ui/components/modals/zaps-modal.tsx index 5c7b0a06d..e6bd1fbbf 100644 --- a/src/features/ui/components/modals/zaps-modal.tsx +++ b/src/features/ui/components/modals/zaps-modal.tsx @@ -8,7 +8,8 @@ import Modal from 'soapbox/components/ui/modal.tsx'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; interface IAccountWithZaps { diff --git a/src/features/ui/components/navbar.tsx b/src/features/ui/components/navbar.tsx index b0f43558f..ebf74930c 100644 --- a/src/features/ui/components/navbar.tsx +++ b/src/features/ui/components/navbar.tsx @@ -18,8 +18,12 @@ import IconButton from 'soapbox/components/ui/icon-button.tsx'; import Input from 'soapbox/components/ui/input.tsx'; import Tooltip from 'soapbox/components/ui/tooltip.tsx'; import Search from 'soapbox/features/compose/components/search.tsx'; -import { useAppDispatch, useFeatures, useInstance, useOwnAccount, useRegistrationStatus } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts'; import ProfileDropdown from './profile-dropdown.tsx'; diff --git a/src/features/ui/components/panels/account-note-panel.tsx b/src/features/ui/components/panels/account-note-panel.tsx index 8c4911da4..f59fb528e 100644 --- a/src/features/ui/components/panels/account-note-panel.tsx +++ b/src/features/ui/components/panels/account-note-panel.tsx @@ -7,7 +7,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Textarea from 'soapbox/components/ui/textarea.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import type { Account as AccountEntity } from 'soapbox/schemas/index.ts'; import type { AppDispatch } from 'soapbox/store.ts'; diff --git a/src/features/ui/components/panels/new-event-panel.tsx b/src/features/ui/components/panels/new-event-panel.tsx index 6785c6d49..33e8a49c7 100644 --- a/src/features/ui/components/panels/new-event-panel.tsx +++ b/src/features/ui/components/panels/new-event-panel.tsx @@ -5,7 +5,7 @@ import { openModal } from 'soapbox/actions/modals.ts'; import Button from 'soapbox/components/ui/button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const NewEventPanel = () => { const dispatch = useAppDispatch(); diff --git a/src/features/ui/components/panels/new-group-panel.tsx b/src/features/ui/components/panels/new-group-panel.tsx index 58fd5ae62..3dc293887 100644 --- a/src/features/ui/components/panels/new-group-panel.tsx +++ b/src/features/ui/components/panels/new-group-panel.tsx @@ -4,7 +4,8 @@ import { openModal } from 'soapbox/actions/modals.ts'; import Button from 'soapbox/components/ui/button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions.ts'; const NewGroupPanel = () => { diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx index f8ebd07a8..d3dbd1c64 100644 --- a/src/features/ui/components/panels/sign-up-panel.tsx +++ b/src/features/ui/components/panels/sign-up-panel.tsx @@ -4,7 +4,11 @@ import { openModal } from 'soapbox/actions/modals.ts'; import Button from 'soapbox/components/ui/button.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch, useAppSelector, useFeatures, useInstance, useRegistrationStatus } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts'; const SignUpPanel = () => { const { instance } = useInstance(); diff --git a/src/features/ui/components/pending-status.tsx b/src/features/ui/components/pending-status.tsx index 6f8aee242..ff6fe7eee 100644 --- a/src/features/ui/components/pending-status.tsx +++ b/src/features/ui/components/pending-status.tsx @@ -9,7 +9,7 @@ import Stack from 'soapbox/components/ui/stack.tsx'; import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card.tsx'; import PlaceholderMediaGallery from 'soapbox/features/placeholder/components/placeholder-media-gallery.tsx'; import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { buildStatus } from '../util/pending-status-builder.ts'; diff --git a/src/features/ui/components/pinned-accounts-panel.tsx b/src/features/ui/components/pinned-accounts-panel.tsx index f96189c13..658c06865 100644 --- a/src/features/ui/components/pinned-accounts-panel.tsx +++ b/src/features/ui/components/pinned-accounts-panel.tsx @@ -7,7 +7,8 @@ import { fetchPinnedAccounts } from 'soapbox/actions/accounts.ts'; import Widget from 'soapbox/components/ui/widget.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; import { WhoToFollowPanel } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/poll-preview.tsx b/src/features/ui/components/poll-preview.tsx index eb3da5a97..4fb80a8e0 100644 --- a/src/features/ui/components/poll-preview.tsx +++ b/src/features/ui/components/poll-preview.tsx @@ -2,7 +2,7 @@ import noop from 'lodash/noop'; import PollOption from 'soapbox/components/polls/poll-option.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { Poll as PollEntity } from 'soapbox/types/entities.ts'; interface IPollPreview { diff --git a/src/features/ui/components/profile-dropdown.tsx b/src/features/ui/components/profile-dropdown.tsx index b80b26e57..2295cbdbc 100644 --- a/src/features/ui/components/profile-dropdown.tsx +++ b/src/features/ui/components/profile-dropdown.tsx @@ -10,7 +10,10 @@ import { Link } from 'react-router-dom'; import { fetchOwnAccounts, logOut, switchAccount } from 'soapbox/actions/auth.ts'; import Account from 'soapbox/components/account.tsx'; import { MenuDivider } from 'soapbox/components/ui/menu.tsx'; -import { useAppDispatch, useAppSelector, useClickOutside, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useClickOutside } from 'soapbox/hooks/useClickOutside.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { makeGetOtherAccounts } from 'soapbox/selectors/index.ts'; import ThemeToggle from './theme-toggle.tsx'; diff --git a/src/features/ui/components/profile-familiar-followers.tsx b/src/features/ui/components/profile-familiar-followers.tsx index f10b00b5b..7d648476b 100644 --- a/src/features/ui/components/profile-familiar-followers.tsx +++ b/src/features/ui/components/profile-familiar-followers.tsx @@ -10,7 +10,9 @@ import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper.tsx'; import HStack from 'soapbox/components/ui/hstack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; -import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { makeGetAccount } from 'soapbox/selectors/index.ts'; import type { Account } from 'soapbox/schemas/index.ts'; diff --git a/src/features/ui/components/profile-info-panel.tsx b/src/features/ui/components/profile-info-panel.tsx index 208883631..47c0fc665 100644 --- a/src/features/ui/components/profile-info-panel.tsx +++ b/src/features/ui/components/profile-info-panel.tsx @@ -13,7 +13,8 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Icon from 'soapbox/components/ui/icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppSelector, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { capitalize } from 'soapbox/utils/strings.ts'; import ProfileFamiliarFollowers from './profile-familiar-followers.tsx'; diff --git a/src/features/ui/components/profile-media-panel.tsx b/src/features/ui/components/profile-media-panel.tsx index a1d002dda..d155c2ece 100644 --- a/src/features/ui/components/profile-media-panel.tsx +++ b/src/features/ui/components/profile-media-panel.tsx @@ -7,7 +7,8 @@ import { expandAccountMediaTimeline } from 'soapbox/actions/timelines.ts'; import Spinner from 'soapbox/components/ui/spinner.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useAppDispatch, useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { getAccountGallery } from 'soapbox/selectors/index.ts'; import MediaItem from '../../account-gallery/components/media-item.tsx'; diff --git a/src/features/ui/components/promo-panel.tsx b/src/features/ui/components/promo-panel.tsx index 49fd6fb97..4cf71a7a0 100644 --- a/src/features/ui/components/promo-panel.tsx +++ b/src/features/ui/components/promo-panel.tsx @@ -2,7 +2,9 @@ import ForkAwesomeIcon from 'soapbox/components/fork-awesome-icon.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; -import { useInstance, useSettings, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; const PromoPanel: React.FC = () => { const { instance } = useInstance(); diff --git a/src/features/ui/components/subscription-button.tsx b/src/features/ui/components/subscription-button.tsx index ba8c0ad18..2bd1fdd0b 100644 --- a/src/features/ui/components/subscription-button.tsx +++ b/src/features/ui/components/subscription-button.tsx @@ -8,7 +8,8 @@ import { } from 'soapbox/actions/accounts.ts'; import { useFollow } from 'soapbox/api/hooks/index.ts'; import IconButton from 'soapbox/components/ui/icon-button.tsx'; -import { useAppDispatch, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import toast from 'soapbox/toast.tsx'; import type { Account as AccountEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/components/theme-toggle.tsx b/src/features/ui/components/theme-toggle.tsx index fe5781d22..a8739cf86 100644 --- a/src/features/ui/components/theme-toggle.tsx +++ b/src/features/ui/components/theme-toggle.tsx @@ -1,5 +1,6 @@ import { changeSetting } from 'soapbox/actions/settings.ts'; -import { useAppDispatch, useSettings } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import ThemeSelector from './theme-selector.tsx'; diff --git a/src/features/ui/components/timeline.tsx b/src/features/ui/components/timeline.tsx index 1efd40dba..bb11f3985 100644 --- a/src/features/ui/components/timeline.tsx +++ b/src/features/ui/components/timeline.tsx @@ -7,7 +7,8 @@ import { dequeueTimeline, scrollTopTimeline } from 'soapbox/actions/timelines.ts import ScrollTopButton from 'soapbox/components/scroll-top-button.tsx'; import StatusList, { IStatusList } from 'soapbox/components/status-list.tsx'; import Portal from 'soapbox/components/ui/portal.tsx'; -import { useAppSelector, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { makeGetStatusIds } from 'soapbox/selectors/index.ts'; const messages = defineMessages({ diff --git a/src/features/ui/components/trends-panel.tsx b/src/features/ui/components/trends-panel.tsx index a1b4c3a4d..fd1afefec 100644 --- a/src/features/ui/components/trends-panel.tsx +++ b/src/features/ui/components/trends-panel.tsx @@ -6,7 +6,7 @@ import Hashtag from 'soapbox/components/hashtag.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; import PlaceholderSidebarTrends from 'soapbox/features/placeholder/components/placeholder-sidebar-trends.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import useTrends from 'soapbox/queries/trends.ts'; interface ITrendsPanel { diff --git a/src/features/ui/components/user-panel.tsx b/src/features/ui/components/user-panel.tsx index 47543233c..596c5c606 100644 --- a/src/features/ui/components/user-panel.tsx +++ b/src/features/ui/components/user-panel.tsx @@ -8,7 +8,7 @@ import HStack from 'soapbox/components/ui/hstack.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import Text from 'soapbox/components/ui/text.tsx'; import VerificationBadge from 'soapbox/components/verification-badge.tsx'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; import { getAcct } from 'soapbox/utils/accounts.ts'; import { shortNumberFormat } from 'soapbox/utils/numbers.tsx'; import { displayFqn } from 'soapbox/utils/state.ts'; diff --git a/src/features/ui/components/who-to-follow-panel.tsx b/src/features/ui/components/who-to-follow-panel.tsx index 3f763d46d..a56775a20 100644 --- a/src/features/ui/components/who-to-follow-panel.tsx +++ b/src/features/ui/components/who-to-follow-panel.tsx @@ -6,7 +6,7 @@ import Text from 'soapbox/components/ui/text.tsx'; import Widget from 'soapbox/components/ui/widget.tsx'; import AccountContainer from 'soapbox/containers/account-container.tsx'; import PlaceholderSidebarSuggestions from 'soapbox/features/placeholder/components/placeholder-sidebar-suggestions.tsx'; -import { useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { useDismissSuggestion, useSuggestions } from 'soapbox/queries/suggestions.ts'; import type { Account as AccountEntity } from 'soapbox/types/entities.ts'; diff --git a/src/features/ui/index.tsx b/src/features/ui/index.tsx index 57c2e5342..6dbe3412d 100644 --- a/src/features/ui/index.tsx +++ b/src/features/ui/index.tsx @@ -16,7 +16,15 @@ import { useUserStream } from 'soapbox/api/hooks/index.ts'; import SidebarNavigation from 'soapbox/components/sidebar-navigation.tsx'; import ThumbNavigation from 'soapbox/components/thumb-navigation.tsx'; import Layout from 'soapbox/components/ui/layout.tsx'; -import { useAppDispatch, useAppSelector, useOwnAccount, useSoapboxConfig, useFeatures, useDraggedFiles, useInstance, useLoggedIn, useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import AdminPage from 'soapbox/pages/admin-page.tsx'; import ChatsPage from 'soapbox/pages/chats-page.tsx'; import DefaultPage from 'soapbox/pages/default-page.tsx'; diff --git a/src/features/ui/util/global-hotkeys.tsx b/src/features/ui/util/global-hotkeys.tsx index ce187249c..29f47d6a6 100644 --- a/src/features/ui/util/global-hotkeys.tsx +++ b/src/features/ui/util/global-hotkeys.tsx @@ -4,7 +4,9 @@ import { useHistory } from 'react-router-dom'; import { resetCompose } from 'soapbox/actions/compose.ts'; import { openModal } from 'soapbox/actions/modals.ts'; import { FOCUS_EDITOR_COMMAND } from 'soapbox/features/compose/editor/plugins/focus-plugin.tsx'; -import { useAppSelector, useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { HotKeys } from '../components/hotkeys.tsx'; diff --git a/src/features/ui/util/optional-motion.tsx b/src/features/ui/util/optional-motion.tsx index 79855d639..572d1cc98 100644 --- a/src/features/ui/util/optional-motion.tsx +++ b/src/features/ui/util/optional-motion.tsx @@ -1,6 +1,6 @@ import { Motion, MotionProps } from 'react-motion'; -import { useSettings } from 'soapbox/hooks/index.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import ReducedMotion from './reduced-motion.tsx'; diff --git a/src/features/ui/util/react-router-helpers.tsx b/src/features/ui/util/react-router-helpers.tsx index 13c9f29f1..394381a8a 100644 --- a/src/features/ui/util/react-router-helpers.tsx +++ b/src/features/ui/util/react-router-helpers.tsx @@ -3,7 +3,8 @@ import { ErrorBoundary, type FallbackProps } from 'react-error-boundary'; import { Redirect, Route, useHistory, RouteProps, RouteComponentProps, match as MatchType, useLocation } from 'react-router-dom'; import Layout from 'soapbox/components/ui/layout.tsx'; -import { useOwnAccount, useSettings } from 'soapbox/hooks/index.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; import ColumnForbidden from '../components/column-forbidden.tsx'; import ColumnLoading from '../components/column-loading.tsx'; diff --git a/src/features/zap/components/zap-pay-request-form.tsx b/src/features/zap/components/zap-pay-request-form.tsx index 9575c3cc2..7e1c62869 100644 --- a/src/features/zap/components/zap-pay-request-form.tsx +++ b/src/features/zap/components/zap-pay-request-form.tsx @@ -21,7 +21,7 @@ import Input from 'soapbox/components/ui/input.tsx'; import Stack from 'soapbox/components/ui/stack.tsx'; import SvgIcon from 'soapbox/components/ui/svg-icon.tsx'; import Text from 'soapbox/components/ui/text.tsx'; -import { useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import ZapButton from './zap-button/zap-button.tsx'; diff --git a/src/hooks/index.ts b/src/hooks/index.ts deleted file mode 100644 index 2c27dfa80..000000000 --- a/src/hooks/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -export { useApi } from './useApi.ts'; -export { useAppDispatch } from './useAppDispatch.ts'; -export { useAppSelector } from './useAppSelector.ts'; -export { useBackend } from './useBackend.ts'; -export { useClickOutside } from './useClickOutside.ts'; -export { useCompose } from './useCompose.ts'; -export { useDebounce } from './useDebounce.ts'; -export { useDraggedFiles } from './useDraggedFiles.ts'; -export { useGetState } from './useGetState.ts'; -export { useDimensions } from './useDimensions.ts'; -export { useFeatures } from './useFeatures.ts'; -export { useInstance } from './useInstance.ts'; -export { useLoading } from './useLoading.ts'; -export { useLocale } from './useLocale.ts'; -export { useLoggedIn } from './useLoggedIn.ts'; -export { useOnScreen } from './useOnScreen.ts'; -export { useOwnAccount } from './useOwnAccount.ts'; -export { usePrevious } from './usePrevious.ts'; -export { useRefEventHandler } from './useRefEventHandler.ts'; -export { useRegistrationStatus } from './useRegistrationStatus.ts'; -export { useSettings } from './useSettings.ts'; -export { useSoapboxConfig } from './useSoapboxConfig.ts'; -export { useSystemTheme } from './useSystemTheme.ts'; -export { useTheme } from './useTheme.ts'; -export { useSettingsNotifications } from './useSettingsNotifications.ts'; \ No newline at end of file diff --git a/src/hooks/nostr/useSigner.ts b/src/hooks/nostr/useSigner.ts index 6a8d38a98..93eab2423 100644 --- a/src/hooks/nostr/useSigner.ts +++ b/src/hooks/nostr/useSigner.ts @@ -2,8 +2,8 @@ import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; import { keyring } from 'soapbox/features/nostr/keyring.ts'; -import { useAppSelector } from 'soapbox/hooks/index.ts'; import { useBunkerStore } from 'soapbox/hooks/nostr/useBunkerStore.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; export function useSigner() { const { connections } = useBunkerStore(); diff --git a/src/init/soapbox-head.tsx b/src/init/soapbox-head.tsx index b8e608615..a9ead879b 100644 --- a/src/init/soapbox-head.tsx +++ b/src/init/soapbox-head.tsx @@ -1,12 +1,10 @@ import clsx from 'clsx'; import { lazy, useEffect } from 'react'; -import { - useSettings, - useSoapboxConfig, - useTheme, - useLocale, -} from 'soapbox/hooks/index.ts'; +import { useLocale } from 'soapbox/hooks/useLocale.ts'; +import { useSettings } from 'soapbox/hooks/useSettings.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; +import { useTheme } from 'soapbox/hooks/useTheme.ts'; import { normalizeSoapboxConfig } from 'soapbox/normalizers/index.ts'; import { startSentry } from 'soapbox/sentry.ts'; import { generateThemeCss } from 'soapbox/utils/theme.ts'; diff --git a/src/init/soapbox-load.tsx b/src/init/soapbox-load.tsx index 3f1617ebb..fa77d86e0 100644 --- a/src/init/soapbox-load.tsx +++ b/src/init/soapbox-load.tsx @@ -6,15 +6,13 @@ import { fetchMe } from 'soapbox/actions/me.ts'; import { loadSoapboxConfig } from 'soapbox/actions/soapbox.ts'; import LoadingScreen from 'soapbox/components/loading-screen.tsx'; import { useNostr } from 'soapbox/contexts/nostr-context.tsx'; -import { - useAppSelector, - useAppDispatch, - useOwnAccount, - useLocale, - useInstance, -} from 'soapbox/hooks/index.ts'; import { useBunker } from 'soapbox/hooks/nostr/useBunker.ts'; import { useSigner } from 'soapbox/hooks/nostr/useSigner.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useInstance } from 'soapbox/hooks/useInstance.ts'; +import { useLocale } from 'soapbox/hooks/useLocale.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import MESSAGES from 'soapbox/messages.ts'; /** Load initial data from the backend */ diff --git a/src/init/soapbox-mount.tsx b/src/init/soapbox-mount.tsx index 1f193551f..bf61583c3 100644 --- a/src/init/soapbox-mount.tsx +++ b/src/init/soapbox-mount.tsx @@ -8,16 +8,12 @@ import * as BuildConfig from 'soapbox/build-config.ts'; import LoadingScreen from 'soapbox/components/loading-screen.tsx'; import { ScrollContext } from 'soapbox/components/scroll-context.tsx'; import SiteErrorBoundary from 'soapbox/components/site-error-boundary.tsx'; -import { - ModalContainer, -} from 'soapbox/features/ui/util/async-components.ts'; -import { - useAppDispatch, - useAppSelector, - useLoggedIn, - useOwnAccount, - useSoapboxConfig, -} from 'soapbox/hooks/index.ts'; +import { ModalContainer } from 'soapbox/features/ui/util/async-components.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useLoggedIn } from 'soapbox/hooks/useLoggedIn.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { useCachedLocationHandler } from 'soapbox/utils/redirect.ts'; const GdprBanner = lazy(() => import('soapbox/components/gdpr-banner.tsx')); diff --git a/src/pages/default-page.tsx b/src/pages/default-page.tsx index f2d9dc36b..5597b661b 100644 --- a/src/pages/default-page.tsx +++ b/src/pages/default-page.tsx @@ -6,7 +6,8 @@ import { SignUpPanel, CtaBanner, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface IDefaultPage { children: React.ReactNode; diff --git a/src/pages/event-page.tsx b/src/pages/event-page.tsx index 23aaf7b4d..1146c7c35 100644 --- a/src/pages/event-page.tsx +++ b/src/pages/event-page.tsx @@ -13,7 +13,8 @@ import { TrendsPanel, WhoToFollowPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { makeGetStatus } from 'soapbox/selectors/index.ts'; const getStatus = makeGetStatus(); diff --git a/src/pages/events-page.tsx b/src/pages/events-page.tsx index f2a4ea557..f5c1a8ae4 100644 --- a/src/pages/events-page.tsx +++ b/src/pages/events-page.tsx @@ -5,7 +5,7 @@ import { TrendsPanel, NewEventPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useFeatures } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface IEventsPage { children: React.ReactNode; diff --git a/src/pages/group-page.tsx b/src/pages/group-page.tsx index 88f7080ef..da64e60a0 100644 --- a/src/pages/group-page.tsx +++ b/src/pages/group-page.tsx @@ -20,7 +20,8 @@ import { SignUpPanel, SuggestedGroupsPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import type { Group } from 'soapbox/schemas/index.ts'; diff --git a/src/pages/home-page.tsx b/src/pages/home-page.tsx index 24090b5aa..859c0036c 100644 --- a/src/pages/home-page.tsx +++ b/src/pages/home-page.tsx @@ -20,8 +20,13 @@ import { CtaBanner, AnnouncementsPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useOwnAccount, useFeatures, useSoapboxConfig, useDraggedFiles, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useDraggedFiles } from 'soapbox/hooks/useDraggedFiles.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; import { useIsMobile } from 'soapbox/hooks/useIsMobile.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import ComposeForm from '../features/compose/components/compose-form.tsx'; diff --git a/src/pages/landing-page.tsx b/src/pages/landing-page.tsx index 195943dba..1620ec015 100644 --- a/src/pages/landing-page.tsx +++ b/src/pages/landing-page.tsx @@ -6,7 +6,8 @@ import { CtaBanner, WhoToFollowPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface ILandingPage { children: React.ReactNode; diff --git a/src/pages/profile-page.tsx b/src/pages/profile-page.tsx index 6f4d41388..b9dc04bb7 100644 --- a/src/pages/profile-page.tsx +++ b/src/pages/profile-page.tsx @@ -17,7 +17,9 @@ import { PinnedAccountsPanel, AccountNotePanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useSoapboxConfig } from 'soapbox/hooks/useSoapboxConfig.ts'; import { getAcct } from 'soapbox/utils/accounts.ts'; interface IProfilePage { diff --git a/src/pages/remote-instance-page.tsx b/src/pages/remote-instance-page.tsx index 043125c9a..476e1308e 100644 --- a/src/pages/remote-instance-page.tsx +++ b/src/pages/remote-instance-page.tsx @@ -5,7 +5,8 @@ import { InstanceInfoPanel, InstanceModerationPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { federationRestrictionsDisclosed } from 'soapbox/utils/state.ts'; interface IRemoteInstancePage { diff --git a/src/pages/search-page.tsx b/src/pages/search-page.tsx index ac372c6cb..550e26eea 100644 --- a/src/pages/search-page.tsx +++ b/src/pages/search-page.tsx @@ -7,7 +7,8 @@ import { CtaBanner, SuggestedGroupsPanel, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface ISearchPage { children: React.ReactNode; diff --git a/src/pages/status-page.tsx b/src/pages/status-page.tsx index a63a983c8..84cc0d92e 100644 --- a/src/pages/status-page.tsx +++ b/src/pages/status-page.tsx @@ -6,7 +6,8 @@ import { SignUpPanel, CtaBanner, } from 'soapbox/features/ui/util/async-components.ts'; -import { useAppSelector, useFeatures } from 'soapbox/hooks/index.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; interface IStatusPage { children: React.ReactNode; diff --git a/src/queries/accounts.ts b/src/queries/accounts.ts index 0dbcb03b5..34e3c3497 100644 --- a/src/queries/accounts.ts +++ b/src/queries/accounts.ts @@ -1,7 +1,9 @@ import { useMutation } from '@tanstack/react-query'; import { patchMeSuccess } from 'soapbox/actions/me.ts'; -import { useApi, useAppDispatch, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import toast from 'soapbox/toast.tsx'; export type IAccount = { diff --git a/src/queries/chats.ts b/src/queries/chats.ts index 49ecef1bb..a80c6f757 100644 --- a/src/queries/chats.ts +++ b/src/queries/chats.ts @@ -4,7 +4,11 @@ import sumBy from 'lodash/sumBy'; import { importFetchedAccount, importFetchedAccounts } from 'soapbox/actions/importer/index.ts'; import { ChatWidgetScreens, useChatContext } from 'soapbox/contexts/chat-context.tsx'; import { useStatContext } from 'soapbox/contexts/stat-context.tsx'; -import { useApi, useAppDispatch, useAppSelector, useFeatures, useOwnAccount } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; +import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts'; +import { useFeatures } from 'soapbox/hooks/useFeatures.ts'; +import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts'; import { normalizeChatMessage } from 'soapbox/normalizers/index.ts'; import toast from 'soapbox/toast.tsx'; import { ChatMessage } from 'soapbox/types/entities.ts'; diff --git a/src/queries/embed.ts b/src/queries/embed.ts index f183eb5a6..d0ddead89 100644 --- a/src/queries/embed.ts +++ b/src/queries/embed.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; type Embed = { type: string; diff --git a/src/queries/relationships.ts b/src/queries/relationships.ts index c5d11062d..9804dd9c4 100644 --- a/src/queries/relationships.ts +++ b/src/queries/relationships.ts @@ -1,7 +1,8 @@ import { useMutation } from '@tanstack/react-query'; import { fetchRelationshipsFail, fetchRelationshipsSuccess } from 'soapbox/actions/accounts.ts'; -import { useApi, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; const useFetchRelationships = () => { const api = useApi(); diff --git a/src/queries/search.ts b/src/queries/search.ts index b33c47264..c23d84baa 100644 --- a/src/queries/search.ts +++ b/src/queries/search.ts @@ -1,6 +1,6 @@ import { keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'; -import { useApi } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; import { Account } from 'soapbox/types/entities.ts'; import { getPagination } from 'soapbox/utils/pagination.ts'; import { flattenPages, PaginatedResult } from 'soapbox/utils/queries.ts'; diff --git a/src/queries/suggestions.ts b/src/queries/suggestions.ts index 42df95660..71076a86a 100644 --- a/src/queries/suggestions.ts +++ b/src/queries/suggestions.ts @@ -2,7 +2,8 @@ import { useInfiniteQuery, useMutation, keepPreviousData } from '@tanstack/react import { fetchRelationships } from 'soapbox/actions/accounts.ts'; import { importFetchedAccounts } from 'soapbox/actions/importer/index.ts'; -import { useApi, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { getPagination } from 'soapbox/utils/pagination.ts'; import { PaginatedResult, removePageItem } from '../utils/queries.ts'; diff --git a/src/queries/trends.ts b/src/queries/trends.ts index 023a329f8..1aa292224 100644 --- a/src/queries/trends.ts +++ b/src/queries/trends.ts @@ -1,7 +1,8 @@ import { useQuery } from '@tanstack/react-query'; import { fetchTrendsSuccess } from 'soapbox/actions/trends.ts'; -import { useApi, useAppDispatch } from 'soapbox/hooks/index.ts'; +import { useApi } from 'soapbox/hooks/useApi.ts'; +import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts'; import { normalizeTag } from 'soapbox/normalizers/index.ts'; import type { Tag } from 'soapbox/types/entities.ts';