@atproto/bsky 0.0.115 → 0.0.117

package/tests/_util.ts

@@ -5,11 +5,16 @@ import { CID } from 'multiformats/cid'
 import { AppBskyFeedGetPostThread } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
+import {
+  isView as isEmbedRecordView,
+  isViewRecord,
+} from '../src/lexicon/types/app/bsky/embed/record'
+import { isView as isEmbedRecordWithMediaView } from '../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import {
   FeedViewPost,
   PostView,
   isPostView,
+  isReasonRepost,
   isThreadViewPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
 import {
@@ -17,6 +22,7 @@ import {
   isLabelerView,
   isLabelerViewDetailed,
 } from '../src/lexicon/types/app/bsky/labeler/defs'
+import { $Typed } from '../src/lexicon/util'
 
 type ThreadViewPost = Extract<
   AppBskyFeedGetPostThread.OutputSchema['thread'],
@@ -109,10 +115,10 @@ export const forSnapshot = (obj: unknown) => {
 // Feed testing utils
 
 export const getOriginator = (item: FeedViewPost) => {
-  if (!item.reason) {
-    return item.post.author.did
+  if (isReasonRepost(item.reason)) {
+    return item.reason.by.did
   } else {
-    return (item.reason.by as { [did: string]: string }).did
+    return item.post.author.did
   }
 }
 
@@ -122,8 +128,11 @@ export const getOriginator = (item: FeedViewPost) => {
 // to this:
 //   [{ uri: '0'}, { uri: '1' }, { uri: '0'}]
 const kTake = Symbol('take')
-export function take(obj, value: string): string
-export function take(obj, value: string | undefined): string | undefined
+export function take(obj: Record<string, number>, value: string): string
+export function take(
+  obj: Record<string, number>,
+  value?: string,
+): string | undefined
 export function take(
   obj: { [s: string]: number; [kTake]?: string },
   value: string | undefined,
@@ -143,7 +152,10 @@ export function take(
 export const constantDate = new Date(0).toISOString()
 export const constantKeysetCursor = '0000000000000__bafycid'
 
-const mapLeafValues = (obj: unknown, fn: (val: unknown) => unknown) => {
+const mapLeafValues = (
+  obj: unknown,
+  fn: (val: unknown) => unknown,
+): unknown => {
   if (Array.isArray(obj)) {
     return obj.map((item) => mapLeafValues(item, fn))
   }
@@ -172,34 +184,43 @@ export const paginateAll = async <T extends { cursor?: string }>(
 }
 
 // @NOTE mutates
-export const stripViewer = <T extends { viewer?: Record<string, unknown> }>(
+export const stripViewer = <T extends { viewer?: unknown }>(
   val: T,
-): T => {
+): Omit<T, 'viewer'> => {
   delete val.viewer
   return val
 }
 
 // @NOTE mutates
-export const stripViewerFromPost = (postUnknown: unknown): PostView => {
-  if (postUnknown?.['$type'] && !isPostView(postUnknown)) {
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType?: false,
+): PostView
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType: true,
+): $Typed<PostView>
+export function stripViewerFromPost(
+  postUnknown: object,
+  withType = false,
+): PostView {
+  if ('$type' in postUnknown && !isPostView(postUnknown)) {
     throw new Error('Expected post view')
   }
   const post = postUnknown as PostView
+  if (withType) {
+    post.$type = 'app.bsky.feed.defs#postView'
+  } else {
+    delete post.$type
+  }
   post.author = stripViewer(post.author)
-  const recordEmbed =
-    post.embed && isViewRecord(post.embed.record)
-      ? post.embed.record // Record from record embed
-      : post.embed?.['record'] && isViewRecord(post.embed['record']['record'])
-        ? post.embed['record']['record'] // Record from record-with-media embed
-        : undefined
+
+  const recordEmbed = extractRecordEmbed(post.embed)
+
   if (recordEmbed) {
     recordEmbed.author = stripViewer(recordEmbed.author)
     recordEmbed.embeds?.forEach((deepEmbed) => {
-      const deepRecordEmbed = isViewRecord(deepEmbed.record)
-        ? deepEmbed.record // Record from record embed
-        : deepEmbed['record'] && isViewRecord(deepEmbed['record']['record'])
-          ? deepEmbed['record']['record'] // Record from record-with-media embed
-          : undefined
+      const deepRecordEmbed = extractRecordEmbed(deepEmbed)
       if (deepRecordEmbed) {
         deepRecordEmbed.author = stripViewer(deepRecordEmbed.author)
       }
@@ -208,10 +229,26 @@ export const stripViewerFromPost = (postUnknown: unknown): PostView => {
   return stripViewer(post)
 }
 
+const extractRecordEmbed = (embed: PostView['embed']) =>
+  isEmbedRecordView(embed)
+    ? isViewRecord(embed.record)
+      ? embed.record
+      : undefined
+    : isEmbedRecordWithMediaView(embed)
+      ? isViewRecord(embed.record.record)
+        ? embed.record.record
+        : undefined
+      : undefined
+
 // @NOTE mutates
-export const stripViewerFromThread = <T>(thread: T): T => {
-  if (!isThreadViewPost(thread)) return thread
+export const stripViewerFromThread = <T>(threadUnknown: T): T => {
+  if (!isThreadViewPost(threadUnknown)) return threadUnknown
+
+  const thread = threadUnknown as typeof threadUnknown & ThreadViewPost
+
+  // @ts-expect-error "viewer" does not exist on type 'ThreadViewPost'
   delete thread.viewer
+
   thread.post = stripViewerFromPost(thread.post)
   if (isThreadViewPost(thread.parent)) {
     thread.parent = stripViewerFromThread(thread.parent)
@@ -223,11 +260,9 @@ export const stripViewerFromThread = <T>(thread: T): T => {
 }
 
 // @NOTE mutates
-export const stripViewerFromLabeler = (
-  serviceUnknown: unknown,
-): LabelerView => {
+export const stripViewerFromLabeler = (serviceUnknown: object): LabelerView => {
   if (
-    serviceUnknown?.['$type'] &&
+    '$type' in serviceUnknown &&
     !isLabelerView(serviceUnknown) &&
     !isLabelerViewDetailed(serviceUnknown)
   ) {

package/tests/admin/admin-auth.test.ts

@@ -1,16 +1,21 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { ids } from '../../src/lexicon/lexicons'
-import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
+import {
+  RepoRef,
+  isRepoRef,
+} from '../../src/lexicon/types/com/atproto/admin/defs'
+import { $Typed } from '../../src/lexicon/util'
 
 describe('admin auth', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
+  let repoSubject: $Typed<RepoRef>
 
   const modServiceDid = 'did:example:mod'
   const altModDid = 'did:example:alt'
@@ -96,6 +101,7 @@ describe('admin auth', () => {
       { did: repoSubject.did },
       getHeaders,
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toBe(repoSubject.did)
     expect(res.data.takedown?.applied).toBe(true)
   })

package/tests/admin/moderation.test.ts

@@ -1,19 +1,26 @@
+import assert from 'node:assert'
 import { AtpAgent } from '@atproto/api'
 import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   RepoBlobRef,
   RepoRef,
+  isRepoBlobRef,
+  isRepoRef,
 } from '../../src/lexicon/types/com/atproto/admin/defs'
-import { Main as StrongRef } from '../../src/lexicon/types/com/atproto/repo/strongRef'
+import {
+  Main as StrongRef,
+  isMain as isStrongRef,
+} from '../../src/lexicon/types/com/atproto/repo/strongRef'
+import { $Typed } from '../../src/lexicon/util'
 
 describe('moderation', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
 
-  let repoSubject: RepoRef
-  let recordSubject: StrongRef
-  let blobSubject: RepoBlobRef
+  let repoSubject: $Typed<RepoRef>
+  let recordSubject: $Typed<StrongRef>
+  let blobSubject: $Typed<RepoBlobRef>
   let blobRef: ImageRef
 
   beforeAll(async () => {
@@ -64,6 +71,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(true)
     // expect(res.data.takedown?.ref).toBe('test-repo') @TODO add these checks back in once takedown refs make it into dataplane
@@ -86,6 +94,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isRepoRef(res.data.subject))
     expect(res.data.subject.did).toEqual(sc.dids.bob)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -108,6 +117,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(true)
     // expect(res.data.takedown?.ref).toBe('test-record')
@@ -130,6 +140,7 @@ describe('moderation', () => {
       },
       { headers: network.bsky.adminAuthHeaders() },
     )
+    assert(isStrongRef(res.data.subject))
     expect(res.data.subject.uri).toEqual(recordSubject.uri)
     expect(res.data.takedown?.applied).toBe(false)
     expect(res.data.takedown?.ref).toBeUndefined()
@@ -168,6 +179,7 @@ describe('moderation', () => {
         },
         { headers: network.bsky.adminAuthHeaders() },
       )
+      assert(isRepoBlobRef(res.data.subject))
       expect(res.data.subject.did).toEqual(blobSubject.did)
       expect(res.data.subject.cid).toEqual(blobSubject.cid)
       expect(res.data.takedown?.applied).toBe(true)