From 338fa4dfbed5b7b844cee7b4a06e8053e989256d Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Tue, 12 Aug 2025 18:52:34 +0300 Subject: remove imports from @atproto/api internals (#8403) --- src/components/StarterPack/Main/FeedsList.tsx | 14 ++++++++------ .../StarterPack/Wizard/WizardEditListDialog.tsx | 18 ++++++++++++------ src/components/StarterPack/Wizard/WizardListCard.tsx | 18 ++++++++++-------- src/screens/Hashtag.tsx | 6 +++--- src/screens/Onboarding/StepFinished.tsx | 4 ++-- src/screens/StarterPack/Wizard/State.tsx | 11 +++++++---- src/screens/StarterPack/Wizard/index.tsx | 6 ++++-- src/screens/Topic.tsx | 6 +++--- src/state/queries/starter-packs.ts | 13 ++++++------- src/state/queries/trending/useGetTrendsQuery.ts | 3 +-- src/state/queries/trending/useTrendingTopics.ts | 3 +-- src/view/com/composer/state/video.ts | 3 +-- 12 files changed, 58 insertions(+), 47 deletions(-) (limited to 'src') diff --git a/src/components/StarterPack/Main/FeedsList.tsx b/src/components/StarterPack/Main/FeedsList.tsx index 31d85ab42..45dcb9ff4 100644 --- a/src/components/StarterPack/Main/FeedsList.tsx +++ b/src/components/StarterPack/Main/FeedsList.tsx @@ -1,12 +1,11 @@ import React, {useCallback} from 'react' -import {ListRenderItemInfo, View} from 'react-native' -import {AppBskyFeedDefs} from '@atproto/api' -import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' +import {type ListRenderItemInfo, View} from 'react-native' +import {type AppBskyFeedDefs} from '@atproto/api' import {useBottomBarOffset} from '#/lib/hooks/useBottomBarOffset' import {isNative, isWeb} from '#/platform/detection' -import {List, ListRef} from '#/view/com/util/List' -import {SectionRef} from '#/screens/Profile/Sections/types' +import {List, type ListRef} from '#/view/com/util/List' +import {type SectionRef} from '#/screens/Profile/Sections/types' import {atoms as a, useTheme} from '#/alf' import * as FeedCard from '#/components/FeedCard' @@ -37,7 +36,10 @@ export const FeedsList = React.forwardRef( scrollToTop: onScrollToTop, })) - const renderItem = ({item, index}: ListRenderItemInfo) => { + const renderItem = ({ + item, + index, + }: ListRenderItemInfo) => { return ( void moderationOpts: ModerationOpts diff --git a/src/screens/Hashtag.tsx b/src/screens/Hashtag.tsx index d1b7ab0db..f09ff522a 100644 --- a/src/screens/Hashtag.tsx +++ b/src/screens/Hashtag.tsx @@ -1,6 +1,6 @@ import React from 'react' import {type ListRenderItemInfo, View} from 'react-native' -import {type PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' +import {type AppBskyFeedDefs} from '@atproto/api' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useFocusEffect} from '@react-navigation/native' @@ -25,11 +25,11 @@ import {ArrowOutOfBoxModified_Stroke2_Corner2_Rounded as Share} from '#/componen import * as Layout from '#/components/Layout' import {ListFooter, ListMaybePlaceholder} from '#/components/Lists' -const renderItem = ({item}: ListRenderItemInfo) => { +const renderItem = ({item}: ListRenderItemInfo) => { return } -const keyExtractor = (item: PostView, index: number) => { +const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => { return `${item.uri}-${index}` } diff --git a/src/screens/Onboarding/StepFinished.tsx b/src/screens/Onboarding/StepFinished.tsx index fa45baa65..54d282a5e 100644 --- a/src/screens/Onboarding/StepFinished.tsx +++ b/src/screens/Onboarding/StepFinished.tsx @@ -1,12 +1,12 @@ import React from 'react' import {View} from 'react-native' import { + type AppBskyActorDefs, type AppBskyActorProfile, type AppBskyGraphDefs, AppBskyGraphStarterpack, type Un$Typed, } from '@atproto/api' -import {type SavedFeed} from '@atproto/api/dist/client/types/app/bsky/actor/defs' import {TID} from '@atproto/common-web' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -108,7 +108,7 @@ export function StepFinished() { await agent.setInterestsPref({tags: selectedInterests}) // Default feeds that every user should have pinned when landing in the app - const feedsToSave: SavedFeed[] = [ + const feedsToSave: AppBskyActorDefs.SavedFeed[] = [ { ...DISCOVER_SAVED_FEED, id: TID.nextStr(), diff --git a/src/screens/StarterPack/Wizard/State.tsx b/src/screens/StarterPack/Wizard/State.tsx index 07d744c06..04901ee48 100644 --- a/src/screens/StarterPack/Wizard/State.tsx +++ b/src/screens/StarterPack/Wizard/State.tsx @@ -1,6 +1,9 @@ import React from 'react' -import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api' -import {type GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' +import { + type AppBskyFeedDefs, + type AppBskyGraphDefs, + AppBskyGraphStarterpack, +} from '@atproto/api' import {msg, plural} from '@lingui/macro' import {STARTER_PACK_MAX_SIZE} from '#/lib/constants' @@ -19,7 +22,7 @@ type Action = | {type: 'SetDescription'; description: string} | {type: 'AddProfile'; profile: bsky.profile.AnyProfileView} | {type: 'RemoveProfile'; profileDid: string} - | {type: 'AddFeed'; feed: GeneratorView} + | {type: 'AddFeed'; feed: AppBskyFeedDefs.GeneratorView} | {type: 'RemoveFeed'; feedUri: string} | {type: 'SetProcessing'; processing: boolean} | {type: 'SetError'; error: string} @@ -30,7 +33,7 @@ interface State { name?: string description?: string profiles: bsky.profile.AnyProfileView[] - feeds: GeneratorView[] + feeds: AppBskyFeedDefs.GeneratorView[] processing: boolean error?: string transitionDirection: 'Backward' | 'Forward' diff --git a/src/screens/StarterPack/Wizard/index.tsx b/src/screens/StarterPack/Wizard/index.tsx index a95174803..8256349df 100644 --- a/src/screens/StarterPack/Wizard/index.tsx +++ b/src/screens/StarterPack/Wizard/index.tsx @@ -5,11 +5,11 @@ import {useSafeAreaInsets} from 'react-native-safe-area-context' import {Image} from 'expo-image' import { type AppBskyActorDefs, + type AppBskyFeedDefs, type AppBskyGraphDefs, AtUri, type ModerationOpts, } from '@atproto/api' -import {type GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' import {msg, Plural, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useFocusEffect, useNavigation} from '@react-navigation/native' @@ -591,7 +591,9 @@ function Footer({ ) } -function getName(item: bsky.profile.AnyProfileView | GeneratorView) { +function getName( + item: bsky.profile.AnyProfileView | AppBskyFeedDefs.GeneratorView, +) { if (typeof item.displayName === 'string') { return enforceLen(sanitizeDisplayName(item.displayName), 28, true) } else if ('handle' in item && typeof item.handle === 'string') { diff --git a/src/screens/Topic.tsx b/src/screens/Topic.tsx index 6cf7cf65b..753dc75a4 100644 --- a/src/screens/Topic.tsx +++ b/src/screens/Topic.tsx @@ -1,6 +1,6 @@ import React from 'react' import {type ListRenderItemInfo, View} from 'react-native' -import {type PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' +import {type AppBskyFeedDefs} from '@atproto/api' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useFocusEffect} from '@react-navigation/native' @@ -24,11 +24,11 @@ import {ArrowOutOfBoxModified_Stroke2_Corner2_Rounded as Share} from '#/componen import * as Layout from '#/components/Layout' import {ListFooter, ListMaybePlaceholder} from '#/components/Lists' -const renderItem = ({item}: ListRenderItemInfo) => { +const renderItem = ({item}: ListRenderItemInfo) => { return } -const keyExtractor = (item: PostView, index: number) => { +const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => { return `${item.uri}-${index}` } diff --git a/src/state/queries/starter-packs.ts b/src/state/queries/starter-packs.ts index 5b39fa45f..c5ebda721 100644 --- a/src/state/queries/starter-packs.ts +++ b/src/state/queries/starter-packs.ts @@ -1,16 +1,15 @@ import { - AppBskyFeedDefs, + type AppBskyFeedDefs, AppBskyGraphDefs, - AppBskyGraphGetStarterPack, + type AppBskyGraphGetStarterPack, AppBskyGraphStarterpack, - AppBskyRichtextFacet, + type AppBskyRichtextFacet, AtUri, - BskyAgent, + type BskyAgent, RichText, } from '@atproto/api' -import {StarterPackView} from '@atproto/api/dist/client/types/app/bsky/graph/defs' import { - QueryClient, + type QueryClient, useMutation, useQuery, useQueryClient, @@ -59,7 +58,7 @@ export function useStarterPackQuery({ }) { const agent = useAgent() - return useQuery({ + return useQuery({ queryKey: RQKEY(uri ? {uri} : {did, rkey}), queryFn: async () => { if (!uri) { diff --git a/src/state/queries/trending/useGetTrendsQuery.ts b/src/state/queries/trending/useGetTrendsQuery.ts index 94a5b0cba..e434d9de0 100644 --- a/src/state/queries/trending/useGetTrendsQuery.ts +++ b/src/state/queries/trending/useGetTrendsQuery.ts @@ -1,6 +1,5 @@ import React from 'react' -import {type AppBskyUnspeccedGetTrends} from '@atproto/api' -import {hasMutedWord} from '@atproto/api/dist/moderation/mutewords' +import {type AppBskyUnspeccedGetTrends, hasMutedWord} from '@atproto/api' import {useQuery} from '@tanstack/react-query' import { diff --git a/src/state/queries/trending/useTrendingTopics.ts b/src/state/queries/trending/useTrendingTopics.ts index 757e6a6f7..ca8352273 100644 --- a/src/state/queries/trending/useTrendingTopics.ts +++ b/src/state/queries/trending/useTrendingTopics.ts @@ -1,6 +1,5 @@ import React from 'react' -import {AppBskyUnspeccedDefs} from '@atproto/api' -import {hasMutedWord} from '@atproto/api/dist/moderation/mutewords' +import {type AppBskyUnspeccedDefs, hasMutedWord} from '@atproto/api' import {useQuery} from '@tanstack/react-query' import {STALE} from '#/state/queries' diff --git a/src/view/com/composer/state/video.ts b/src/view/com/composer/state/video.ts index 0145973a5..011bf42c6 100644 --- a/src/view/com/composer/state/video.ts +++ b/src/view/com/composer/state/video.ts @@ -1,6 +1,5 @@ import {type ImagePickerAsset} from 'expo-image-picker' import {type AppBskyVideoDefs, type BlobRef, type BskyAgent} from '@atproto/api' -import {type JobStatus} from '@atproto/api/dist/client/types/app/bsky/video/defs' import {type I18n} from '@lingui/core' import {msg} from '@lingui/macro' @@ -328,7 +327,7 @@ export async function processVideo( } const videoAgent = createVideoAgent() - let status: JobStatus | undefined + let status: AppBskyVideoDefs.JobStatus | undefined let blob: BlobRef | undefined try { const response = await videoAgent.app.bsky.video.getJobStatus({jobId}) -- cgit 1.4.1