suggestions

src/components/MediaPreview.tsx

@@ -1,15 +1,20 @@
 import React from 'react'
 import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native'
 import {Image} from 'expo-image'
-import {AppBskyFeedDefs} from '@atproto/api'
+import {
+  AppBskyEmbedExternal,
+  AppBskyEmbedImages,
+  AppBskyEmbedRecordWithMedia,
+  AppBskyEmbedVideo,
+} from '@atproto/api'
+import {$Typed} from '@atproto/api/dist/client/util'
 import {Trans} from '@lingui/macro'
 
-import {parseTenorGif} from '#/lib/strings/embed-player'
+import {isTenorGifUri} from '#/lib/strings/embed-player'
 import {atoms as a, useTheme} from '#/alf'
 import {MediaInsetBorder} from '#/components/MediaInsetBorder'
 import {Text} from '#/components/Typography'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
-import {parseEmbed} from '#/types/atproto/post'
 
 /**
  * Streamlined MediaPreview component which just handles images, gifs, and videos
@@ -18,17 +23,22 @@ export function Embed({
   embed,
   style,
 }: {
-  embed: AppBskyFeedDefs.PostView['embed']
+  embed?:
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | $Typed<AppBskyEmbedImages.View>
+    | $Typed<AppBskyEmbedVideo.View>
+    | $Typed<AppBskyEmbedExternal.View>
+    | {$type: string}
   style?: StyleProp<ViewStyle>
 }) {
-  const e = parseEmbed(embed)
-
-  if (!e) return null
-
-  if (e.type === 'images') {
+  if (!embed) {
+    return null
+  } else if (AppBskyEmbedRecordWithMedia.isView(embed)) {
+    return <Embed embed={embed.media} style={style} />
+  } else if (AppBskyEmbedImages.isView(embed)) {
     return (
       <Outer style={style}>
-        {e.view.images.map(image => (
+        {embed.images.map(image => (
           <ImageItem
             key={image.thumb}
             thumbnail={image.thumb}
@@ -37,32 +47,24 @@ export function Embed({
         ))}
       </Outer>
     )
-  } else if (e.type === 'link' && e.view.external.thumb) {
-    let url: URL | undefined
-    try {
-      url = new URL(e.view.external.uri)
-    } catch {}
-    if (url) {
-      const {success} = parseTenorGif(url)
-      if (success) {
-        return (
-          <Outer style={style}>
-            <GifItem
-              thumbnail={e.view.external.thumb}
-              alt={e.view.external.title}
-            />
-          </Outer>
-        )
-      }
-    }
-  } else if (e.type === 'video') {
+  } else if (AppBskyEmbedExternal.isView(embed)) {
+    if (!embed.external.thumb) return null
+    if (!isTenorGifUri(embed.external.uri)) return null
+
+    return (
+      <Outer style={style}>
+        <GifItem thumbnail={embed.external.thumb} alt={embed.external.title} />
+      </Outer>
+    )
+  } else if (AppBskyEmbedVideo.isView(embed)) {
     return (
       <Outer style={style}>
-        <VideoItem thumbnail={e.view.thumbnail} alt={e.view.alt} />
+        <VideoItem thumbnail={embed.thumbnail} alt={embed.alt} />
       </Outer>
     )
   }
 
+  // media is {$type: string}
   return null
 }
 

src/components/interstitials/Trending.tsx

@@ -59,26 +59,24 @@ export function Inner() {
           ) : !trending?.topics ? null : (
             <>
               {trending.topics.map(topic => (
-                <>
-                  <TrendingTopicLink
-                    key={topic.link}
-                    topic={topic}
-                    onPress={() => {
-                      logEvent('trendingTopic:click', {context: 'interstitial'})
-                    }}>
-                    <View style={[a.py_lg]}>
-                      <Text
-                        style={[
-                          t.atoms.text,
-                          a.text_sm,
-                          a.font_bold,
-                          {opacity: 0.7}, // NOTE: we use opacity 0.7 instead of a color to match the color of the home pager tab bar
-                        ]}>
-                        {topic.topic}
-                      </Text>
-                    </View>
-                  </TrendingTopicLink>
-                </>
+                <TrendingTopicLink
+                  key={topic.link}
+                  topic={topic}
+                  onPress={() => {
+                    logEvent('trendingTopic:click', {context: 'interstitial'})
+                  }}>
+                  <View style={[a.py_lg]}>
+                    <Text
+                      style={[
+                        t.atoms.text,
+                        a.text_sm,
+                        a.font_bold,
+                        {opacity: 0.7}, // NOTE: we use opacity 0.7 instead of a color to match the color of the home pager tab bar
+                      ]}>
+                      {topic.topic}
+                    </Text>
+                  </View>
+                </TrendingTopicLink>
               ))}
               <Button
                 label={_(msg`Hide trending topics`)}

src/lib/strings/embed-player.ts

@@ -568,3 +568,12 @@ export function parseTenorGif(urlp: URL):
     dimensions,
   }
 }
+
+export function isTenorGifUri(url: URL | string) {
+  try {
+    return parseTenorGif(typeof url === 'string' ? new URL(url) : url).success
+  } catch {
+    // Invalid URL
+    return false
+  }
+}

src/screens/Messages/components/MessageInputEmbed.tsx

@@ -111,11 +111,7 @@ export function MessageInputEmbed({
   )
 
   const {rt, record} = useMemo(() => {
-    if (
-      post &&
-      AppBskyFeedPost.isRecord(post.record) &&
-      AppBskyFeedPost.validateRecord(post.record).success
-    ) {
+    if (post && AppBskyFeedPost.isValidRecord(post.record)) {
       return {
         rt: new RichTextAPI({
           text: post.record.text,

src/screens/StarterPack/Wizard/State.tsx

@@ -32,7 +32,9 @@ interface State {
   currentStep: Step
   name?: string
   description?: string
-  profiles: AppBskyActorDefs.ProfileViewBasic[]
+  profiles: Array<
+    AppBskyActorDefs.ProfileViewBasic | AppBskyActorDefs.ProfileView
+  >
   feeds: GeneratorView[]
   processing: boolean
   error?: string

src/state/queries/notifications/util.ts

@@ -14,7 +14,6 @@ import {QueryClient} from '@tanstack/react-query'
 import chunk from 'lodash.chunk'
 
 import {labelIsHideableOffense} from '#/lib/moderation'
-import * as atp from '#/types/atproto'
 import {precacheProfile} from '../profile'
 import {FeedNotification, FeedPage, NotificationType} from './types'
 
@@ -256,18 +255,17 @@ function getSubjectUri(
     return notif.uri
   } else if (type === 'post-like' || type === 'repost') {
     if (
-      atp.fastIsType<AppBskyFeedRepost.Record>(
-        notif.record,
-        AppBskyFeedRepost.isRecord,
-      ) ||
-      atp.fastIsType<AppBskyFeedLike.Record>(
-        notif.record,
-        AppBskyFeedLike.isRecord,
-      )
+      AppBskyFeedRepost.isRecord(notif.record) ||
+      AppBskyFeedLike.isRecord(notif.record)
     ) {
-      return typeof notif.record.subject?.uri === 'string'
-        ? notif.record.subject?.uri
-        : undefined
+      // Type casting here is actually safe because here we check for the
+      // actual type bellow
+      const record = notif.record as
+        | AppBskyFeedRepost.Record
+        | AppBskyFeedLike.Record
+
+      const uri = record.subject?.uri
+      return typeof uri === 'string' ? uri : undefined
     }
   } else if (type === 'feedgen-like') {
     return notif.reasonSubject

src/state/queries/util.ts

@@ -6,10 +6,9 @@ import {
   AppBskyFeedPost,
   AtUri,
 } from '@atproto/api'
+import {$Typed} from '@atproto/api/dist/client/util'
 import {InfiniteData, QueryClient, QueryKey} from '@tanstack/react-query'
 
-import * as atp from '#/types/atproto'
-
 export async function truncateAndInvalidate<T = any>(
   queryClient: QueryClient,
   queryKey: QueryKey,
@@ -44,22 +43,20 @@ export function didOrHandleUriMatches(
 }
 
 export function getEmbeddedPost(
-  v: unknown,
+  v:
+    | undefined
+    | $Typed<AppBskyEmbedRecord.View>
+    | $Typed<AppBskyEmbedRecordWithMedia.View>
+    | {$type: string},
 ): AppBskyEmbedRecord.ViewRecord | undefined {
-  if (atp.fastIsType<AppBskyEmbedRecord.View>(v, AppBskyEmbedRecord.isView)) {
+  if (AppBskyEmbedRecord.isView(v)) {
     if (
       AppBskyEmbedRecord.isViewRecord(v.record) &&
       AppBskyFeedPost.isRecord(v.record.value)
     ) {
       return v.record
     }
-  }
-  if (
-    atp.fastIsType<AppBskyEmbedRecordWithMedia.View>(
-      v,
-      AppBskyEmbedRecordWithMedia.isView,
-    )
-  ) {
+  } else if (AppBskyEmbedRecordWithMedia.isView(v)) {
     if (
       AppBskyEmbedRecord.isViewRecord(v.record.record) &&
       AppBskyFeedPost.isRecord(v.record.record.value)

src/types/atproto/index.ts

@@ -16,9 +16,9 @@ export * as profile from '#/types/atproto/profile'
  * }
  * ```
  */
-export function fastIsType<R>(
+export function fastIsType<R extends {$type?: string}>(
   record: unknown,
-  identity: <V>(v: V) => boolean,
+  identity: <V>(v: V) => v is V & {$type: NonNullable<R['$type']>},
 ): record is R {
   return identity(record)
 }