From cf814ed0b99578abe75f171ded1c7de4ae508fd3 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 7 Jan 2025 18:13:57 -0600 Subject: [PATCH] Chat: more type fixes --- src/components/dms/ConvoMenu.tsx | 9 +++------ src/components/dms/MessagesListBlockedFooter.tsx | 5 +++-- src/components/dms/MessagesListHeader.tsx | 11 ++++------- src/screens/Messages/Conversation.tsx | 5 +++-- src/screens/Messages/components/MessagesList.tsx | 3 ++- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index e1f8df10b8..27b796250a 100644 --- a/src/components/dms/ConvoMenu.tsx +++ b/src/components/dms/ConvoMenu.tsx @@ -1,10 +1,6 @@ import React, {useCallback} from 'react' import {Keyboard, Pressable, View} from 'react-native' -import { - AppBskyActorDefs, - ChatBskyConvoDefs, - ModerationCause, -} from '@atproto/api' +import {ChatBskyConvoDefs, ModerationCause} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useNavigation} from '@react-navigation/native' @@ -34,6 +30,7 @@ import { import {SpeakerVolumeFull_Stroke2_Corner0_Rounded as Unmute} from '#/components/icons/Speaker' import * as Menu from '#/components/Menu' import * as Prompt from '#/components/Prompt' +import * as atp from '#/types/atproto' import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '../icons/Bubble' let ConvoMenu = ({ @@ -47,7 +44,7 @@ let ConvoMenu = ({ style, }: { convo: ChatBskyConvoDefs.ConvoView - profile: Shadow + profile: Shadow control?: Menu.MenuControlProps currentScreen: 'list' | 'conversation' showMarkAsRead?: boolean diff --git a/src/components/dms/MessagesListBlockedFooter.tsx b/src/components/dms/MessagesListBlockedFooter.tsx index ec7ba28558..f7780565d0 100644 --- a/src/components/dms/MessagesListBlockedFooter.tsx +++ b/src/components/dms/MessagesListBlockedFooter.tsx @@ -1,6 +1,6 @@ import React from 'react' import {View} from 'react-native' -import {AppBskyActorDefs, ModerationCause} from '@atproto/api' +import {ModerationCause} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -14,6 +14,7 @@ import {BlockedByListDialog} from '#/components/dms/BlockedByListDialog' import {LeaveConvoPrompt} from '#/components/dms/LeaveConvoPrompt' import {ReportConversationPrompt} from '#/components/dms/ReportConversationPrompt' import {Text} from '#/components/Typography' +import * as atp from '#/types/atproto' export function MessagesListBlockedFooter({ recipient: initialRecipient, @@ -21,7 +22,7 @@ export function MessagesListBlockedFooter({ hasMessages, blockInfo, }: { - recipient: AppBskyActorDefs.ProfileViewBasic + recipient: atp.profile.AnyProfileView convoId: string hasMessages: boolean blockInfo: { diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx index acffa0c2ba..2d5d535aef 100644 --- a/src/components/dms/MessagesListHeader.tsx +++ b/src/components/dms/MessagesListHeader.tsx @@ -1,10 +1,6 @@ import React, {useCallback} from 'react' import {TouchableOpacity, View} from 'react-native' -import { - AppBskyActorDefs, - ModerationCause, - ModerationDecision, -} from '@atproto/api' +import {ModerationCause, ModerationDecision} from '@atproto/api' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -24,6 +20,7 @@ import {Bell2Off_Filled_Corner0_Rounded as BellStroke} from '#/components/icons/ import {Link} from '#/components/Link' import {PostAlerts} from '#/components/moderation/PostAlerts' import {Text} from '#/components/Typography' +import * as atp from '#/types/atproto' const PFP_SIZE = isWeb ? 40 : 34 @@ -32,7 +29,7 @@ export let MessagesListHeader = ({ moderation, blockInfo, }: { - profile?: AppBskyActorDefs.ProfileViewBasic + profile?: atp.profile.AnyProfileView moderation?: ModerationDecision blockInfo?: { listBlocks: ModerationCause[] @@ -131,7 +128,7 @@ function HeaderReady({ moderation, blockInfo, }: { - profile: AppBskyActorDefs.ProfileViewBasic + profile: atp.profile.AnyProfileView moderation: ModerationDecision blockInfo: { listBlocks: ModerationCause[] diff --git a/src/screens/Messages/Conversation.tsx b/src/screens/Messages/Conversation.tsx index b8b0bfe0d3..c7c76c7ddb 100644 --- a/src/screens/Messages/Conversation.tsx +++ b/src/screens/Messages/Conversation.tsx @@ -1,6 +1,6 @@ import React, {useCallback} from 'react' import {View} from 'react-native' -import {AppBskyActorDefs, moderateProfile, ModerationOpts} from '@atproto/api' +import {moderateProfile, ModerationOpts} from '@atproto/api' import {msg} from '@lingui/macro' import {useLingui} from '@lingui/react' import {useFocusEffect, useNavigation} from '@react-navigation/native' @@ -26,6 +26,7 @@ import {MessagesListHeader} from '#/components/dms/MessagesListHeader' import {Error} from '#/components/Error' import * as Layout from '#/components/Layout' import {Loader} from '#/components/Loader' +import * as atp from '#/types/atproto' type Props = NativeStackScreenProps< CommonNavigatorParams, @@ -150,7 +151,7 @@ function InnerReady({ setHasScrolled, }: { moderationOpts: ModerationOpts - recipient: AppBskyActorDefs.ProfileViewBasic + recipient: atp.profile.AnyProfileView hasScrolled: boolean setHasScrolled: React.Dispatch> }) { diff --git a/src/screens/Messages/components/MessagesList.tsx b/src/screens/Messages/components/MessagesList.tsx index 071ce1cd71..3f3e99c031 100644 --- a/src/screens/Messages/components/MessagesList.tsx +++ b/src/screens/Messages/components/MessagesList.tsx @@ -11,6 +11,7 @@ import Animated, { import {ReanimatedScrollEvent} from 'react-native-reanimated/lib/typescript/hook/commonTypes' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {AppBskyEmbedRecord, AppBskyRichtextFacet, RichText} from '@atproto/api' +import {$Typed} from '@atproto/api/dist/client/util' import {clamp} from '#/lib/numbers' import {ScrollProvider} from '#/lib/ScrollContext' @@ -297,7 +298,7 @@ export function MessagesList({ // we want to remove the post link from the text, re-trim, then detect facets rt.detectFacetsWithoutResolution() - let embed: AppBskyEmbedRecord.Main | undefined + let embed: $Typed | undefined if (embedUri) { try {