Merge branch 'improve-entity-organization' into 'develop'

Move Group hooks to api folder

See merge request soapbox-pub/soapbox!2484

app/soapbox/api/hooks/accounts/useAccount.ts

@@ -1,8 +1,8 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 import { type Account, accountSchema } from 'soapbox/schemas';
 
-import { useApi } from '../useApi';
 
 import { useRelationships } from './useRelationships';
 

app/soapbox/api/hooks/accounts/useRelationships.ts

@@ -1,9 +1,8 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks/useApi';
 import { type Relationship, relationshipSchema } from 'soapbox/schemas';
 
-import { useApi } from '../useApi';
-
 function useRelationships(ids: string[]) {
   const api = useApi();
 

app/soapbox/api/hooks/groups/useGroup.ts

@@ -0,0 +1,24 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type Group, groupSchema } from 'soapbox/schemas';
+
+import { useGroupRelationship } from './useGroupRelationship';
+
+function useGroup(groupId: string, refetch = true) {
+  const api = useApi();
+
+  const { entity: group, ...result } = useEntity<Group>(
+    [Entities.GROUPS, groupId],
+    () => api.get(`/api/v1/groups/${groupId}`),
+    { schema: groupSchema, refetch },
+  );
+  const { entity: relationship } = useGroupRelationship(groupId);
+
+  return {
+    ...result,
+    group: group ? { ...group, relationship: relationship || null } : undefined,
+  };
+}
+
+export { useGroup };

app/soapbox/api/hooks/groups/useGroupMembers.ts

@@ -3,7 +3,7 @@ import { useEntities } from 'soapbox/entity-store/hooks';
 import { GroupMember, groupMemberSchema } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import { useApi } from '../useApi';
+import { useApi } from '../../../hooks/useApi';
 
 function useGroupMembers(groupId: string, role: GroupRoles) {
   const api = useApi();

app/soapbox/api/hooks/groups/useGroupMembershipRequests.ts

@@ -4,7 +4,7 @@ import { useApi } from 'soapbox/hooks/useApi';
 import { accountSchema } from 'soapbox/schemas';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import { useGroupRelationship } from './useGroups';
+import { useGroupRelationship } from './useGroupRelationship';
 
 import type { ExpandedEntitiesPath } from 'soapbox/entity-store/hooks/types';
 

app/soapbox/api/hooks/groups/useGroupRelationship.ts

@@ -0,0 +1,32 @@
+import { useEffect } from 'react';
+import { z } from 'zod';
+
+import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntity } from 'soapbox/entity-store/hooks';
+import { useApi, useAppDispatch } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationship(groupId: string) {
+  const api = useApi();
+  const dispatch = useAppDispatch();
+
+  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, groupId],
+    () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
+    { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
+  );
+
+  useEffect(() => {
+    if (groupRelationship?.id) {
+      dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
+    }
+  }, [groupRelationship?.id]);
+
+  return {
+    entity: groupRelationship,
+    ...result,
+  };
+}
+
+export { useGroupRelationship };

app/soapbox/api/hooks/groups/useGroupRelationships.ts

@@ -0,0 +1,27 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { type GroupRelationship, groupRelationshipSchema } from 'soapbox/schemas';
+
+function useGroupRelationships(groupIds: string[]) {
+  const api = useApi();
+  const q = groupIds.map(id => `id[]=${id}`).join('&');
+
+  const { entities, ...result } = useEntities<GroupRelationship>(
+    [Entities.GROUP_RELATIONSHIPS, ...groupIds],
+    () => api.get(`/api/v1/groups/relationships?${q}`),
+    { schema: groupRelationshipSchema, enabled: groupIds.length > 0 },
+  );
+
+  const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => {
+    map[relationship.id] = relationship;
+    return map;
+  }, {});
+
+  return {
+    ...result,
+    relationships,
+  };
+}
+
+export { useGroupRelationships };

app/soapbox/api/hooks/groups/useGroupSearch.ts

@@ -1,11 +1,9 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures } from 'soapbox/hooks';
 import { groupSchema } from 'soapbox/schemas';
 
-import { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
-
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 import type { Group } from 'soapbox/schemas';
 

app/soapbox/api/hooks/groups/useGroups.ts

@@ -0,0 +1,31 @@
+import { Entities } from 'soapbox/entity-store/entities';
+import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi } from 'soapbox/hooks';
+import { useFeatures } from 'soapbox/hooks/useFeatures';
+import { groupSchema, type Group } from 'soapbox/schemas/group';
+
+import { useGroupRelationships } from './useGroupRelationships';
+
+function useGroups(q: string = '') {
+  const api = useApi();
+  const features = useFeatures();
+
+  const { entities, ...result } = useEntities<Group>(
+    [Entities.GROUPS, 'search', q],
+    () => api.get('/api/v1/groups', { params: { q } }),
+    { enabled: features.groups, schema: groupSchema },
+  );
+  const { relationships } = useGroupRelationships(entities.map(entity => entity.id));
+
+  const groups = entities.map((group) => ({
+    ...group,
+    relationship: relationships[group.id] || null,
+  }));
+
+  return {
+    ...result,
+    groups,
+  };
+}
+
+export { useGroups };

app/soapbox/api/hooks/groups/useGroupsFromTag.ts

@@ -1,11 +1,9 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
+import { useApi, useFeatures } from 'soapbox/hooks';
 import { groupSchema } from 'soapbox/schemas';
 
-import { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
-
-import { useGroupRelationships } from './useGroups';
+import { useGroupRelationships } from './useGroupRelationships';
 
 import type { Group } from 'soapbox/schemas';
 

app/soapbox/api/hooks/groups/usePopularGroups.ts

@@ -2,9 +2,10 @@ import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
 import { Group, groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from '../api/groups/useGroups';
-import { useApi } from '../useApi';
-import { useFeatures } from '../useFeatures';
+import { useApi } from '../../../hooks/useApi';
+import { useFeatures } from '../../../hooks/useFeatures';
+
+import { useGroupRelationships } from './useGroupRelationships';
 
 function usePopularGroups() {
   const api = useApi();

app/soapbox/api/hooks/groups/usePopularTags.ts

@@ -1,9 +1,7 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
-import { GroupTag, groupTagSchema } from 'soapbox/schemas';
-
-import { useApi } from '../../useApi';
-import { useFeatures } from '../../useFeatures';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { type GroupTag, groupTagSchema } from 'soapbox/schemas';
 
 function usePopularTags() {
   const api = useApi();

app/soapbox/api/hooks/groups/useSuggestedGroups.ts

@@ -1,10 +1,9 @@
 import { Entities } from 'soapbox/entity-store/entities';
 import { useEntities } from 'soapbox/entity-store/hooks';
-import { Group, groupSchema } from 'soapbox/schemas';
+import { useApi, useFeatures } from 'soapbox/hooks';
+import { type Group, groupSchema } from 'soapbox/schemas';
 
-import { useGroupRelationships } from '../api/groups/useGroups';
-import { useApi } from '../useApi';
-import { useFeatures } from '../useFeatures';
+import { useGroupRelationships } from './useGroupRelationships';
 
 function useSuggestedGroups() {
   const api = useApi();

app/soapbox/api/hooks/index.ts

@@ -1,7 +1,8 @@
+
 /**
  * Accounts
  */
-export { useAccount } from './useAccount';
+export { useAccount } from './accounts/useAccount';
 
 /**
  * Groups
@@ -11,22 +12,29 @@ export { useCancelMembershipRequest } from './groups/useCancelMembershipRequest'
 export { useCreateGroup, type CreateGroupParams } from './groups/useCreateGroup';
 export { useDeleteGroup } from './groups/useDeleteGroup';
 export { useDemoteGroupMember } from './groups/useDemoteGroupMember';
-export { useGroup, useGroups } from './groups/useGroups';
+export { useGroup } from './groups/useGroup';
+export { useGroupLookup } from './groups/useGroupLookup';
 export { useGroupMedia } from './groups/useGroupMedia';
+export { useGroupMembers } from './groups/useGroupMembers';
 export { useGroupMembershipRequests } from './groups/useGroupMembershipRequests';
+export { useGroupRelationship } from './groups/useGroupRelationship';
+export { useGroupRelationships } from './groups/useGroupRelationships';
 export { useGroupSearch } from './groups/useGroupSearch';
 export { useGroupTag } from './groups/useGroupTag';
 export { useGroupTags } from './groups/useGroupTags';
 export { useGroupValidation } from './groups/useGroupValidation';
+export { useGroups } from './groups/useGroups';
 export { useGroupsFromTag } from './groups/useGroupsFromTag';
 export { useJoinGroup } from './groups/useJoinGroup';
 export { useLeaveGroup } from './groups/useLeaveGroup';
+export { usePopularGroups } from './groups/usePopularGroups';
 export { usePopularTags } from './groups/usePopularTags';
 export { usePromoteGroupMember } from './groups/usePromoteGroupMember';
+export { useSuggestedGroups } from './groups/useSuggestedGroups';
 export { useUpdateGroup } from './groups/useUpdateGroup';
 export { useUpdateGroupTag } from './groups/useUpdateGroupTag';
 
 /**
  * Relationships
  */
-export { useRelationships } from './useRelationships';
+export { useRelationships } from './accounts/useRelationships';

app/soapbox/components/hoc/group-lookup-hoc.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
+import { useGroupLookup } from 'soapbox/api/hooks';
 import ColumnLoading from 'soapbox/features/ui/components/column-loading';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 import { Layout } from '../ui';
 

app/soapbox/features/group/components/group-action-button.tsx

@@ -3,11 +3,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
 import { openModal } from 'soapbox/actions/modals';
+import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/api/hooks';
 import { Button } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
-import { useCancelMembershipRequest, useJoinGroup, useLeaveGroup } from 'soapbox/hooks/api';
 import { queryClient } from 'soapbox/queries/client';
 import { GroupKeys } from 'soapbox/queries/groups';
 import { GroupRoles } from 'soapbox/schemas/group-member';

app/soapbox/features/group/components/group-member-list-item.tsx

@@ -4,6 +4,7 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { groupKick } from 'soapbox/actions/groups';
 import { openModal } from 'soapbox/actions/modals';
+import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import DropdownMenu from 'soapbox/components/dropdown-menu/dropdown-menu';
 import { HStack } from 'soapbox/components/ui';
@@ -11,7 +12,6 @@ import { deleteEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder-account';
 import { useAppDispatch, useFeatures } from 'soapbox/hooks';
-import { useAccount, useBlockGroupMember, useDemoteGroupMember, usePromoteGroupMember } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 

app/soapbox/features/group/components/group-options-button.tsx

@@ -3,10 +3,10 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
 import { initReport, ReportableEntities } from 'soapbox/actions/reports';
+import { useLeaveGroup } from 'soapbox/api/hooks';
 import DropdownMenu, { Menu } from 'soapbox/components/dropdown-menu';
 import { IconButton } from 'soapbox/components/ui';
 import { useAppDispatch, useOwnAccount } from 'soapbox/hooks';
-import { useLeaveGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 

app/soapbox/features/group/components/group-tag-list-item.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
+import { useUpdateGroupTag } from 'soapbox/api/hooks';
 import { HStack, IconButton, Stack, Text, Tooltip } from 'soapbox/components/ui';
 import { importEntities } from 'soapbox/entity-store/actions';
 import { Entities } from 'soapbox/entity-store/entities';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useUpdateGroupTag } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { shortNumberFormat } from 'soapbox/utils/numbers';

app/soapbox/features/group/edit-group.tsx

@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { useGroup, useUpdateGroup } from 'soapbox/api/hooks';
 import { Button, Column, Form, FormActions, FormGroup, Icon, Input, Spinner, Textarea } from 'soapbox/components/ui';
 import { useAppSelector, useInstance } from 'soapbox/hooks';
-import { useGroup, useUpdateGroup } from 'soapbox/hooks/api';
 import { useImageField, useTextField } from 'soapbox/hooks/forms';
 import toast from 'soapbox/toast';
 import { isDefaultAvatar, isDefaultHeader } from 'soapbox/utils/accounts';

app/soapbox/features/group/group-blocked-members.tsx

@@ -2,11 +2,11 @@ import React, { useCallback, useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
 import { fetchGroupBlocks, groupUnblock } from 'soapbox/actions/groups';
+import { useGroup } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Button, Column, HStack, Spinner } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 import { makeGetAccount } from 'soapbox/selectors';
 import toast from 'soapbox/toast';
 

app/soapbox/features/group/group-gallery.tsx

@@ -2,11 +2,11 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useGroup, useGroupMedia } from 'soapbox/api/hooks';
 import LoadMore from 'soapbox/components/load-more';
 import MissingIndicator from 'soapbox/components/missing-indicator';
 import { Column, Spinner } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroup, useGroupMedia } from 'soapbox/hooks/api';
 
 import MediaItem from '../account-gallery/components/media-item';
 

app/soapbox/features/group/group-members.tsx

@@ -1,12 +1,10 @@
 import clsx from 'clsx';
 import React, { useMemo } from 'react';
 
+import { useGroup, useGroupMembers, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import { PendingItemsRow } from 'soapbox/components/pending-items-row';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { useFeatures } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
-import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
-import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
 import PlaceholderAccount from '../placeholder/components/placeholder-account';
@@ -15,6 +13,7 @@ import GroupMemberListItem from './components/group-member-list-item';
 
 import type { Group } from 'soapbox/types/entities';
 
+
 interface IGroupMembers {
   params: { groupId: string }
 }

app/soapbox/features/group/group-membership-requests.tsx

@@ -1,12 +1,11 @@
 import React, { useEffect } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
+import { useGroup, useGroupMembers, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import Account from 'soapbox/components/account';
 import { AuthorizeRejectButtons } from 'soapbox/components/authorize-reject-buttons';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Column, HStack, Spinner } from 'soapbox/components/ui';
-import { useGroup, useGroupMembershipRequests } from 'soapbox/hooks/api';
-import { useGroupMembers } from 'soapbox/hooks/api/useGroupMembers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 

app/soapbox/features/group/group-tag-timeline.tsx

@@ -2,9 +2,9 @@ import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
 import { expandGroupTimelineFromTag } from 'soapbox/actions/timelines';
+import { useGroup, useGroupTag } from 'soapbox/api/hooks';
 import { Column, Icon, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroup, useGroupTag } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
 

app/soapbox/features/group/group-tags.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useGroupTags } from 'soapbox/api/hooks';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Icon, Stack, Text } from 'soapbox/components/ui';
-import { useGroupTags } from 'soapbox/hooks/api';
 import { useGroup } from 'soapbox/queries/groups';
 
 import PlaceholderAccount from '../placeholder/components/placeholder-account';

app/soapbox/features/group/group-timeline.tsx

@@ -6,10 +6,10 @@ import { Link } from 'react-router-dom';
 import { groupCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { connectGroupStream } from 'soapbox/actions/streaming';
 import { expandGroupTimeline } from 'soapbox/actions/timelines';
+import { useGroup } from 'soapbox/api/hooks';
 import { Avatar, HStack, Icon, Stack, Text, Toggle } from 'soapbox/components/ui';
 import ComposeForm from 'soapbox/features/compose/components/compose-form';
 import { useAppDispatch, useAppSelector, useDraggedFiles, useOwnAccount } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 
 import Timeline from '../ui/components/timeline';
 

app/soapbox/features/group/manage-group.tsx

@@ -3,10 +3,10 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useDeleteGroup, useGroup } from 'soapbox/api/hooks';
 import List, { ListItem } from 'soapbox/components/list';
 import { CardBody, CardHeader, CardTitle, Column, Spinner, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useBackend, useGroupsPath } from 'soapbox/hooks';
-import { useDeleteGroup, useGroup } from 'soapbox/hooks/api';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import toast from 'soapbox/toast';
 import { TRUTHSOCIAL } from 'soapbox/utils/features';

app/soapbox/features/groups/components/discover/popular-groups.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { usePopularGroups } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { Carousel, HStack, Stack, Text } from 'soapbox/components/ui';
 import PlaceholderGroupDiscover from 'soapbox/features/placeholder/components/placeholder-group-discover';
-import { usePopularGroups } from 'soapbox/hooks/api/usePopularGroups';
 
 import GroupGridItem from './group-grid-item';
 

app/soapbox/features/groups/components/discover/popular-tags.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { usePopularTags } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { HStack, Stack, Text } from 'soapbox/components/ui';
-import { usePopularTags } from 'soapbox/hooks/api';
 
 import TagListItem from './tag-list-item';
 

app/soapbox/features/groups/components/discover/search/results.tsx

@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useGroupSearch } from 'soapbox/api/hooks';
 import { HStack, Stack, Text } from 'soapbox/components/ui';
-import { useGroupSearch } from 'soapbox/hooks/api';
 
 import GroupGridItem from '../group-grid-item';
 import GroupListItem from '../group-list-item';

app/soapbox/features/groups/components/discover/search/search.tsx

@@ -1,10 +1,10 @@
 import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useGroupSearch } from 'soapbox/api/hooks';
 import { Stack } from 'soapbox/components/ui';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
 import { useDebounce, useOwnAccount } from 'soapbox/hooks';
-import { useGroupSearch } from 'soapbox/hooks/api';
 import { saveGroupSearch } from 'soapbox/utils/groups';
 
 import Blankslate from './blankslate';

app/soapbox/features/groups/components/discover/suggested-groups.tsx

@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import Link from 'soapbox/components/link';
 import { Carousel, HStack, Stack, Text } from 'soapbox/components/ui';
 import PlaceholderGroupDiscover from 'soapbox/features/placeholder/components/placeholder-group-discover';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 import GroupGridItem from './group-grid-item';
 

app/soapbox/features/groups/index.tsx

@@ -3,11 +3,11 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 
 import { openModal } from 'soapbox/actions/modals';
+import { useGroups } from 'soapbox/api/hooks';
 import GroupCard from 'soapbox/components/group-card';
 import ScrollableList from 'soapbox/components/scrollable-list';
 import { Button, Input, Stack, Text } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useDebounce, useFeatures } from 'soapbox/hooks';
-import { useGroups } from 'soapbox/hooks/api';
 import { PERMISSION_CREATE_GROUPS, hasPermission } from 'soapbox/utils/permissions';
 
 import PlaceholderGroupCard from '../placeholder/components/placeholder-group-card';

app/soapbox/features/groups/popular.tsx

@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { usePopularGroups } from 'soapbox/api/hooks';
 import { Column } from 'soapbox/components/ui';
-import { usePopularGroups } from 'soapbox/hooks/api/usePopularGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';

app/soapbox/features/groups/suggested.tsx

@@ -3,8 +3,8 @@ import React, { useCallback, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import { Column } from 'soapbox/components/ui';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';

app/soapbox/features/groups/tag.tsx

@@ -2,8 +2,8 @@ import clsx from 'clsx';
 import React, { useCallback, useState } from 'react';
 import { Components, Virtuoso, VirtuosoGrid } from 'react-virtuoso';
 
+import { useGroupTag, useGroupsFromTag } from 'soapbox/api/hooks';
 import { Column, HStack, Icon } from 'soapbox/components/ui';
-import { useGroupTag, useGroupsFromTag } from 'soapbox/hooks/api';
 
 import GroupGridItem from './components/discover/group-grid-item';
 import GroupListItem from './components/discover/group-list-item';

app/soapbox/features/groups/tags.tsx

@@ -3,8 +3,8 @@ import React from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { Virtuoso } from 'react-virtuoso';
 
+import { usePopularTags } from 'soapbox/api/hooks';
 import { Column, Text } from 'soapbox/components/ui';
-import { usePopularTags } from 'soapbox/hooks/api';
 
 import TagListItem from './components/discover/tag-list-item';
 

app/soapbox/features/ui/components/compose-button.tsx

@@ -4,9 +4,9 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
+import { useGroupLookup } from 'soapbox/api/hooks';
 import { Avatar, Button, HStack } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const ComposeButton = () => {
   const location = useLocation();

app/soapbox/features/ui/components/floating-action-button.tsx

@@ -5,9 +5,9 @@ import { useLocation, useRouteMatch } from 'react-router-dom';
 
 import { groupComposeModal } from 'soapbox/actions/compose';
 import { openModal } from 'soapbox/actions/modals';
+import { useGroupLookup } from 'soapbox/api/hooks';
 import { Avatar, HStack, Icon } from 'soapbox/components/ui';
 import { useAppDispatch } from 'soapbox/hooks';
-import { useGroupLookup } from 'soapbox/hooks/api/groups/useGroupLookup';
 
 const messages = defineMessages({
   publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },

app/soapbox/features/ui/components/modals/compose-modal.tsx

@@ -4,10 +4,10 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { cancelReplyCompose, setGroupTimelineVisible, uploadCompose } from 'soapbox/actions/compose';
 import { openModal, closeModal } from 'soapbox/actions/modals';
+import { useGroup } from 'soapbox/api/hooks';
 import { checkComposeContent } from 'soapbox/components/modal-root';
 import { HStack, Modal, Text, Toggle } from 'soapbox/components/ui';
 import { useAppDispatch, useAppSelector, useCompose, useDraggedFiles } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
 
 import ComposeForm from '../../../compose/components/compose-form';
 

app/soapbox/features/ui/components/modals/manage-group-modal/create-group-modal.tsx

@@ -2,9 +2,9 @@ import { AxiosError } from 'axios';
 import React, { useMemo, useState } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/api/hooks';
 import { Modal, Stack } from 'soapbox/components/ui';
 import { useDebounce } from 'soapbox/hooks';
-import { useCreateGroup, useGroupValidation, type CreateGroupParams } from 'soapbox/hooks/api';
 import { type Group } from 'soapbox/schemas';
 import toast from 'soapbox/toast';
 

app/soapbox/features/ui/components/modals/manage-group-modal/steps/details-step.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
+import { CreateGroupParams, useGroupValidation } from 'soapbox/api/hooks';
 import { Form, FormGroup, Input, Textarea } from 'soapbox/components/ui';
 import AvatarPicker from 'soapbox/features/group/components/group-avatar-picker';
 import HeaderPicker from 'soapbox/features/group/components/group-header-picker';
 import GroupTagsField from 'soapbox/features/group/components/group-tags-field';
 import { useAppSelector, useDebounce, useInstance } from 'soapbox/hooks';
-import { CreateGroupParams, useGroupValidation } from 'soapbox/hooks/api';
 import { usePreview } from 'soapbox/hooks/forms';
 import resizeImage from 'soapbox/utils/resize-image';
 

app/soapbox/features/ui/components/modals/manage-group-modal/steps/privacy-step.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import { type CreateGroupParams } from 'soapbox/api/hooks';
 import List, { ListItem } from 'soapbox/components/list';
 import { Form, FormGroup, Stack, Text } from 'soapbox/components/ui';
-import { type CreateGroupParams } from 'soapbox/hooks/api';
 
 interface IPrivacyStep {
   params: CreateGroupParams

app/soapbox/features/ui/components/panels/my-groups-panel.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { useGroups } from 'soapbox/api/hooks';
 import { Widget } from 'soapbox/components/ui';
 import GroupListItem from 'soapbox/features/groups/components/discover/group-list-item';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
-import { useGroups } from 'soapbox/hooks/api';
 
 const MyGroupsPanel = () => {
   const { groups, isFetching, isFetched, isError } = useGroups();

app/soapbox/features/ui/components/panels/suggested-groups-panel.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { useSuggestedGroups } from 'soapbox/api/hooks';
 import { Widget } from 'soapbox/components/ui';
 import GroupListItem from 'soapbox/features/groups/components/discover/group-list-item';
 import PlaceholderGroupSearch from 'soapbox/features/placeholder/components/placeholder-group-search';
-import { useSuggestedGroups } from 'soapbox/hooks/api/useSuggestedGroups';
 
 const SuggestedGroupsPanel = () => {
   const { groups, isFetching, isFetched, isError } = useSuggestedGroups();

app/soapbox/hooks/api/groups/useGroups.ts

@@ -1,93 +0,0 @@
-import { useEffect } from 'react';
-import { z } from 'zod';
-
-import { fetchGroupRelationshipsSuccess } from 'soapbox/actions/groups';
-import { Entities } from 'soapbox/entity-store/entities';
-import { useEntities, useEntity } from 'soapbox/entity-store/hooks';
-import { useApi, useAppDispatch } from 'soapbox/hooks';
-import { groupSchema, Group } from 'soapbox/schemas/group';
-import { groupRelationshipSchema, GroupRelationship } from 'soapbox/schemas/group-relationship';
-
-import { useFeatures } from '../../useFeatures';
-
-function useGroups(q: string = '') {
-  const api = useApi();
-  const features = useFeatures();
-
-  const { entities, ...result } = useEntities<Group>(
-    [Entities.GROUPS, 'search', q],
-    () => api.get('/api/v1/groups', { params: { q } }),
-    { enabled: features.groups, schema: groupSchema },
-  );
-  const { relationships } = useGroupRelationships(entities.map(entity => entity.id));
-
-  const groups = entities.map((group) => ({
-    ...group,
-    relationship: relationships[group.id] || null,
-  }));
-
-  return {
-    ...result,
-    groups,
-  };
-}
-
-function useGroup(groupId: string, refetch = true) {
-  const api = useApi();
-
-  const { entity: group, ...result } = useEntity<Group>(
-    [Entities.GROUPS, groupId],
-    () => api.get(`/api/v1/groups/${groupId}`),
-    { schema: groupSchema, refetch },
-  );
-  const { entity: relationship } = useGroupRelationship(groupId);
-
-  return {
-    ...result,
-    group: group ? { ...group, relationship: relationship || null } : undefined,
-  };
-}
-
-function useGroupRelationship(groupId: string) {
-  const api = useApi();
-  const dispatch = useAppDispatch();
-
-  const { entity: groupRelationship, ...result } = useEntity<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, groupId],
-    () => api.get(`/api/v1/groups/relationships?id[]=${groupId}`),
-    { schema: z.array(groupRelationshipSchema).transform(arr => arr[0]) },
-  );
-
-  useEffect(() => {
-    if (groupRelationship?.id) {
-      dispatch(fetchGroupRelationshipsSuccess([groupRelationship]));
-    }
-  }, [groupRelationship?.id]);
-
-  return {
-    entity: groupRelationship,
-    ...result,
-  };
-}
-
-function useGroupRelationships(groupIds: string[]) {
-  const api = useApi();
-  const q = groupIds.map(id => `id[]=${id}`).join('&');
-  const { entities, ...result } = useEntities<GroupRelationship>(
-    [Entities.GROUP_RELATIONSHIPS, ...groupIds],
-    () => api.get(`/api/v1/groups/relationships?${q}`),
-    { schema: groupRelationshipSchema, enabled: groupIds.length > 0 },
-  );
-
-  const relationships = entities.reduce<Record<string, GroupRelationship>>((map, relationship) => {
-    map[relationship.id] = relationship;
-    return map;
-  }, {});
-
-  return {
-    ...result,
-    relationships,
-  };
-}
-
-export { useGroup, useGroups, useGroupRelationship, useGroupRelationships };

app/soapbox/hooks/useGroupsPath.ts

@@ -1,4 +1,5 @@
-import { useGroups } from './api';
+import { useGroups } from 'soapbox/api/hooks';
+
 import { useFeatures } from './useFeatures';
 
 /**

app/soapbox/pages/group-page.tsx

@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
 
+import { useGroup, useGroupMembershipRequests } from 'soapbox/api/hooks';
 import GroupLookupHoc from 'soapbox/components/hoc/group-lookup-hoc';
 import { Column, Icon, Layout, Stack, Text } from 'soapbox/components/ui';
 import GroupHeader from 'soapbox/features/group/components/group-header';
@@ -14,12 +15,11 @@ import {
   SuggestedGroupsPanel,
 } from 'soapbox/features/ui/util/async-components';
 import { useFeatures, useOwnAccount } from 'soapbox/hooks';
-import { useGroup } from 'soapbox/hooks/api';
-import { useGroupMembershipRequests } from 'soapbox/hooks/api/groups/useGroupMembershipRequests';
-import { Group } from 'soapbox/schemas';
 
 import { Tabs } from '../components/ui';
 
+import type { Group } from 'soapbox/schemas';
+
 const messages = defineMessages({
   all: { id: 'group.tabs.all', defaultMessage: 'All' },
   members: { id: 'group.tabs.members', defaultMessage: 'Members' },