Merge remote-tracking branch 'origin/appview-v2' into appview-v2-testing

packages/bsky/src/context.ts

@@ -1,6 +1,6 @@
 import * as plc from '@did-plc/lib'
-import AtpAgent from '@atproto/api'
 import { IdResolver } from '@atproto/identity'
+import AtpAgent from '@atproto/api'
 import { Keypair } from '@atproto/crypto'
 import { createServiceJwt } from '@atproto/xrpc-server'
 import { ServerConfig } from './config'

packages/bsky/src/hydration/actor.ts

@@ -1,6 +1,11 @@
 import { DataPlaneClient } from '../data-plane/client'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
-import { HydrationMap, parseRecordBytes, parseString } from './util'
+import {
+  HydrationMap,
+  parseRecordBytes,
+  parseString,
+  safeTakedownRef,
+} from './util'
 
 export type Actor = {
   did: string
@@ -92,9 +97,9 @@ export class ActorHydrator {
         handle: parseString(actor.handle),
         profile: parseRecordBytes<ProfileRecord>(profile?.record),
         profileCid: profile?.cid,
-        profileTakedownRef: profile?.takedownRef || undefined,
+        profileTakedownRef: safeTakedownRef(profile),
         sortedAt: profile?.sortedAt?.toDate(),
-        takedownRef: actor.takedownRef || undefined,
+        takedownRef: safeTakedownRef(actor),
       })
     }, new HydrationMap<Actor>())
   }

packages/bsky/src/hydration/util.ts

@@ -34,7 +34,7 @@ export const parseRecord = <T>(
     record,
     cid,
     sortedAt,
-    takedownRef: entry.takedownRef || undefined,
+    takedownRef: safeTakedownRef(entry),
   }
 }
 
@@ -96,3 +96,12 @@ export const split = <T>(
   }
   return [yes, no]
 }
+
+export const safeTakedownRef = (obj?: {
+  takenDown: boolean
+  takedownRef: string
+}): string | undefined => {
+  if (!obj) return
+  if (obj.takedownRef) return obj.takedownRef
+  if (obj.takenDown) return 'BSKY-TAKEDOWN-UNKNOWN'
+}