@atproto/api 0.6.20 → 0.6.22

package/src/client/types/com/atproto/server/reserveSigningKey.ts

@@ -0,0 +1,40 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  /** The did to reserve a new did:key for */
+  did?: string
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  /** Public signing key in the form of a did:key. */
+  signingKey: string
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+  qp?: QueryParams
+  encoding: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

package/src/client/types/com/atproto/sync/listRepos.ts

@@ -39,6 +39,7 @@ export function toKnownErr(e: any) {
 export interface Repo {
   did: string
   head: string
+  rev: string
   [k: string]: unknown
 }
 

package/src/moderation/accumulator.ts

@@ -1,4 +1,5 @@
 import { AppBskyGraphDefs } from '../client/index'
+import { AtUri } from '@atproto/syntax'
 import {
   Label,
   LabelPreference,
@@ -28,6 +29,18 @@ export class ModerationCauseAccumulator {
     }
   }
 
+  addBlockingByList(
+    blockingByList: AppBskyGraphDefs.ListViewBasic | undefined,
+  ) {
+    if (blockingByList) {
+      this.causes.push({
+        type: 'blocking',
+        source: { type: 'list', list: blockingByList },
+        priority: 3,
+      })
+    }
+  }
+
   addBlockedBy(blockedBy: boolean | undefined) {
     if (blockedBy) {
       this.causes.push({

package/src/moderation/subjects/account.ts

@@ -20,7 +20,13 @@ export function decideAccount(
       acc.addMuted(subject.viewer?.muted)
     }
   }
-  acc.addBlocking(subject.viewer?.blocking)
+  if (subject.viewer?.blocking) {
+    if (subject.viewer?.blockingByList) {
+      acc.addBlockingByList(subject.viewer?.blockingByList)
+    } else {
+      acc.addBlocking(subject.viewer?.blocking)
+    }
+  }
   acc.addBlockedBy(subject.viewer?.blockedBy)
 
   for (const label of filterAccountLabels(subject.labels)) {

package/tests/agent.test.ts

@@ -1,29 +1,26 @@
 import { defaultFetchHandler } from '@atproto/xrpc'
-import {
-  CloseFn,
-  runTestServer,
-  TestServerInfo,
-} from '@atproto/pds/tests/_util'
 import {
   AtpAgent,
   AtpAgentFetchHandlerResponse,
   AtpSessionEvent,
   AtpSessionData,
 } from '..'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 
 describe('agent', () => {
-  let server: TestServerInfo
-  let close: CloseFn
+  let network: TestNetworkNoAppView
 
   beforeAll(async () => {
-    server = await runTestServer({
+    network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'api_agent',
+      pds: {
+        enableDidDocWithSession: true,
+      },
     })
-    close = server.close
   })
 
   afterAll(async () => {
-    await close()
+    await network.close()
   })
 
   it('creates a new session on account creation.', async () => {
@@ -34,7 +31,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent = new AtpAgent({ service: server.url, persistSession })
+    const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
     const res = await agent.createAccount({
       handle: 'user1.test',
@@ -74,7 +71,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent1 = new AtpAgent({ service: server.url, persistSession })
+    const agent1 = new AtpAgent({ service: network.pds.url, persistSession })
 
     const email = 'user2@test.com'
     await agent1.createAccount({
@@ -83,7 +80,7 @@ describe('agent', () => {
       password: 'password',
     })
 
-    const agent2 = new AtpAgent({ service: server.url, persistSession })
+    const agent2 = new AtpAgent({ service: network.pds.url, persistSession })
     const res1 = await agent2.login({
       identifier: 'user2.test',
       password: 'password',
@@ -122,7 +119,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent1 = new AtpAgent({ service: server.url, persistSession })
+    const agent1 = new AtpAgent({ service: network.pds.url, persistSession })
 
     await agent1.createAccount({
       handle: 'user3.test',
@@ -133,7 +130,7 @@ describe('agent', () => {
       throw new Error('No session created')
     }
 
-    const agent2 = new AtpAgent({ service: server.url, persistSession })
+    const agent2 = new AtpAgent({ service: network.pds.url, persistSession })
     const res1 = await agent2.resumeSession(agent1.session)
 
     expect(agent2.hasSession).toEqual(true)
@@ -165,7 +162,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent = new AtpAgent({ service: server.url, persistSession })
+    const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
     // create an account and a session with it
     await agent.createAccount({
@@ -230,7 +227,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent = new AtpAgent({ service: server.url, persistSession })
+    const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
     // create an account and a session with it
     await agent.createAccount({
@@ -309,7 +306,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent = new AtpAgent({ service: server.url, persistSession })
+    const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
     try {
       await agent.login({
@@ -349,7 +346,7 @@ describe('agent', () => {
       sessions.push(sess)
     }
 
-    const agent = new AtpAgent({ service: server.url, persistSession })
+    const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
     // create an account and a session with it
     await agent.createAccount({
@@ -420,7 +417,7 @@ describe('agent', () => {
         newHandlerCallCount++
       }
 
-      const agent = new AtpAgent({ service: server.url, persistSession })
+      const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
       await agent.createAccount({
         handle: 'user7.test',
@@ -452,7 +449,7 @@ describe('agent', () => {
         sessions.push(sess)
       }
 
-      const agent = new AtpAgent({ service: server.url, persistSession })
+      const agent = new AtpAgent({ service: network.pds.url, persistSession })
 
       await expect(
         agent.createAccount({

package/tests/bsky-agent.test.ts

@@ -1,23 +1,17 @@
-import {
-  CloseFn,
-  runTestServer,
-  TestServerInfo,
-} from '@atproto/pds/tests/_util'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { BskyAgent, ComAtprotoRepoPutRecord, AppBskyActorProfile } from '..'
 
 describe('agent', () => {
-  let server: TestServerInfo
-  let close: CloseFn
+  let network: TestNetworkNoAppView
 
   beforeAll(async () => {
-    server = await runTestServer({
+    network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'bsky_agent',
     })
-    close = server.close
   })
 
   afterAll(async () => {
-    await close()
+    await network.close()
   })
 
   const getProfileDisplayName = async (
@@ -35,7 +29,7 @@ describe('agent', () => {
   }
 
   it('upsertProfile correctly creates and updates profiles.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user1.test',
@@ -67,7 +61,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile correctly handles CAS failures.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user2.test',
@@ -106,7 +100,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile wont endlessly retry CAS failures.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user3.test',
@@ -135,7 +129,7 @@ describe('agent', () => {
   })
 
   it('upsertProfile validates the record.', async () => {
-    const agent = new BskyAgent({ service: server.url })
+    const agent = new BskyAgent({ service: network.pds.url })
 
     await agent.createAccount({
       handle: 'user4.test',
@@ -153,70 +147,70 @@ describe('agent', () => {
 
   describe('app', () => {
     it('should retrieve the api app', () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       expect(agent.app).toBe(agent.api.app)
     })
   })
 
   describe('post', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.post({ text: 'foo' })).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deletePost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deletePost('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('like', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.like('foo', 'bar')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteLike', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteLike('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('repost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.repost('foo', 'bar')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteRepost', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteRepost('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('follow', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.follow('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('deleteFollow', () => {
     it('should throw if no session', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
       await expect(agent.deleteFollow('foo')).rejects.toThrow('Not logged in')
     })
   })
 
   describe('preferences methods', () => {
     it('gets and sets preferences correctly', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
 
       await agent.createAccount({
         handle: 'user5.test',
@@ -714,7 +708,7 @@ describe('agent', () => {
     })
 
     it('resolves duplicates correctly', async () => {
-      const agent = new BskyAgent({ service: server.url })
+      const agent = new BskyAgent({ service: network.pds.url })
 
       await agent.createAccount({
         handle: 'user6.test',

package/tests/errors.test.ts

@@ -1,25 +1,19 @@
-import {
-  CloseFn,
-  runTestServer,
-  TestServerInfo,
-} from '@atproto/pds/tests/_util'
 import { AtpAgent, ComAtprotoServerCreateAccount } from '..'
+import { TestNetworkNoAppView } from '@atproto/dev-env'
 
 describe('errors', () => {
-  let server: TestServerInfo
+  let network: TestNetworkNoAppView
   let client: AtpAgent
-  let close: CloseFn
 
   beforeAll(async () => {
-    server = await runTestServer({
+    network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'known_errors',
     })
-    client = new AtpAgent({ service: server.url })
-    close = server.close
+    client = network.pds.getClient()
   })
 
   afterAll(async () => {
-    await close()
+    await network.close()
   })
 
   it('constructs the correct error instance', async () => {

package/tests/rich-text-detection.test.ts

@@ -295,10 +295,10 @@ describe('detectFacets', () => {
       const rt = new RichText({ text: input })
       await rt.detectFacets(agent)
 
-      let detectedTags: string[] = []
-      let detectedIndices: { byteStart: number; byteEnd: number }[] = []
+      const detectedTags: string[] = []
+      const detectedIndices: { byteStart: number; byteEnd: number }[] = []
 
-      for (const { facet, ...rest } of rt.segments()) {
+      for (const { facet } of rt.segments()) {
         if (!facet) continue
         for (const feature of facet.features) {
           if (isTag(feature)) {

package/tests/util/index.ts

@@ -135,6 +135,7 @@ export const mock = {
     mutedByList,
     blockedBy,
     blocking,
+    blockingByList,
     following,
     followedBy,
   }: {
@@ -142,6 +143,7 @@ export const mock = {
     mutedByList?: AppBskyGraphDefs.ListViewBasic
     blockedBy?: boolean
     blocking?: string
+    blockingByList?: AppBskyGraphDefs.ListViewBasic
     following?: string
     followedBy?: string
   }): AppBskyActorDefs.ViewerState {
@@ -150,6 +152,7 @@ export const mock = {
       mutedByList,
       blockedBy,
       blocking,
+      blockingByList,
       following,
       followedBy,
     }

package/tests/util/moderation-behavior.ts

@@ -25,6 +25,10 @@ expect.extend({
       if (actual.cause.source.type === 'list') {
         cause = 'muted-by-list'
       }
+    } else if (actual.cause?.type === 'blocking') {
+      if (actual.cause.source.type === 'list') {
+        cause = 'blocking-by-list'
+      }
     }
     if (!expected) {
       if (!ignoreCause && actual.cause) {
@@ -153,8 +157,12 @@ export class ModerationBehaviorSuiteRunner {
           ? m.listViewBasic({ name: 'Fake List' })
           : undefined,
         blockedBy: def.blockedBy,
-        blocking: def.blocking
-          ? 'at://did:web:self.test/app.bsky.graph.block/fake'
+        blocking:
+          def.blocking || def.blockingByList
+            ? 'at://did:web:self.test/app.bsky.graph.block/fake'
+            : undefined,
+        blockingByList: def.blockingByList
+          ? m.listViewBasic({ name: 'Fake List' })
           : undefined,
       }),
     })

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022-2023 Bluesky PBC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.