+8 -6

src/components/StarterPack/Main/FeedsList.tsx

··· 1 1 import React, {useCallback} from 'react' 2 2 - import {ListRenderItemInfo, View} from 'react-native' 3 3 - import {AppBskyFeedDefs} from '@atproto/api' 4 4 - import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 2 2 + import {type ListRenderItemInfo, View} from 'react-native' 3 3 + import {type AppBskyFeedDefs} from '@atproto/api' 5 4 6 5 import {useBottomBarOffset} from '#/lib/hooks/useBottomBarOffset' 7 6 import {isNative, isWeb} from '#/platform/detection' 8 8 - import {List, ListRef} from '#/view/com/util/List' 9 9 - import {SectionRef} from '#/screens/Profile/Sections/types' 7 7 + import {List, type ListRef} from '#/view/com/util/List' 8 8 + import {type SectionRef} from '#/screens/Profile/Sections/types' 10 9 import {atoms as a, useTheme} from '#/alf' 11 10 import * as FeedCard from '#/components/FeedCard' 12 11 ··· 37 36 scrollToTop: onScrollToTop, 38 37 })) 39 38 40 40 - const renderItem = ({item, index}: ListRenderItemInfo<GeneratorView>) => { 39 39 + const renderItem = ({ 40 40 + item, 41 41 + index, 42 42 + }: ListRenderItemInfo<AppBskyFeedDefs.GeneratorView>) => { 41 43 return ( 42 44 <View 43 45 style={[

+12 -6

src/components/StarterPack/Wizard/WizardEditListDialog.tsx

··· 1 1 import {useRef} from 'react' 2 2 - import type {ListRenderItemInfo} from 'react-native' 2 2 + import {type ListRenderItemInfo} from 'react-native' 3 3 import {View} from 'react-native' 4 4 - import {AppBskyActorDefs, ModerationOpts} from '@atproto/api' 5 5 - import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 4 4 + import { 5 5 + type AppBskyActorDefs, 6 6 + type AppBskyFeedDefs, 7 7 + type ModerationOpts, 8 8 + } from '@atproto/api' 6 9 import {msg, Trans} from '@lingui/macro' 7 10 import {useLingui} from '@lingui/react' 8 11 9 12 import {useInitialNumToRender} from '#/lib/hooks/useInitialNumToRender' 10 13 import {isWeb} from '#/platform/detection' 11 14 import {useSession} from '#/state/session' 12 12 - import {ListMethods} from '#/view/com/util/List' 13 13 - import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State' 15 15 + import {type ListMethods} from '#/view/com/util/List' 16 16 + import { 17 17 + type WizardAction, 18 18 + type WizardState, 19 19 + } from '#/screens/StarterPack/Wizard/State' 14 20 import {atoms as a, native, useTheme, web} from '#/alf' 15 21 import {Button, ButtonText} from '#/components/Button' 16 22 import * as Dialog from '#/components/Dialog' ··· 21 27 import {Text} from '#/components/Typography' 22 28 23 29 function keyExtractor( 24 24 - item: AppBskyActorDefs.ProfileViewBasic | GeneratorView, 30 30 + item: AppBskyActorDefs.ProfileViewBasic | AppBskyFeedDefs.GeneratorView, 25 31 index: number, 26 32 ) { 27 33 return `${item.did}-${index}`

+10 -8

src/components/StarterPack/Wizard/WizardListCard.tsx

··· 1 1 import {Keyboard, View} from 'react-native' 2 2 import { 3 3 - AppBskyActorDefs, 4 4 - AppBskyFeedDefs, 3 3 + type AppBskyActorDefs, 4 4 + type AppBskyFeedDefs, 5 5 moderateFeedGenerator, 6 6 moderateProfile, 7 7 - ModerationOpts, 8 8 - ModerationUI, 7 7 + type ModerationOpts, 8 8 + type ModerationUI, 9 9 } from '@atproto/api' 10 10 - import {GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 11 10 import {msg, Trans} from '@lingui/macro' 12 11 import {useLingui} from '@lingui/react' 13 12 ··· 16 15 import {sanitizeHandle} from '#/lib/strings/handles' 17 16 import {useSession} from '#/state/session' 18 17 import {UserAvatar} from '#/view/com/util/UserAvatar' 19 19 - import {WizardAction, WizardState} from '#/screens/StarterPack/Wizard/State' 18 18 + import { 19 19 + type WizardAction, 20 20 + type WizardState, 21 21 + } from '#/screens/StarterPack/Wizard/State' 20 22 import {atoms as a, useTheme} from '#/alf' 21 23 import {Button, ButtonText} from '#/components/Button' 22 24 import * as Toggle from '#/components/forms/Toggle' 23 25 import {Checkbox} from '#/components/forms/Toggle' 24 26 import {Text} from '#/components/Typography' 25 25 - import * as bsky from '#/types/bsky' 27 27 + import type * as bsky from '#/types/bsky' 26 28 27 29 function WizardListCard({ 28 30 type, ··· 174 176 moderationOpts, 175 177 }: { 176 178 btnType: 'checkbox' | 'remove' 177 177 - generator: GeneratorView 179 179 + generator: AppBskyFeedDefs.GeneratorView 178 180 state: WizardState 179 181 dispatch: (action: WizardAction) => void 180 182 moderationOpts: ModerationOpts

+3 -3

src/screens/Hashtag.tsx

··· 1 1 import React from 'react' 2 2 import {type ListRenderItemInfo, View} from 'react-native' 3 3 - import {type PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 3 3 + import {type AppBskyFeedDefs} from '@atproto/api' 4 4 import {msg} from '@lingui/macro' 5 5 import {useLingui} from '@lingui/react' 6 6 import {useFocusEffect} from '@react-navigation/native' ··· 25 25 import * as Layout from '#/components/Layout' 26 26 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists' 27 27 28 28 - const renderItem = ({item}: ListRenderItemInfo<PostView>) => { 28 28 + const renderItem = ({item}: ListRenderItemInfo<AppBskyFeedDefs.PostView>) => { 29 29 return <Post post={item} /> 30 30 } 31 31 32 32 - const keyExtractor = (item: PostView, index: number) => { 32 32 + const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => { 33 33 return `${item.uri}-${index}` 34 34 } 35 35

+2 -2

src/screens/Onboarding/StepFinished.tsx

··· 1 1 import React from 'react' 2 2 import {View} from 'react-native' 3 3 import { 4 4 + type AppBskyActorDefs, 4 5 type AppBskyActorProfile, 5 6 type AppBskyGraphDefs, 6 7 AppBskyGraphStarterpack, 7 8 type Un$Typed, 8 9 } from '@atproto/api' 9 9 - import {type SavedFeed} from '@atproto/api/dist/client/types/app/bsky/actor/defs' 10 10 import {TID} from '@atproto/common-web' 11 11 import {msg, Trans} from '@lingui/macro' 12 12 import {useLingui} from '@lingui/react' ··· 108 108 await agent.setInterestsPref({tags: selectedInterests}) 109 109 110 110 // Default feeds that every user should have pinned when landing in the app 111 111 - const feedsToSave: SavedFeed[] = [ 111 111 + const feedsToSave: AppBskyActorDefs.SavedFeed[] = [ 112 112 { 113 113 ...DISCOVER_SAVED_FEED, 114 114 id: TID.nextStr(),

+7 -4

src/screens/StarterPack/Wizard/State.tsx

··· 1 1 import React from 'react' 2 2 - import {type AppBskyGraphDefs, AppBskyGraphStarterpack} from '@atproto/api' 3 3 - import {type GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 2 2 + import { 3 3 + type AppBskyFeedDefs, 4 4 + type AppBskyGraphDefs, 5 5 + AppBskyGraphStarterpack, 6 6 + } from '@atproto/api' 4 7 import {msg, plural} from '@lingui/macro' 5 8 6 9 import {STARTER_PACK_MAX_SIZE} from '#/lib/constants' ··· 19 22 | {type: 'SetDescription'; description: string} 20 23 | {type: 'AddProfile'; profile: bsky.profile.AnyProfileView} 21 24 | {type: 'RemoveProfile'; profileDid: string} 22 22 - | {type: 'AddFeed'; feed: GeneratorView} 25 25 + | {type: 'AddFeed'; feed: AppBskyFeedDefs.GeneratorView} 23 26 | {type: 'RemoveFeed'; feedUri: string} 24 27 | {type: 'SetProcessing'; processing: boolean} 25 28 | {type: 'SetError'; error: string} ··· 30 33 name?: string 31 34 description?: string 32 35 profiles: bsky.profile.AnyProfileView[] 33 33 - feeds: GeneratorView[] 36 36 + feeds: AppBskyFeedDefs.GeneratorView[] 34 37 processing: boolean 35 38 error?: string 36 39 transitionDirection: 'Backward' | 'Forward'

+4 -2

src/screens/StarterPack/Wizard/index.tsx

··· 5 5 import {Image} from 'expo-image' 6 6 import { 7 7 type AppBskyActorDefs, 8 8 + type AppBskyFeedDefs, 8 9 type AppBskyGraphDefs, 9 10 AtUri, 10 11 type ModerationOpts, 11 12 } from '@atproto/api' 12 12 - import {type GeneratorView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 13 13 import {msg, Plural, Trans} from '@lingui/macro' 14 14 import {useLingui} from '@lingui/react' 15 15 import {useFocusEffect, useNavigation} from '@react-navigation/native' ··· 591 591 ) 592 592 } 593 593 594 594 - function getName(item: bsky.profile.AnyProfileView | GeneratorView) { 594 594 + function getName( 595 595 + item: bsky.profile.AnyProfileView | AppBskyFeedDefs.GeneratorView, 596 596 + ) { 595 597 if (typeof item.displayName === 'string') { 596 598 return enforceLen(sanitizeDisplayName(item.displayName), 28, true) 597 599 } else if ('handle' in item && typeof item.handle === 'string') {

+3 -3

src/screens/Topic.tsx

··· 1 1 import React from 'react' 2 2 import {type ListRenderItemInfo, View} from 'react-native' 3 3 - import {type PostView} from '@atproto/api/dist/client/types/app/bsky/feed/defs' 3 3 + import {type AppBskyFeedDefs} from '@atproto/api' 4 4 import {msg} from '@lingui/macro' 5 5 import {useLingui} from '@lingui/react' 6 6 import {useFocusEffect} from '@react-navigation/native' ··· 24 24 import * as Layout from '#/components/Layout' 25 25 import {ListFooter, ListMaybePlaceholder} from '#/components/Lists' 26 26 27 27 - const renderItem = ({item}: ListRenderItemInfo<PostView>) => { 27 27 + const renderItem = ({item}: ListRenderItemInfo<AppBskyFeedDefs.PostView>) => { 28 28 return <Post post={item} /> 29 29 } 30 30 31 31 - const keyExtractor = (item: PostView, index: number) => { 31 31 + const keyExtractor = (item: AppBskyFeedDefs.PostView, index: number) => { 32 32 return `${item.uri}-${index}` 33 33 } 34 34

+6 -7

src/state/queries/starter-packs.ts

··· 1 1 import { 2 2 - AppBskyFeedDefs, 2 2 + type AppBskyFeedDefs, 3 3 AppBskyGraphDefs, 4 4 - AppBskyGraphGetStarterPack, 4 4 + type AppBskyGraphGetStarterPack, 5 5 AppBskyGraphStarterpack, 6 6 - AppBskyRichtextFacet, 6 6 + type AppBskyRichtextFacet, 7 7 AtUri, 8 8 - BskyAgent, 8 8 + type BskyAgent, 9 9 RichText, 10 10 } from '@atproto/api' 11 11 - import {StarterPackView} from '@atproto/api/dist/client/types/app/bsky/graph/defs' 12 11 import { 13 13 - QueryClient, 12 12 + type QueryClient, 14 13 useMutation, 15 14 useQuery, 16 15 useQueryClient, ··· 59 58 }) { 60 59 const agent = useAgent() 61 60 62 62 - return useQuery<StarterPackView>({ 61 61 + return useQuery<AppBskyGraphDefs.StarterPackView>({ 63 62 queryKey: RQKEY(uri ? {uri} : {did, rkey}), 64 63 queryFn: async () => { 65 64 if (!uri) {

+1 -2

src/state/queries/trending/useGetTrendsQuery.ts

··· 1 1 import React from 'react' 2 2 - import {type AppBskyUnspeccedGetTrends} from '@atproto/api' 3 3 - import {hasMutedWord} from '@atproto/api/dist/moderation/mutewords' 2 2 + import {type AppBskyUnspeccedGetTrends, hasMutedWord} from '@atproto/api' 4 3 import {useQuery} from '@tanstack/react-query' 5 4 6 5 import {

+1 -2

src/state/queries/trending/useTrendingTopics.ts

··· 1 1 import React from 'react' 2 2 - import {AppBskyUnspeccedDefs} from '@atproto/api' 3 3 - import {hasMutedWord} from '@atproto/api/dist/moderation/mutewords' 2 2 + import {type AppBskyUnspeccedDefs, hasMutedWord} from '@atproto/api' 4 3 import {useQuery} from '@tanstack/react-query' 5 4 6 5 import {STALE} from '#/state/queries'

+1 -2

src/view/com/composer/state/video.ts

··· 1 1 import {type ImagePickerAsset} from 'expo-image-picker' 2 2 import {type AppBskyVideoDefs, type BlobRef, type BskyAgent} from '@atproto/api' 3 3 - import {type JobStatus} from '@atproto/api/dist/client/types/app/bsky/video/defs' 4 3 import {type I18n} from '@lingui/core' 5 4 import {msg} from '@lingui/macro' 6 5 ··· 328 327 } 329 328 330 329 const videoAgent = createVideoAgent() 331 331 - let status: JobStatus | undefined 330 330 + let status: AppBskyVideoDefs.JobStatus | undefined 332 331 let blob: BlobRef | undefined 333 332 try { 334 333 const response = await videoAgent.app.bsky.video.getJobStatus({jobId})