diff options
author | Eric Bailey <git@esb.lol> | 2025-02-18 08:54:25 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-02-18 08:54:25 -0600 |
commit | a51fc8e434b63a3f85accbf1bd29a01397c4b057 (patch) | |
tree | 44be28fc8812c6d4e20f0784be3a558ede9283cb /src/components/dms | |
parent | e2c0f78719a9e576ad18ef0e4657c63a3147efed (diff) | |
download | voidsky-a51fc8e434b63a3f85accbf1bd29a01397c4b057.tar.zst |
`@atproto/api@next` integration (#7344)
* Bump SDK * Use consistent type in profile query * Omit from constraint for profile shadow * Replace isRecord with isValidRecord in QuoteEmbed * Omit type from constraint for old ProfileCard * Omit type from constraint in profile queries where appropriate * Use correct type for update profile mutation * Conslidate and fix check for isValidRecord in Post.tsx * Replace isRecord with isValidRecord in PostThreadItem * Remove redundant cast in PostThreadFollowBtn * Ignore errors in DebugMod screen * Use matching type in ProfileFollows screen * Use matching type in ProfileFollowers screen * Migrate to isValidRecord in PostFeedItem * Use matching type if PostRepostedBy * Omit type from constraint in avatar props * Use matching types in NotificationFeedItem * Todo * Use isValidRecord in NotfyFeedItem * Improve MediaPreview types * Migrate another isValidRecord in NotificationFeedItem * Migrate to isValidView in queries/util * Migrate to isValidRecord in threadgate/util * Fix types in threadgates * Fix up types in starter-packs queries * Todo * Specify exact types in search-posts * Use internal type util to align types * Ditto last * Migrate postgate/index * Specify exact types in post-thread * Use correct type in post-quotes * FIX potential bug in post-thread * Use correct type in post-feed * Add correct type guards to notifications/feed * Migrate a guard in notifications/util * Migrate guard in Wizard/State * [@next] Profile handling, migrate `ProfileCard` (#7347) * Introduce new utils for profiles, migrate old ProfileCard * Rename, reorg * Add parseEmbed utils * Expand AnyProfileView to include chat profile view, update post shadow to reflect this * Cast for perf reasons * Tighten up types now that we have AnyProfileView * Add fastIsType util * Use `assertDid` Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com> * Use util types * Comment * Use fastIsType where no validation was happening before * suggestions (#7382) * suggestions * Revert unneeded changes --------- Co-authored-by: Eric Bailey <git@esb.lol> * Use new util * Rename to dangerousIsType * Convert object shape * Use dangerous util * Use dangerous util * Use dangerous util, we can trust post records * Use dangerous util * Use AnyProfileVIew * Convert object shape * Clean up handling * Patch moderateProfile to accept known profile views, to discuss * Add AnyStarterPackView and related, implement in first usage * Remove validation, fix type, fix ref * Migrate over list-conversations * Clarify intent behind precacheProfile and its unstable query cache * Clean up unstable profile cache * Fix types during label creation in PwiOptOut (#7346) * Tighten types in queries/list * Chat: use correct profile views * Chat: fix log type check * Chat: construct lexically correct shape, even though it's only internal usage * Chat: use correct profile types * Chat: fix type check in logs * Starter: use correct profile types * Starter: use correct profile types * Starter: tighten types to match lex * Any profile type will work in blocked-and-muted * Use dangerous util * Use dangerousIsType * Update new ProfileCard to use AnyProfileView * Use dangerousIsType * Remove outdated todo * Use correct profile type * Use correct profile types * Tighten up types * Use dangerousIsType * Chat: more type fixes * Remove unused file * Add a few utils * Remove unused file * Ignore feedPost.__source * Clean up types, leave validation in critical path * Use dangerousIstype * Use ANyProfileView * Use isValidRecord * Use dangerousIsType * Fix types in ListCard * Fix FeedInterstitials types * Fix types in FeedCard * Fix types in dms ReportDialog * Fix types in SearchablePeopleList * Fix bad type in composer opts * Starter: ok these need to be loose too * Clarify docs Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com> * Less code Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com> * Use package exports Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com> * Use package exports * Bump sdk, update $Typed imports * Format * Format * Fix weird TS error * Remove patch * Beter name * It's memo, can validate * Tighten up parseEmbed, dogfood * Bump sdk * Use asPredicate * Loosen types a bit * use asPredicate * Fix types * Use asPredicate * Use asPredicate * Use asPredicate * Clean up upsertProfile types * Use asPredicate * Use Un util * Fix types * Use new AnyProfileView * Use dangerousIsType * Use asPredicate * Use asPredicate * Add fallback content-type to pass typecheck * Clean up upsertProfile types * Align types * Use dangerousIsType * Use dangerousIsType * Use asPredicate * Align types * Convert findLast * Align types * Just ignore type errors and use findLast * Rename atproto -> bsky * Add validate util * Fix type error * Loosen types * Export post * rename atp bsky * Remove unused code * minor changes * Bump deps * Fix types * Tighten back up loose check * Tighten back up loose check * Fix small bug * Update comment * Revert change --------- Co-authored-by: Matthieu Sieben <matthieusieben@users.noreply.github.com> Co-authored-by: Matthieu Sieben <matthieu.sieben@gmail.com>
Diffstat (limited to 'src/components/dms')
-rw-r--r-- | src/components/dms/ConvoMenu.tsx | 11 | ||||
-rw-r--r-- | src/components/dms/MessageProfileButton.tsx | 2 | ||||
-rw-r--r-- | src/components/dms/MessagesListBlockedFooter.tsx | 5 | ||||
-rw-r--r-- | src/components/dms/MessagesListHeader.tsx | 9 | ||||
-rw-r--r-- | src/components/dms/ReportDialog.tsx | 16 | ||||
-rw-r--r-- | src/components/dms/dialogs/SearchablePeopleList.tsx | 7 | ||||
-rw-r--r-- | src/components/dms/util.ts | 4 |
7 files changed, 29 insertions, 25 deletions
diff --git a/src/components/dms/ConvoMenu.tsx b/src/components/dms/ConvoMenu.tsx index f44692a2e..590f25dd3 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 bsky from '#/types/bsky' import {Bubble_Stroke2_Corner2_Rounded as Bubble} from '../icons/Bubble' import {ReportDialog} from './ReportDialog' @@ -49,7 +46,7 @@ let ConvoMenu = ({ style, }: { convo: ChatBskyConvoDefs.ConvoView - profile: Shadow<AppBskyActorDefs.ProfileViewBasic> + profile: Shadow<bsky.profile.AnyProfileView> control?: Menu.MenuControlProps currentScreen: 'list' | 'conversation' showMarkAsRead?: boolean @@ -148,7 +145,7 @@ function MenuContent({ blockedByListControl, }: { convo: ChatBskyConvoDefs.ConvoView - profile: Shadow<AppBskyActorDefs.ProfileViewBasic> + profile: Shadow<bsky.profile.AnyProfileView> showMarkAsRead?: boolean blockInfo: { listBlocks: ModerationCause[] diff --git a/src/components/dms/MessageProfileButton.tsx b/src/components/dms/MessageProfileButton.tsx index 22936b4c0..5eac7f5c5 100644 --- a/src/components/dms/MessageProfileButton.tsx +++ b/src/components/dms/MessageProfileButton.tsx @@ -19,7 +19,7 @@ import {VerifyEmailDialog} from '../dialogs/VerifyEmailDialog' export function MessageProfileButton({ profile, }: { - profile: AppBskyActorDefs.ProfileView + profile: AppBskyActorDefs.ProfileViewDetailed }) { const {_} = useLingui() const t = useTheme() diff --git a/src/components/dms/MessagesListBlockedFooter.tsx b/src/components/dms/MessagesListBlockedFooter.tsx index 19a7cc9c2..9c63ef2c7 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, ModerationDecision} from '@atproto/api' +import {ModerationDecision} 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 bsky from '#/types/bsky' export function MessagesListBlockedFooter({ recipient: initialRecipient, @@ -21,7 +22,7 @@ export function MessagesListBlockedFooter({ hasMessages, moderation, }: { - recipient: AppBskyActorDefs.ProfileViewBasic + recipient: bsky.profile.AnyProfileView convoId: string hasMessages: boolean moderation: ModerationDecision diff --git a/src/components/dms/MessagesListHeader.tsx b/src/components/dms/MessagesListHeader.tsx index f8d9b290d..7c35c30ba 100644 --- a/src/components/dms/MessagesListHeader.tsx +++ b/src/components/dms/MessagesListHeader.tsx @@ -17,6 +17,7 @@ import {sanitizeDisplayName} from '#/lib/strings/display-names' import {isWeb} from '#/platform/detection' import {Shadow} from '#/state/cache/profile-shadow' import {isConvoActive, useConvo} from '#/state/messages/convo' +import {ConvoItem} from '#/state/messages/convo/types' import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' import {atoms as a, useBreakpoints, useTheme, web} from '#/alf' import {ConvoMenu} from '#/components/dms/ConvoMenu' @@ -31,7 +32,7 @@ export let MessagesListHeader = ({ profile, moderation, }: { - profile?: Shadow<AppBskyActorDefs.ProfileViewBasic> + profile?: Shadow<AppBskyActorDefs.ProfileViewDetailed> moderation?: ModerationDecision }): React.ReactNode => { const t = useTheme() @@ -138,7 +139,7 @@ function HeaderReady({ moderation, blockInfo, }: { - profile: Shadow<AppBskyActorDefs.ProfileViewBasic> + profile: Shadow<AppBskyActorDefs.ProfileViewDetailed> moderation: ModerationDecision blockInfo: { listBlocks: ModerationCause[] @@ -157,8 +158,10 @@ function HeaderReady({ moderation.ui('displayName'), ) + // @ts-ignore findLast is polyfilled - esb const latestMessageFromOther = convoState.items.findLast( - item => item.type === 'message' && item.message.sender.did === profile.did, + (item: ConvoItem) => + item.type === 'message' && item.message.sender.did === profile.did, ) const latestReportableMessage = diff --git a/src/components/dms/ReportDialog.tsx b/src/components/dms/ReportDialog.tsx index af24a7246..71cca897a 100644 --- a/src/components/dms/ReportDialog.tsx +++ b/src/components/dms/ReportDialog.tsx @@ -1,6 +1,7 @@ import React, {memo, useMemo, useState} from 'react' import {View} from 'react-native' import { + $Typed, AppBskyActorDefs, ChatBskyConvoDefs, ComAtprotoModerationCreateReport, @@ -154,15 +155,16 @@ function SubmitStep({ mutationFn: async () => { if (params.type === 'convoMessage') { const {convoId, message} = params + const subject: $Typed<ChatBskyConvoDefs.MessageRef> = { + $type: 'chat.bsky.convo.defs#messageRef', + messageId: message.id, + convoId, + did: message.sender.did, + } const report = { reasonType: reportOption.reason, - subject: { - $type: 'chat.bsky.convo.defs#messageRef', - messageId: message.id, - convoId, - did: message.sender.did, - } satisfies ChatBskyConvoDefs.MessageRef, + subject, reason: details, } satisfies ComAtprotoModerationCreateReport.InputSchema @@ -285,7 +287,7 @@ function DoneStep({ }: { convoId: string currentScreen: 'list' | 'conversation' - profile: AppBskyActorDefs.ProfileViewBasic + profile: AppBskyActorDefs.ProfileViewDetailed }) { const {_} = useLingui() const navigation = useNavigation<NavigationProp>() diff --git a/src/components/dms/dialogs/SearchablePeopleList.tsx b/src/components/dms/dialogs/SearchablePeopleList.tsx index 9e15e2ba8..3ac0b3ab0 100644 --- a/src/components/dms/dialogs/SearchablePeopleList.tsx +++ b/src/components/dms/dialogs/SearchablePeopleList.tsx @@ -6,7 +6,7 @@ import React, { useState, } from 'react' import {TextInput, View} from 'react-native' -import {AppBskyActorDefs, moderateProfile, ModerationOpts} from '@atproto/api' +import {moderateProfile, ModerationOpts} from '@atproto/api' import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' @@ -28,13 +28,14 @@ import {useInteractionState} from '#/components/hooks/useInteractionState' import {MagnifyingGlass2_Stroke2_Corner0_Rounded as Search} from '#/components/icons/MagnifyingGlass2' import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times' import {Text} from '#/components/Typography' +import * as bsky from '#/types/bsky' type Item = | { type: 'profile' key: string enabled: boolean - profile: AppBskyActorDefs.ProfileView + profile: bsky.profile.AnyProfileView } | { type: 'empty' @@ -330,7 +331,7 @@ function ProfileCard({ onPress, }: { enabled: boolean - profile: AppBskyActorDefs.ProfileView + profile: bsky.profile.AnyProfileView moderationOpts: ModerationOpts onPress: (did: string) => void }) { diff --git a/src/components/dms/util.ts b/src/components/dms/util.ts index 003532d0c..7315f5fc9 100644 --- a/src/components/dms/util.ts +++ b/src/components/dms/util.ts @@ -1,6 +1,6 @@ -import {AppBskyActorDefs} from '@atproto/api' +import * as bsky from '#/types/bsky' -export function canBeMessaged(profile: AppBskyActorDefs.ProfileView) { +export function canBeMessaged(profile: bsky.profile.AnyProfileView) { switch (profile.associated?.chat?.allowIncoming) { case 'none': return false |