@atproto/bsky 0.0.221 → 0.0.223

package/src/views/index.ts

@@ -1,77 +1,21 @@
 import { HOUR, MINUTE, mapDefined } from '@atproto/common'
-import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
+import { $Typed, Un$Typed, Unknown$TypedObject, UriString } from '@atproto/lex'
+import {
+  AtUri,
+  AtUriString,
+  DatetimeString,
+  DidString,
+  INVALID_HANDLE,
+  normalizeDatetimeAlways,
+} from '@atproto/syntax'
 import { Actor, ProfileViewerState } from '../hydration/actor'
 import { FeedItem, Like, Post, Repost } from '../hydration/feed'
 import { Follow, Verification } from '../hydration/graph'
 import { HydrationState } from '../hydration/hydrator'
 import { Label } from '../hydration/label'
-import { RecordInfo } from '../hydration/util'
+import { RecordInfo, parseString } from '../hydration/util'
 import { ImageUriBuilder } from '../image/uri'
-import { ids } from '../lexicon/lexicons'
-import {
-  KnownFollowers,
-  ProfileAssociatedActivitySubscription,
-  ProfileView,
-  ProfileViewBasic,
-  ProfileViewDetailed,
-  StatusView,
-  VerificationState,
-  VerificationView,
-  ViewerState as ProfileViewer,
-} from '../lexicon/types/app/bsky/actor/defs'
-import {
-  Record as ProfileRecord,
-  isRecord as isProfileRecord,
-} from '../lexicon/types/app/bsky/actor/profile'
-import { BookmarkView } from '../lexicon/types/app/bsky/bookmark/defs'
-import {
-  BlockedPost,
-  FeedViewPost,
-  GeneratorView,
-  NotFoundPost,
-  PostView,
-  ReasonPin,
-  ReasonRepost,
-  ReplyRef,
-  ThreadViewPost,
-  ThreadgateView,
-  isPostView,
-} from '../lexicon/types/app/bsky/feed/defs'
-import { Record as LikeRecord } from '../lexicon/types/app/bsky/feed/like'
-import {
-  Record as PostRecord,
-  isRecord as isPostRecord,
-} from '../lexicon/types/app/bsky/feed/post'
-import { Record as RepostRecord } from '../lexicon/types/app/bsky/feed/repost'
-import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
-import {
-  ListItemView,
-  ListView,
-  ListViewBasic,
-  StarterPackView,
-  StarterPackViewBasic,
-} from '../lexicon/types/app/bsky/graph/defs'
-import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
-import { Record as VerificationRecord } from '../lexicon/types/app/bsky/graph/verification'
-import {
-  LabelerView,
-  LabelerViewDetailed,
-} from '../lexicon/types/app/bsky/labeler/defs'
-import {
-  Record as LabelerRecord,
-  isRecord as isLabelerRecord,
-} from '../lexicon/types/app/bsky/labeler/service'
-import {
-  ActivitySubscription,
-  RecordDeleted as NotificationRecordDeleted,
-} from '../lexicon/types/app/bsky/notification/defs'
-import { ThreadItem as ThreadOtherItem } from '../lexicon/types/app/bsky/unspecced/getPostThreadOtherV2'
-import {
-  QueryParams as GetPostThreadV2QueryParams,
-  ThreadItem,
-} from '../lexicon/types/app/bsky/unspecced/getPostThreadV2'
-import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
-import { $Typed, Un$Typed } from '../lexicon/util'
+import { app } from '../lexicons/index.js'
 import { Notification } from '../proto/bsky_pb'
 import {
   postUriToPostgateUri,
@@ -93,31 +37,73 @@ import {
   sortTrimFlattenThreadTree,
 } from './threads-v2'
 import {
+  ActivitySubscription,
+  BlockedPost,
+  BookmarkView,
   Embed,
-  EmbedBlocked,
-  EmbedDetached,
-  EmbedNotFound,
   EmbedView,
   ExternalEmbed,
   ExternalEmbedView,
+  FeedViewPost,
+  FollowRecord,
+  GeneratorView,
+  GetPostThreadV2QueryParams,
   ImagesEmbed,
   ImagesEmbedView,
+  KnownFollowers,
+  LabelerRecord,
+  LabelerView,
+  LabelerViewDetailed,
+  LikeRecord,
+  ListItemView,
+  ListView,
+  ListViewBasic,
   MaybePostView,
+  NotFoundPost,
+  NotificationRecordDeleted,
   NotificationView,
   PostEmbedView,
+  PostRecord,
+  PostView,
+  ProfileAssociatedActivitySubscription,
+  ProfileRecord,
+  ProfileView,
+  ProfileViewBasic,
+  ProfileViewDetailed,
+  ProfileViewer,
+  ReasonPin,
+  ReasonRepost,
   RecordEmbed,
   RecordEmbedView,
   RecordEmbedViewInternal,
   RecordWithMedia,
   RecordWithMediaView,
+  ReplyRef,
+  RepostRecord,
+  StarterPackView,
+  StarterPackViewBasic,
+  StatusView,
+  ThreadItem,
+  ThreadOtherItem,
+  ThreadViewPost,
+  ThreadgateView,
+  VerificationRecord,
+  VerificationState,
+  VerificationView,
   VideoEmbed,
   VideoEmbedView,
-  isExternalEmbed,
-  isImagesEmbed,
-  isRecordEmbed,
-  isRecordWithMedia,
-  isVideoEmbed,
-} from './types'
+  isExternalEmbedType,
+  isImagesEmbedType,
+  isLabelerRecordType,
+  isListRuleType,
+  isPostRecordType,
+  isPostViewType,
+  isProfileRecordType,
+  isRecordEmbedType,
+  isRecordWithMediaType,
+  isSelfLabelsType,
+  isVideoEmbedType,
+} from './types.js'
 import {
   VideoUriBuilder,
   cidFromBlobJson,
@@ -125,9 +111,8 @@ import {
   parseThreadGate,
 } from './util'
 
-const notificationDeletedRecord = {
-  $type: 'app.bsky.notification.defs#recordDeleted' as const,
-}
+const notificationDeletedRecord =
+  app.bsky.notification.defs.recordDeleted.$build({})
 
 // Pre-computed CID for the `notificationDeletedRecord`.
 const notificationDeletedRecordCid =
@@ -156,18 +141,18 @@ export class Views {
   // Actor
   // ------------
 
-  actorIsNoHosted(did: string, state: HydrationState): boolean {
+  actorIsNoHosted(did: DidString, state: HydrationState): boolean {
     return (
       this.actorIsDeactivated(did, state) || this.actorIsTakendown(did, state)
     )
   }
 
-  actorIsDeactivated(did: string, state: HydrationState): boolean {
+  actorIsDeactivated(did: DidString, state: HydrationState): boolean {
     if (state.actors?.get(did)?.upstreamStatus === 'deactivated') return true
     return false
   }
 
-  actorIsTakendown(did: string, state: HydrationState): boolean {
+  actorIsTakendown(did: DidString, state: HydrationState): boolean {
     const actor = state.actors?.get(did)
     if (actor?.takedownRef) return true
     if (actor?.upstreamStatus === 'takendown') return true
@@ -183,7 +168,7 @@ export class Views {
     return !state.ctx?.viewer && !!isNoUnauthenticated
   }
 
-  viewerBlockExists(did: string, state: HydrationState): boolean {
+  viewerBlockExists(did: DidString, state: HydrationState): boolean {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return false
     return !!(
@@ -194,29 +179,41 @@ export class Views {
     )
   }
 
-  viewerMuteExists(did: string, state: HydrationState): boolean {
+  viewerMuteExists(did: DidString, state: HydrationState): boolean {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return false
     return !!(viewer.muted || this.mutedByList(viewer, state))
   }
 
-  blockingByList(viewer: ProfileViewerState, state: HydrationState) {
+  blockingByList(
+    viewer: ProfileViewerState,
+    state: HydrationState,
+  ): undefined | AtUriString {
     return (
       viewer.blockingByList && this.recordActive(viewer.blockingByList, state)
     )
   }
 
-  blockedByList(viewer: ProfileViewerState, state: HydrationState) {
+  blockedByList(
+    viewer: ProfileViewerState,
+    state: HydrationState,
+  ): undefined | AtUriString {
     return (
       viewer.blockedByList && this.recordActive(viewer.blockedByList, state)
     )
   }
 
-  mutedByList(viewer: ProfileViewerState, state: HydrationState) {
+  mutedByList(
+    viewer: ProfileViewerState,
+    state: HydrationState,
+  ): undefined | AtUriString {
     return viewer.mutedByList && this.recordActive(viewer.mutedByList, state)
   }
 
-  recordActive(uri: string, state: HydrationState) {
+  recordActive(
+    uri: AtUriString,
+    state: HydrationState,
+  ): AtUriString | undefined {
     const did = uriToDid(uri)
     const actor = state.actors?.get(did)
     if (!actor || this.actorIsTakendown(did, state)) {
@@ -228,7 +225,7 @@ export class Views {
   }
 
   viewerSeesNeedsReview(
-    { did, uri }: { did?: string; uri?: string },
+    { did, uri }: { did?: DidString; uri?: AtUriString },
     state: HydrationState,
   ): boolean {
     const { labels, profileViewers, ctx } = state
@@ -247,8 +244,8 @@ export class Views {
   }
 
   replyIsHiddenByThreadgate(
-    replyUri: string,
-    rootPostUri: string,
+    replyUri: AtUriString,
+    rootPostUri: AtUriString,
     state: HydrationState,
   ) {
     const threadgateUri = postUriToThreadgateUri(rootPostUri)
@@ -257,7 +254,7 @@ export class Views {
   }
 
   profileDetailed(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<ProfileViewDetailed> | undefined {
     const actor = state.actors?.get(did)
@@ -310,7 +307,7 @@ export class Views {
     }
   }
   profile(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<ProfileView> | undefined {
     const actor = state.actors?.get(did)
@@ -322,23 +319,23 @@ export class Views {
       description: actor.profile?.description || undefined,
       indexedAt:
         actor.indexedAt && actor.sortedAt
-          ? this.indexedAt({
+          ? (this.indexedAt({
               sortedAt: actor.sortedAt,
               indexedAt: actor.indexedAt,
-            }).toISOString()
+            }).toISOString() as DatetimeString)
           : undefined,
     }
   }
 
   profileBasic(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<ProfileViewBasic> | undefined {
     const actor = state.actors?.get(did)
     if (!actor) return
     const profileUri = AtUri.make(
       did,
-      ids.AppBskyActorProfile,
+      app.bsky.actor.profile.$nsid,
       'self',
     ).toString()
     const labels = [
@@ -380,7 +377,9 @@ export class Views {
       },
       viewer: this.profileViewer(did, state),
       labels,
-      createdAt: actor.createdAt?.toISOString(),
+      createdAt: actor.createdAt
+        ? (actor.createdAt.toISOString() as DatetimeString)
+        : undefined,
       verification: this.verification(did, state),
       status: this.status(did, state),
       debug: state.ctx?.includeDebugField ? actor.debug : undefined,
@@ -394,7 +393,7 @@ export class Views {
   }
 
   profileKnownFollowers(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): ProfileView | undefined {
     const actor = state.actors?.get(did)
@@ -413,7 +412,10 @@ export class Views {
     }
   }
 
-  profileViewer(did: string, state: HydrationState): ProfileViewer | undefined {
+  profileViewer(
+    did: DidString,
+    state: HydrationState,
+  ): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
     const blockedByList = this.blockedByList(viewer, state)
@@ -442,7 +444,7 @@ export class Views {
 
   profileViewerActivitySubscription(
     profileViewer: ProfileViewerState,
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): ActivitySubscription | undefined {
     const actor = state.actors?.get(did)
@@ -463,7 +465,7 @@ export class Views {
     return undefined
   }
 
-  profileWebsite(did: string, state: HydrationState): string | undefined {
+  profileWebsite(did: DidString, state: HydrationState): UriString | undefined {
     const actor = state.actors?.get(did)
     if (!actor?.profile?.website) return
     const { website } = actor.profile
@@ -474,7 +476,7 @@ export class Views {
   }
 
   knownFollowers(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): KnownFollowers | undefined {
     const knownFollowers = state.knownFollowers?.get(did)
@@ -497,7 +499,7 @@ export class Views {
   }
 
   verification(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): VerificationState | undefined {
     const actor = state.actors?.get(did)
@@ -509,8 +511,8 @@ export class Views {
 
     const isImpersonation = state.labels?.get(did)?.isImpersonation
 
-    const verifications: VerificationView[] = actor.verifications.map(
-      ({ issuer, uri, displayName, handle, createdAt }) => {
+    const verifications = actor.verifications.map(
+      ({ issuer, uri, displayName, handle, createdAt }): VerificationView => {
         // @NOTE: We don't factor-in impersonation when evaluating the validity of each verification,
         // only in the overall profile verification validity.
         const isValid =
@@ -555,7 +557,7 @@ export class Views {
     }
   }
 
-  status(did: string, state: HydrationState): StatusView | undefined {
+  status(did: DidString, state: HydrationState): StatusView | undefined {
     const actor = state.actors?.get(did)
     if (!actor?.status) return
 
@@ -573,7 +575,7 @@ export class Views {
       return undefined
     }
 
-    const uri = AtUri.make(did, ids.AppBskyActorStatus, 'self').toString()
+    const uri = AtUri.make(did, app.bsky.actor.status.$nsid, 'self').toString()
 
     const minDuration = 5 * MINUTE
     const maxDuration = 4 * HOUR
@@ -586,7 +588,7 @@ export class Views {
         )
       : undefined
     const expiresAt = expiresAtMs
-      ? new Date(expiresAtMs).toISOString()
+      ? (new Date(expiresAtMs).toISOString() as DatetimeString)
       : undefined
 
     const isActive = expiresAtMs ? expiresAtMs > Date.now() : undefined
@@ -596,9 +598,10 @@ export class Views {
       cid,
       record: record,
       status: record.status,
-      embed: isExternalEmbed(record.embed)
-        ? this.externalEmbed(did, record.embed)
-        : undefined,
+      embed:
+        record.embed && isExternalEmbedType(record.embed)
+          ? this.externalEmbed(did, record.embed)
+          : undefined,
       expiresAt,
       isActive,
     }
@@ -611,7 +614,7 @@ export class Views {
   }
 
   blockedProfileViewer(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
@@ -627,7 +630,10 @@ export class Views {
   // Graph
   // ------------
 
-  list(uri: string, state: HydrationState): Un$Typed<ListView> | undefined {
+  list(
+    uri: AtUriString,
+    state: HydrationState,
+  ): Un$Typed<ListView> | undefined {
     const creatorDid = creatorFromUri(uri)
     const list = state.lists?.get(uri)
     if (!list) return
@@ -641,12 +647,12 @@ export class Views {
       creator,
       description: list.record.description,
       descriptionFacets: list.record.descriptionFacets,
-      indexedAt: this.indexedAt(list).toISOString(),
+      indexedAt: this.indexedAt(list).toISOString() as DatetimeString,
     }
   }
 
   listBasic(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): Un$Typed<ListViewBasic> | undefined {
     const list = state.lists?.get(uri)
@@ -670,7 +676,7 @@ export class Views {
           )
         : undefined,
       listItemCount: listAgg?.listItems ?? 0,
-      indexedAt: this.indexedAt(list).toISOString(),
+      indexedAt: this.indexedAt(list).toISOString() as DatetimeString,
       labels,
       viewer: listViewer
         ? {
@@ -682,8 +688,8 @@ export class Views {
   }
 
   listItemView(
-    uri: string,
-    did: string,
+    uri: AtUriString,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<ListItemView> | undefined {
     const subject = this.profile(did, state)
@@ -692,13 +698,13 @@ export class Views {
   }
 
   starterPackBasic(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): Un$Typed<StarterPackViewBasic> | undefined {
     const sp = state.starterPacks?.get(uri)
     if (!sp) return
     const parsedUri = new AtUri(uri)
-    const creator = this.profileBasic(parsedUri.hostname, state)
+    const creator = this.profileBasic(parsedUri.did, state)
     if (!creator) return
     const agg = state.starterPackAggs?.get(uri)
     const labels = state.labels?.getBySubject(uri) ?? []
@@ -710,12 +716,12 @@ export class Views {
       joinedAllTimeCount: agg?.joinedAllTime ?? 0,
       joinedWeekCount: agg?.joinedWeek ?? 0,
       labels,
-      indexedAt: this.indexedAt(sp).toISOString(),
+      indexedAt: this.indexedAt(sp).toISOString() as DatetimeString,
     }
   }
 
   starterPack(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): Un$Typed<StarterPackView> | undefined {
     const sp = state.starterPacks?.get(uri)
@@ -749,7 +755,7 @@ export class Views {
     cid,
     record,
   }: {
-    uri?: string
+    uri?: AtUriString
     cid?: string
     record?:
       | PostRecord
@@ -765,15 +771,19 @@ export class Views {
 
     // Only these have a "labels" property:
     if (
-      !isPostRecord(record) &&
-      !isProfileRecord(record) &&
-      !isLabelerRecord(record)
+      !isPostRecordType(record) &&
+      !isProfileRecordType(record) &&
+      !isLabelerRecordType(record)
     ) {
       return []
     }
 
     // Ignore if no labels defines
-    if (!isSelfLabels(record.labels) || !record.labels.values.length) {
+    if (
+      !record.labels ||
+      !isSelfLabelsType(record.labels) ||
+      !record.labels.values.length
+    ) {
       return []
     }
 
@@ -781,14 +791,14 @@ export class Views {
     const cts =
       typeof record.createdAt === 'string'
         ? normalizeDatetimeAlways(record.createdAt)
-        : new Date(0).toISOString()
+        : (new Date(0).toISOString() as DatetimeString)
     return record.labels.values.map(({ val }) => {
       return { src, uri, cid, val, cts }
     })
   }
 
   labeler(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<LabelerView> | undefined {
     const labeler = state.labelers?.get(did)
@@ -798,7 +808,11 @@ export class Views {
     const viewer = state.labelerViewers?.get(did)
     const aggs = state.labelerAggs?.get(did)
 
-    const uri = AtUri.make(did, ids.AppBskyLabelerService, 'self').toString()
+    const uri = AtUri.make(
+      did,
+      app.bsky.labeler.service.$type,
+      'self',
+    ).toString()
     const labels = [
       ...(state.labels?.getBySubject(uri) ?? []),
       ...this.selfLabels({
@@ -818,13 +832,13 @@ export class Views {
             like: viewer.like,
           }
         : undefined,
-      indexedAt: this.indexedAt(labeler).toISOString(),
+      indexedAt: this.indexedAt(labeler).toISOString() as DatetimeString,
       labels,
     }
   }
 
   labelerDetailed(
-    did: string,
+    did: DidString,
     state: HydrationState,
   ): Un$Typed<LabelerViewDetailed> | undefined {
     const baseView = this.labeler(did, state)
@@ -878,7 +892,7 @@ export class Views {
   }
 
   feedGenerator(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): Un$Typed<GeneratorView> | undefined {
     const feedgen = state.feedgens?.get(uri)
@@ -914,12 +928,12 @@ export class Views {
           }
         : undefined,
       contentMode: feedgen.record.contentMode,
-      indexedAt: this.indexedAt(feedgen).toISOString(),
+      indexedAt: this.indexedAt(feedgen).toISOString() as DatetimeString,
     }
   }
 
   threadgate(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): Un$Typed<ThreadgateView> | undefined {
     const gate = state.threadgates?.get(uri)
@@ -929,21 +943,21 @@ export class Views {
       cid: gate.cid,
       record: gate.record,
       lists: mapDefined(gate.record.allow ?? [], (rule) => {
-        if (!isListRule(rule)) return
+        if (!isListRuleType(rule)) return
         return this.listBasic(rule.list, state)
       }),
     }
   }
 
   post(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
     depth = 0,
   ): Un$Typed<PostView> | undefined {
     const post = state.posts?.get(uri)
     if (!post) return
     const parsedUri = new AtUri(uri)
-    const authorDid = parsedUri.hostname
+    const authorDid = parsedUri.did
     const author = this.profileBasic(authorDid, state)
     if (!author) return
     const aggs = state.postAggs?.get(uri)
@@ -971,7 +985,7 @@ export class Views {
       repostCount: aggs?.reposts ?? 0,
       likeCount: aggs?.likes ?? 0,
       quoteCount: aggs?.quotes ?? 0,
-      indexedAt: this.indexedAt(post).toISOString(),
+      indexedAt: this.indexedAt(post).toISOString() as DatetimeString,
       viewer: viewer
         ? {
             repost: viewer.repost,
@@ -1020,8 +1034,11 @@ export class Views {
     }
   }
 
-  replyRef(uri: string, state: HydrationState): Un$Typed<ReplyRef> | undefined {
-    const postRecord = state.posts?.get(uri.toString())?.record
+  replyRef(
+    uri: AtUriString,
+    state: HydrationState,
+  ): Un$Typed<ReplyRef> | undefined {
+    const postRecord = state.posts?.get(uri)?.record
     if (!postRecord?.reply) return
     let root = this.maybePost(postRecord.reply.root.uri, state)
     let parent = this.maybePost(postRecord.reply.parent.uri, state)
@@ -1029,25 +1046,31 @@ export class Views {
       const childBlocks = state.postBlocks?.get(uri)
       const parentBlocks = state.postBlocks?.get(parent.uri)
       // if child blocks parent, block parent
-      if (isPostView(parent) && childBlocks?.parent) {
+      if (isPostViewType(parent) && childBlocks?.parent) {
         parent = this.blockedPost(parent.uri, parent.author.did, state)
       }
       // if child or parent blocks root, block root
-      if (isPostView(root) && (childBlocks?.root || parentBlocks?.root)) {
+      if (isPostViewType(root) && (childBlocks?.root || parentBlocks?.root)) {
         root = this.blockedPost(root.uri, root.author.did, state)
       }
     }
     let grandparentAuthor: ProfileViewBasic | undefined
-    if (
-      isPostView(parent) &&
-      isPostRecord(parent.record) &&
-      parent.record.reply
-    ) {
-      grandparentAuthor = this.profileBasic(
-        // @ts-expect-error isValidPostRecord(parent.record) should be used but the "parent" is not IPDL decoded
-        creatorFromUri(parent.record.reply.parent.uri),
-        state,
-      )
+    if (isPostViewType(parent)) {
+      // @NOTE The "parent.record" property is of type "unknown" in the lexicon
+      // schema, which means that it is typed as LexMap here. In order to avoid
+      // (expensive) validation using "isPostRecord(parent.record)", we only
+      // check that the "$type" property is a post record type, then use a
+      // try/catch to "validate" the post uri.
+      if (isPostRecordType(parent.record) && parent.record.reply != null) {
+        const uri = (parent.record.reply as any).parent?.uri
+        if (typeof uri === 'string') {
+          try {
+            grandparentAuthor = this.profileBasic(creatorFromUri(uri), state)
+          } catch {
+            // ignore (just as if validation had failed)
+          }
+        }
+      }
     }
     return {
       root,
@@ -1056,7 +1079,7 @@ export class Views {
     }
   }
 
-  maybePost(uri: string, state: HydrationState): $Typed<MaybePostView> {
+  maybePost(uri: AtUriString, state: HydrationState): $Typed<MaybePostView> {
     const post = this.post(uri, state)
     if (!post) {
       return this.notFoundPost(uri)
@@ -1064,57 +1087,49 @@ export class Views {
     if (this.viewerBlockExists(post.author.did, state)) {
       return this.blockedPost(uri, post.author.did, state)
     }
-    return {
-      ...post,
-      $type: 'app.bsky.feed.defs#postView',
-    }
+    return app.bsky.feed.defs.postView.$build(post)
   }
 
   blockedPost(
-    uri: string,
-    authorDid: string,
+    uri: AtUriString,
+    authorDid: DidString,
     state: HydrationState,
   ): $Typed<BlockedPost> {
-    return {
-      $type: 'app.bsky.feed.defs#blockedPost',
+    return app.bsky.feed.defs.blockedPost.$build({
       uri,
       blocked: true,
       author: {
         did: authorDid,
         viewer: this.blockedProfileViewer(authorDid, state),
       },
-    }
+    })
   }
 
-  notFoundPost(uri: string): $Typed<NotFoundPost> {
-    return {
-      $type: 'app.bsky.feed.defs#notFoundPost',
+  notFoundPost(uri: AtUriString): $Typed<NotFoundPost> {
+    return app.bsky.feed.defs.notFoundPost.$build({
       uri,
       notFound: true,
-    }
+    })
   }
 
   reasonRepost(
-    uri: string,
+    uri: AtUriString,
     repost: Repost,
     state: HydrationState,
   ): $Typed<ReasonRepost> | undefined {
     const creatorDid = creatorFromUri(uri)
     const creator = this.profileBasic(creatorDid, state)
     if (!creator) return
-    return {
-      $type: 'app.bsky.feed.defs#reasonRepost',
+    return app.bsky.feed.defs.reasonRepost.$build({
       by: creator,
       uri,
       cid: repost.cid,
-      indexedAt: this.indexedAt(repost).toISOString(),
-    }
+      indexedAt: this.indexedAt(repost).toISOString() as DatetimeString,
+    })
   }
 
   reasonPin(): $Typed<ReasonPin> {
-    return {
-      $type: 'app.bsky.feed.defs#reasonPin',
-    }
+    return app.bsky.feed.defs.reasonPin.$build({})
   }
 
   // Bookmarks
@@ -1130,13 +1145,15 @@ export class Views {
     if (!bookmark) return
 
     const atUri = new AtUri(bookmark.subjectUri)
-    if (atUri.collection !== ids.AppBskyFeedPost) return
+    if (atUri.collection !== app.bsky.feed.post.$type) return
 
-    const item = this.maybePost(bookmark.subjectUri, state)
+    const item = this.maybePost(atUri.href, state)
     return {
-      createdAt: bookmark.indexedAt?.toISOString(),
+      createdAt: bookmark.indexedAt
+        ? (bookmark.indexedAt.toISOString() as DatetimeString)
+        : undefined,
       subject: {
-        uri: bookmark.subjectUri,
+        uri: atUri.href,
         cid: bookmark.subjectCid,
       },
       item,
@@ -1147,7 +1164,7 @@ export class Views {
   // ------------
 
   thread(
-    skele: { anchor: string; uris: string[] },
+    skele: { anchor: AtUriString; uris: AtUriString[] },
     state: HydrationState,
     opts: { height: number; depth: number },
   ): $Typed<ThreadViewPost> | $Typed<NotFoundPost> | $Typed<BlockedPost> {
@@ -1159,7 +1176,7 @@ export class Views {
       return this.blockedPost(anchor, post.author.did, state)
     }
     const includedPosts = new Set<string>([anchor])
-    const childrenByParentUri: Record<string, string[]> = {}
+    const childrenByParentUri: Record<AtUriString, AtUriString[]> = {}
     uris.forEach((uri) => {
       const post = state.posts?.get(uri)
       const parentUri = post?.record.reply?.parent.uri
@@ -1172,8 +1189,7 @@ export class Views {
     const rootUri = getRootUri(anchor, postInfo)
     const violatesThreadGate = postInfo.violatesThreadGate
 
-    return {
-      $type: 'app.bsky.feed.defs#threadViewPost',
+    return app.bsky.feed.defs.threadViewPost.$build({
       post,
       parent: !violatesThreadGate
         ? this.threadParent(anchor, rootUri, state, opts.height)
@@ -1190,11 +1206,11 @@ export class Views {
       threadContext: {
         rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
       },
-    }
+    })
   }
 
   threadParent(
-    childUri: string,
+    childUri: AtUriString,
     rootUri: string,
     state: HydrationState,
     height: number,
@@ -1219,20 +1235,19 @@ export class Views {
     if (this.viewerBlockExists(post.author.did, state)) {
       return this.blockedPost(parentUri, post.author.did, state)
     }
-    return {
-      $type: 'app.bsky.feed.defs#threadViewPost',
+    return app.bsky.feed.defs.threadViewPost.$build({
       post,
       parent: this.threadParent(parentUri, rootUri, state, height - 1),
       threadContext: {
         rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
       },
-    }
+    })
   }
 
   threadReplies(
-    parentUri: string,
-    rootUri: string,
-    childrenByParentUri: Record<string, string[]>,
+    parentUri: AtUriString,
+    rootUri: AtUriString,
+    childrenByParentUri: Record<AtUriString, AtUriString[]>,
     state: HydrationState,
     depth: number,
   ): ($Typed<ThreadViewPost> | $Typed<BlockedPost>)[] | undefined {
@@ -1260,8 +1275,7 @@ export class Views {
       if (!this.viewerSeesNeedsReview({ uri, did: post.author.did }, state)) {
         return undefined
       }
-      return {
-        $type: 'app.bsky.feed.defs#threadViewPost',
+      return app.bsky.feed.defs.threadViewPost.$build({
         post,
         replies: this.threadReplies(
           uri,
@@ -1273,7 +1287,7 @@ export class Views {
         threadContext: {
           rootAuthorLike: state.threadContexts?.get(post.uri)?.like,
         },
-      }
+      })
     })
   }
 
@@ -1281,7 +1295,7 @@ export class Views {
   // ------------
 
   threadV2(
-    skeleton: { anchor: string; uris: string[] },
+    skeleton: { anchor: AtUriString; uris: AtUriString[] },
     state: HydrationState,
     {
       above,
@@ -1419,8 +1433,8 @@ export class Views {
         threadTagsHide: this.threadTagsHide,
         visibilityTagRankPrefix: this.visibilityTagRankPrefix,
       },
-      state.ctx?.featureGatesMap.get(
-        'threads:reply_ranking_exploration:enable',
+      state.ctx?.features.checkGate(
+        state.ctx.features.Gate.ThreadsReplyRankingExplorationEnable,
       ),
     )
 
@@ -1438,9 +1452,9 @@ export class Views {
       above,
       depth,
     }: {
-      childUri: string
-      opDid: string
-      rootUri: string
+      childUri: AtUriString
+      opDid: DidString
+      rootUri: AtUriString
       above: number
       depth: number
     },
@@ -1558,11 +1572,11 @@ export class Views {
       depth,
       branchingFactor,
     }: {
-      parentUri: string
+      parentUri: AtUriString
       isOPThread: boolean
       opDid: string
-      rootUri: string
-      childrenByParentUri: Record<string, string[]>
+      rootUri: AtUriString
+      childrenByParentUri: Record<AtUriString, AtUriString[]>
       below: number
       depth: number
       branchingFactor: number
@@ -1574,7 +1588,7 @@ export class Views {
       return { replies: undefined, hasOtherReplies: false }
     }
 
-    const childrenUris = childrenByParentUri[parentUri] ?? []
+    const childrenUris: AtUriString[] = childrenByParentUri[parentUri] ?? []
     let hasOtherReplies = false
     const replies = mapDefined(childrenUris, (uri) => {
       const replyInclusion = this.checkThreadV2ReplyInclusion({
@@ -1656,7 +1670,7 @@ export class Views {
     moreParents?: boolean
     postView: PostView
     repliesAllowance?: number
-    uri: string
+    uri: AtUriString
   }): ThreadItemValuePost {
     const moreReplies =
       repliesAllowance === undefined
@@ -1666,15 +1680,14 @@ export class Views {
     return {
       uri,
       depth,
-      value: {
-        $type: 'app.bsky.unspecced.defs#threadItemPost',
+      value: app.bsky.unspecced.defs.threadItemPost.$build({
         post: postView,
         moreParents: moreParents ?? false,
         moreReplies,
         opThread: isOPThread,
         hiddenByThreadgate: false, // Hidden posts are handled by threadOtherV2
         mutedByViewer: false, // Hidden posts are handled by threadOtherV2
-      },
+      }),
     }
   }
 
@@ -1682,15 +1695,13 @@ export class Views {
     uri,
     depth,
   }: {
-    uri: string
+    uri: AtUriString
     depth: number
   }): ThreadItemValueNoUnauthenticated {
     return {
       uri,
       depth,
-      value: {
-        $type: 'app.bsky.unspecced.defs#threadItemNoUnauthenticated',
-      },
+      value: app.bsky.unspecced.defs.threadItemNoUnauthenticated.$build({}),
     }
   }
 
@@ -1698,15 +1709,13 @@ export class Views {
     uri,
     depth,
   }: {
-    uri: string
+    uri: AtUriString
     depth: number
   }): ThreadItemValueNotFound {
     return {
       uri,
       depth,
-      value: {
-        $type: 'app.bsky.unspecced.defs#threadItemNotFound',
-      },
+      value: app.bsky.unspecced.defs.threadItemNotFound.$build({}),
     }
   }
 
@@ -1716,26 +1725,25 @@ export class Views {
     authorDid,
     state,
   }: {
-    uri: string
+    uri: AtUriString
     depth: number
-    authorDid: string
+    authorDid: DidString
     state: HydrationState
   }): ThreadItemValueBlocked {
     return {
       uri,
       depth,
-      value: {
-        $type: 'app.bsky.unspecced.defs#threadItemBlocked',
+      value: app.bsky.unspecced.defs.threadItemBlocked.$build({
         author: {
           did: authorDid,
           viewer: this.blockedProfileViewer(authorDid, state),
         },
-      },
+      }),
     }
   }
 
   threadOtherV2(
-    skeleton: { anchor: string; uris: string[] },
+    skeleton: { anchor: AtUriString; uris: AtUriString[] },
     state: HydrationState,
     {
       below,
@@ -1792,8 +1800,8 @@ export class Views {
         threadTagsHide: this.threadTagsHide,
         visibilityTagRankPrefix: this.visibilityTagRankPrefix,
       },
-      state.ctx?.featureGatesMap.get(
-        'threads:reply_ranking_exploration:enable',
+      state.ctx?.features.checkGate(
+        state.ctx.features.Gate.ThreadsReplyRankingExplorationEnable,
       ),
     )
   }
@@ -1806,9 +1814,9 @@ export class Views {
       below,
       depth,
     }: {
-      parentUri: string
-      rootUri: string
-      childrenByParentUri: Record<string, string[]>
+      parentUri: AtUriString
+      rootUri: AtUriString
+      childrenByParentUri: Record<AtUriString, AtUriString[]>
       below: number
       depth: number
     },
@@ -1819,7 +1827,7 @@ export class Views {
       return undefined
     }
 
-    const childrenUris = childrenByParentUri[parentUri] ?? []
+    const childrenUris: AtUriString[] = childrenByParentUri[parentUri] ?? []
     return mapDefined(childrenUris, (uri) => {
       const replyInclusion = this.checkThreadV2ReplyInclusion({
         uri,
@@ -1880,7 +1888,7 @@ export class Views {
     uri,
   }: {
     depth: number
-    uri: string
+    uri: AtUriString
   }): ThreadOtherAnchorPostNode['item'] {
     return {
       uri,
@@ -1902,20 +1910,19 @@ export class Views {
     hiddenByThreadgate: boolean
     mutedByViewer: boolean
     postView: PostView
-    uri: string
+    uri: AtUriString
   }): ThreadOtherItemValuePost {
     const base = this.threadOtherV2ItemPostAnchor({ depth, uri })
     return {
       ...base,
-      value: {
-        $type: 'app.bsky.unspecced.defs#threadItemPost',
+      value: app.bsky.unspecced.defs.threadItemPost.$build({
         post: postView,
         hiddenByThreadgate,
         mutedByViewer,
         moreParents: false, // "Other" replies don't have parents.
         moreReplies: 0, // "Other" replies don't have replies hydrated.
         opThread: false, // "Other" replies don't contain OP threads.
-      },
+      }),
     }
   }
 
@@ -1924,7 +1931,7 @@ export class Views {
     rootUri,
     state,
   }: {
-    uri: string
+    uri: AtUriString
     rootUri: string
     state: HydrationState
   }): {
@@ -1975,8 +1982,8 @@ export class Views {
     }: {
       post: Post
       postView: PostView
-      rootUri: string
-      uri: string
+      rootUri: AtUriString
+      uri: AtUriString
     },
     state: HydrationState,
   ): {
@@ -1990,7 +1997,9 @@ export class Views {
 
     let hiddenByTag = false
     if (
-      state.ctx?.featureGatesMap.get('threads:reply_ranking_exploration:enable')
+      state.ctx?.features.checkGate(
+        state.ctx.features.Gate.ThreadsReplyRankingExplorationEnable,
+      )
     ) {
       hiddenByTag = authorDid !== opDid && post.tags.has(this.visibilityTagHide)
     } else {
@@ -2008,7 +2017,7 @@ export class Views {
 
     const mutedByViewer = this.viewerMuteExists(authorDid, state)
     const isPushPin =
-      isPostRecord(post.record) && post.record.text.trim() === '📌'
+      isPostRecordType(post.record) && post.record.text.trim() === '📌'
 
     return {
       isOther: hiddenByTag || hiddenByThreadgate || mutedByViewer || isPushPin,
@@ -2019,13 +2028,13 @@ export class Views {
   }
 
   private groupThreadChildrenByParent(
-    anchorUri: string,
-    uris: string[],
+    anchorUri: AtUriString,
+    uris: AtUriString[],
     state: HydrationState,
-  ): Record<string, string[]> {
+  ): Record<AtUriString, AtUriString[]> {
     // Groups children of each parent.
-    const includedPosts = new Set<string>([anchorUri])
-    const childrenByParentUri: Record<string, string[]> = {}
+    const includedPosts = new Set<AtUriString>([anchorUri])
+    const childrenByParentUri: Record<AtUriString, AtUriString[]> = {}
     uris.forEach((uri) => {
       const post = state.posts?.get(uri)
       const parentUri = post?.record.reply?.parent.uri
@@ -2042,27 +2051,27 @@ export class Views {
   // ------------
 
   embed(
-    postUri: string,
-    embed: Embed | { $type: string },
+    postUri: AtUriString,
+    embed: $Typed<Embed> | Unknown$TypedObject,
     state: HydrationState,
     depth: number,
   ): $Typed<EmbedView> | undefined {
-    if (isImagesEmbed(embed)) {
+    if (isImagesEmbedType(embed)) {
       return this.imagesEmbed(creatorFromUri(postUri), embed)
-    } else if (isVideoEmbed(embed)) {
+    } else if (isVideoEmbedType(embed)) {
       return this.videoEmbed(creatorFromUri(postUri), embed)
-    } else if (isExternalEmbed(embed)) {
+    } else if (isExternalEmbedType(embed)) {
       return this.externalEmbed(creatorFromUri(postUri), embed)
-    } else if (isRecordEmbed(embed)) {
+    } else if (isRecordEmbedType(embed)) {
       return this.recordEmbed(postUri, embed, state, depth)
-    } else if (isRecordWithMedia(embed)) {
+    } else if (isRecordWithMediaType(embed)) {
       return this.recordWithMediaEmbed(postUri, embed, state, depth)
     } else {
       return undefined
     }
   }
 
-  imagesEmbed(did: string, embed: ImagesEmbed): $Typed<ImagesEmbedView> {
+  imagesEmbed(did: DidString, embed: ImagesEmbed): $Typed<ImagesEmbedView> {
     const imgViews = embed.images.map((img) => ({
       thumb: this.imgUriBuilder.getPresetUri(
         'feed_thumbnail',
@@ -2077,29 +2086,29 @@ export class Views {
       alt: img.alt,
       aspectRatio: img.aspectRatio,
     }))
-    return {
-      $type: 'app.bsky.embed.images#view',
+    return app.bsky.embed.images.view.$build({
       images: imgViews,
-    }
+    })
   }
 
-  videoEmbed(did: string, embed: VideoEmbed): $Typed<VideoEmbedView> {
+  videoEmbed(did: DidString, embed: VideoEmbed): $Typed<VideoEmbedView> {
     const cid = cidFromBlobJson(embed.video)
-    return {
-      $type: 'app.bsky.embed.video#view',
+    return app.bsky.embed.video.view.$build({
       cid,
       playlist: this.videoUriBuilder.playlist({ did, cid }),
       thumbnail: this.videoUriBuilder.thumbnail({ did, cid }),
       alt: embed.alt,
       aspectRatio: embed.aspectRatio,
       presentation: embed.presentation,
-    }
+    })
   }
 
-  externalEmbed(did: string, embed: ExternalEmbed): $Typed<ExternalEmbedView> {
+  externalEmbed(
+    did: DidString,
+    embed: ExternalEmbed,
+  ): $Typed<ExternalEmbedView> {
     const { uri, title, description, thumb } = embed.external
-    return {
-      $type: 'app.bsky.embed.external#view',
+    return app.bsky.embed.external.view.$build({
       external: {
         uri,
         title,
@@ -2112,68 +2121,52 @@ export class Views {
             )
           : undefined,
       },
-    }
+    })
   }
 
-  embedNotFound(uri: string): {
-    $type: 'app.bsky.embed.record#view'
-    record: $Typed<EmbedNotFound>
-  } {
-    return {
-      $type: 'app.bsky.embed.record#view',
-      record: {
-        $type: 'app.bsky.embed.record#viewNotFound',
+  embedNotFound(uri: AtUriString): $Typed<RecordEmbedView> {
+    return app.bsky.embed.record.view.$build({
+      record: app.bsky.embed.record.viewNotFound.$build({
         uri,
         notFound: true,
-      },
-    }
+      }),
+    })
   }
 
-  embedDetached(uri: string): {
-    $type: 'app.bsky.embed.record#view'
-    record: $Typed<EmbedDetached>
-  } {
-    return {
-      $type: 'app.bsky.embed.record#view',
-      record: {
-        $type: 'app.bsky.embed.record#viewDetached',
+  embedDetached(uri: AtUriString): $Typed<RecordEmbedView> {
+    return app.bsky.embed.record.view.$build({
+      record: app.bsky.embed.record.viewDetached.$build({
         uri,
         detached: true,
-      },
-    }
+      }),
+    })
   }
 
   embedBlocked(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
-  ): {
-    $type: 'app.bsky.embed.record#view'
-    record: $Typed<EmbedBlocked>
-  } {
+  ): $Typed<RecordEmbedView> {
     const creator = creatorFromUri(uri)
-    return {
-      $type: 'app.bsky.embed.record#view',
-      record: {
-        $type: 'app.bsky.embed.record#viewBlocked',
+    return app.bsky.embed.record.view.$build({
+      record: app.bsky.embed.record.viewBlocked.$build({
         uri,
         blocked: true,
         author: {
           did: creator,
           viewer: this.blockedProfileViewer(creator, state),
         },
-      },
-    }
+      }),
+    })
   }
 
   embedPostView(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
     depth: number,
   ): $Typed<PostEmbedView> | undefined {
     const postView = this.post(uri, state, depth)
     if (!postView) return
-    return {
-      $type: 'app.bsky.embed.record#viewRecord',
+    return app.bsky.embed.record.viewRecord.$build({
       uri: postView.uri,
       cid: postView.cid,
       author: postView.author,
@@ -2185,25 +2178,25 @@ export class Views {
       quoteCount: postView.quoteCount,
       indexedAt: postView.indexedAt,
       embeds: depth > 1 ? undefined : postView.embed ? [postView.embed] : [],
-    }
+    })
   }
 
   recordEmbed(
-    postUri: string,
+    postUri: AtUriString,
     embed: RecordEmbed,
     state: HydrationState,
     depth: number,
     withTypeTag: false,
   ): RecordEmbedView
   recordEmbed(
-    postUri: string,
+    postUri: AtUriString,
     embed: RecordEmbed,
     state: HydrationState,
     depth: number,
     withTypeTag?: true,
   ): $Typed<RecordEmbedView>
   recordEmbed(
-    postUri: string,
+    postUri: AtUriString,
     embed: RecordEmbed,
     state: HydrationState,
     depth: number,
@@ -2212,7 +2205,7 @@ export class Views {
     const uri = embed.record.uri
     const parsedUri = new AtUri(uri)
     if (
-      this.viewerBlockExists(parsedUri.hostname, state) ||
+      this.viewerBlockExists(parsedUri.did, state) ||
       (!state.ctx?.include3pBlocks && state.postBlocks?.get(postUri)?.embed)
     ) {
       return this.embedBlocked(uri, state)
@@ -2223,7 +2216,7 @@ export class Views {
       return this.embedDetached(uri)
     }
 
-    if (parsedUri.collection === ids.AppBskyFeedPost) {
+    if (parsedUri.collection === app.bsky.feed.post.$type) {
       const view = this.embedPostView(uri, state, depth)
       if (!view) return this.embedNotFound(uri)
       const postgateRecordUri = postUriToPostgateUri(parsedUri.toString())
@@ -2232,32 +2225,32 @@ export class Views {
         return this.embedDetached(uri)
       }
       return this.recordEmbedWrapper(view, withTypeTag)
-    } else if (parsedUri.collection === ids.AppBskyFeedGenerator) {
+    } else if (parsedUri.collection === app.bsky.feed.generator.$type) {
       const view = this.feedGenerator(uri, state)
       if (!view) return this.embedNotFound(uri)
       return this.recordEmbedWrapper(
-        { ...view, $type: 'app.bsky.feed.defs#generatorView' },
+        app.bsky.feed.defs.generatorView.$build(view),
         withTypeTag,
       )
-    } else if (parsedUri.collection === ids.AppBskyGraphList) {
+    } else if (parsedUri.collection === app.bsky.graph.list.$type) {
       const view = this.list(uri, state)
       if (!view) return this.embedNotFound(uri)
       return this.recordEmbedWrapper(
-        { ...view, $type: 'app.bsky.graph.defs#listView' },
+        app.bsky.graph.defs.listView.$build(view),
         withTypeTag,
       )
-    } else if (parsedUri.collection === ids.AppBskyLabelerService) {
-      const view = this.labeler(parsedUri.hostname, state)
+    } else if (parsedUri.collection === app.bsky.labeler.service.$type) {
+      const view = this.labeler(parsedUri.did, state)
       if (!view) return this.embedNotFound(uri)
       return this.recordEmbedWrapper(
-        { ...view, $type: 'app.bsky.labeler.defs#labelerView' },
+        app.bsky.labeler.defs.labelerView.$build(view),
         withTypeTag,
       )
-    } else if (parsedUri.collection === ids.AppBskyGraphStarterpack) {
+    } else if (parsedUri.collection === app.bsky.graph.starterpack.$type) {
       const view = this.starterPackBasic(uri, state)
       if (!view) return this.embedNotFound(uri)
       return this.recordEmbedWrapper(
-        { ...view, $type: 'app.bsky.graph.defs#starterPackViewBasic' },
+        app.bsky.graph.defs.starterPackViewBasic.$build(view),
         withTypeTag,
       )
     }
@@ -2267,15 +2260,14 @@ export class Views {
   private recordEmbedWrapper<T extends $Typed<RecordEmbedViewInternal>>(
     record: T,
     withTypeTag: boolean,
-  ) {
-    return {
-      $type: withTypeTag ? ('app.bsky.embed.record#view' as const) : undefined,
-      record,
-    } satisfies RecordEmbedView
+  ): RecordEmbedView {
+    return withTypeTag
+      ? app.bsky.embed.record.view.$build({ record })
+      : { record }
   }
 
   recordWithMediaEmbed(
-    postUri: string,
+    postUri: AtUriString,
     embed: RecordWithMedia,
     state: HydrationState,
     depth: number,
@@ -2285,28 +2277,30 @@ export class Views {
       | $Typed<ImagesEmbedView>
       | $Typed<VideoEmbedView>
       | $Typed<ExternalEmbedView>
-    if (isImagesEmbed(embed.media)) {
+    if (isImagesEmbedType(embed.media)) {
       mediaEmbed = this.imagesEmbed(creator, embed.media)
-    } else if (isVideoEmbed(embed.media)) {
+    } else if (isVideoEmbedType(embed.media)) {
       mediaEmbed = this.videoEmbed(creator, embed.media)
-    } else if (isExternalEmbed(embed.media)) {
+    } else if (isExternalEmbedType(embed.media)) {
       mediaEmbed = this.externalEmbed(creator, embed.media)
     } else {
       return
     }
-    return {
-      $type: 'app.bsky.embed.recordWithMedia#view',
+    return app.bsky.embed.recordWithMedia.view.$build({
       media: mediaEmbed,
       record: this.recordEmbed(postUri, embed.record, state, depth, false),
-    }
+    })
   }
 
-  userReplyDisabled(uri: string, state: HydrationState): boolean | undefined {
+  userReplyDisabled(
+    uri: AtUriString,
+    state: HydrationState,
+  ): boolean | undefined {
     const post = state.posts?.get(uri)
     if (post?.violatesThreadGate) {
       return true
     }
-    const rootUriStr: string = post?.record.reply?.root.uri ?? uri
+    const rootUriStr = post?.record.reply?.root.uri ?? uri
     const gate = state.threadgates?.get(
       postUriToThreadgateUri(rootUriStr),
     )?.record
@@ -2341,7 +2335,7 @@ export class Views {
   }
 
   userPostEmbeddingDisabled(
-    uri: string,
+    uri: AtUriString,
     state: HydrationState,
   ): boolean | undefined {
     const post = state.posts?.get(uri)
@@ -2364,7 +2358,7 @@ export class Views {
     return true
   }
 
-  viewerPinned(uri: string, state: HydrationState, authorDid: string) {
+  viewerPinned(uri: AtUriString, state: HydrationState, authorDid: string) {
     if (!state.ctx?.viewer || state.ctx.viewer !== authorDid) return
     const actor = state.actors?.get(authorDid)
     if (!actor) return
@@ -2380,8 +2374,8 @@ export class Views {
   ): Un$Typed<NotificationView> | undefined {
     if (!notif.timestamp || !notif.reason) return
     const uri = new AtUri(notif.uri)
-    const authorDid = uri.hostname
-    const author = this.profile(authorDid, state)
+
+    const author = this.profile(uri.did, state)
     if (!author) return
 
     let recordInfo:
@@ -2395,55 +2389,55 @@ export class Views {
       | undefined
       | null
 
-    if (uri.collection === ids.AppBskyFeedPost) {
-      recordInfo = state.posts?.get(notif.uri)
-    } else if (uri.collection === ids.AppBskyFeedLike) {
-      recordInfo = state.likes?.get(notif.uri)
-    } else if (uri.collection === ids.AppBskyFeedRepost) {
-      recordInfo = state.reposts?.get(notif.uri)
-    } else if (uri.collection === ids.AppBskyGraphFollow) {
-      recordInfo = state.follows?.get(notif.uri)
-    } else if (uri.collection === ids.AppBskyGraphVerification) {
+    if (uri.collection === app.bsky.feed.post.$type) {
+      recordInfo = state.posts?.get(notif.uri as AtUriString)
+    } else if (uri.collection === app.bsky.feed.like.$type) {
+      recordInfo = state.likes?.get(notif.uri as AtUriString)
+    } else if (uri.collection === app.bsky.feed.repost.$type) {
+      recordInfo = state.reposts?.get(notif.uri as AtUriString)
+    } else if (uri.collection === app.bsky.graph.follow.$type) {
+      recordInfo = state.follows?.get(notif.uri as AtUriString)
+    } else if (uri.collection === app.bsky.graph.verification.$type) {
       // When a verification record is removed, the record won't be found,
       // both for the `verified` and `unverified` notifications.
-      recordInfo = state.verifications?.get(notif.uri) ?? {
+      recordInfo = state.verifications?.get(notif.uri as AtUriString) ?? {
         record: notificationDeletedRecord,
         cid: notificationDeletedRecordCid,
       }
-    } else if (uri.collection === ids.AppBskyActorProfile) {
-      const actor = state.actors?.get(authorDid)
+    } else if (uri.collection === app.bsky.actor.profile.$type) {
+      const actor = state.actors?.get(author.did)
       recordInfo =
         actor && actor.profile && actor.profileCid
-          ? {
+          ? ({
               record: actor.profile,
               cid: actor.profileCid,
               sortedAt: actor.sortedAt ?? new Date(0), // @NOTE will be present since profile record is present
               indexedAt: actor.indexedAt ?? new Date(0), // @NOTE will be present since profile record is present
               takedownRef: actor.profileTakedownRef,
-            }
+            } satisfies RecordInfo<ProfileRecord>)
           : undefined
     }
     if (!recordInfo) return
 
-    const labels = state.labels?.getBySubject(notif.uri) ?? []
+    const labels = state.labels?.getBySubject(notif.uri as AtUriString) ?? []
     const selfLabels = this.selfLabels({
-      uri: notif.uri,
+      uri: parseString<AtUriString>(notif.uri),
       cid: recordInfo.cid,
       record: recordInfo.record,
     })
     const indexedAt = notif.timestamp.toDate().toISOString()
     return {
-      uri: notif.uri,
+      uri: notif.uri as AtUriString,
       cid: recordInfo.cid,
       author,
       reason: notif.reason,
-      reasonSubject: notif.reasonSubject || undefined,
+      reasonSubject: parseString<AtUriString>(notif.reasonSubject),
       record: recordInfo.record,
       // @NOTE works with a hack in listNotifications so that when there's no last-seen time,
       // the user's first notification is marked unread, and all previous read. in this case,
       // the last seen time will be equal to the first notification's indexed time.
       isRead: lastSeenAt ? lastSeenAt > indexedAt : true,
-      indexedAt: notif.timestamp.toDate().toISOString(),
+      indexedAt: notif.timestamp.toDate().toISOString() as DatetimeString,
       labels: [...labels, ...selfLabels],
     }
   }
@@ -2454,6 +2448,6 @@ export class Views {
   }
 }
 
-const getRootUri = (uri: string, post: Post): string => {
+const getRootUri = (uri: AtUriString, post: Post): AtUriString => {
   return post.record.reply?.root.uri ?? uri
 }