@atproto/bsky 0.0.11 → 0.0.12

package/tests/views/block-lists.test.ts

@@ -1,9 +1,7 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
-import { RecordRef } from '@atproto/bsky/tests/seeds/client'
 import { BlockedActorError } from '@atproto/api/src/client/types/app/bsky/feed/getAuthorFeed'
 import { BlockedByActorError } from '@atproto/api/src/client/types/app/bsky/feed/getAuthorFeed'
 
@@ -25,7 +23,7 @@ describe('pds views with blocking from block lists', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob
@@ -52,7 +50,7 @@ describe('pds views with blocking from block lists', () => {
   it('creates a list with some items', async () => {
     const avatar = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-portrait-small.jpg',
+      'tests/sample-img/key-portrait-small.jpg',
       'image/jpeg',
     )
     // alice creates block list with bob & carol that dan uses
@@ -60,7 +58,7 @@ describe('pds views with blocking from block lists', () => {
       { repo: alice },
       {
         name: 'alice blocks',
-        purpose: 'app.bsky.graph.defs#blocklist',
+        purpose: 'app.bsky.graph.defs#modlist',
         description: 'big list of blocks',
         avatar: avatar.image,
         createdAt: new Date().toISOString(),
@@ -86,6 +84,15 @@ describe('pds views with blocking from block lists', () => {
       },
       sc.getHeaders(alice),
     )
+    await pdsAgent.api.app.bsky.graph.listitem.create(
+      { repo: alice },
+      {
+        subject: sc.dids.dan,
+        list: list.uri,
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(alice),
+    )
     await network.processAll()
   })
 
@@ -194,6 +201,7 @@ describe('pds views with blocking from block lists', () => {
       { headers: await network.serviceHeaders(carol) },
     )
     expect(resCarol.data.viewer?.blocking).toBeUndefined()
+    expect(resCarol.data.viewer?.blockingByList).toBeUndefined()
     expect(resCarol.data.viewer?.blockedBy).toBe(true)
 
     const resDan = await agent.api.app.bsky.actor.getProfile(
@@ -201,6 +209,9 @@ describe('pds views with blocking from block lists', () => {
       { headers: await network.serviceHeaders(dan) },
     )
     expect(resDan.data.viewer?.blocking).toBeDefined()
+    expect(resDan.data.viewer?.blockingByList?.uri).toEqual(
+      resDan.data.viewer?.blocking,
+    )
     expect(resDan.data.viewer?.blockedBy).toBe(false)
   })
 
@@ -210,8 +221,10 @@ describe('pds views with blocking from block lists', () => {
       { headers: await network.serviceHeaders(carol) },
     )
     expect(resCarol.data.profiles[0].viewer?.blocking).toBeUndefined()
+    expect(resCarol.data.profiles[0].viewer?.blockingByList).toBeUndefined()
     expect(resCarol.data.profiles[0].viewer?.blockedBy).toBe(false)
     expect(resCarol.data.profiles[1].viewer?.blocking).toBeUndefined()
+    expect(resCarol.data.profiles[1].viewer?.blockingByList).toBeUndefined()
     expect(resCarol.data.profiles[1].viewer?.blockedBy).toBe(true)
 
     const resDan = await agent.api.app.bsky.actor.getProfiles(
@@ -219,11 +232,25 @@ describe('pds views with blocking from block lists', () => {
       { headers: await network.serviceHeaders(dan) },
     )
     expect(resDan.data.profiles[0].viewer?.blocking).toBeUndefined()
+    expect(resDan.data.profiles[0].viewer?.blockingByList).toBeUndefined()
     expect(resDan.data.profiles[0].viewer?.blockedBy).toBe(false)
     expect(resDan.data.profiles[1].viewer?.blocking).toBeDefined()
+    expect(resDan.data.profiles[1].viewer?.blockingByList?.uri).toEqual(
+      resDan.data.profiles[1].viewer?.blocking,
+    )
     expect(resDan.data.profiles[1].viewer?.blockedBy).toBe(false)
   })
 
+  it('ignores self-blocks', async () => {
+    const res = await agent.api.app.bsky.actor.getProfile(
+      { actor: dan }, // dan subscribes to list that contains himself
+      { headers: await network.serviceHeaders(dan) },
+    )
+    expect(res.data.viewer?.blocking).toBeUndefined()
+    expect(res.data.viewer?.blockingByList).toBeUndefined()
+    expect(res.data.viewer?.blockedBy).toBe(false)
+  })
+
   it('does not return notifs for blocked accounts', async () => {
     const resCarol = await agent.api.app.bsky.notification.listNotifications(
       {
@@ -337,7 +364,7 @@ describe('pds views with blocking from block lists', () => {
       { repo: alice },
       {
         name: 'new list',
-        purpose: 'app.bsky.graph.defs#blocklist',
+        purpose: 'app.bsky.graph.defs#modlist',
         description: 'blah blah',
         createdAt: new Date().toISOString(),
       },

package/tests/views/blocks.test.ts

@@ -1,4 +1,5 @@
 import assert from 'assert'
+import { TestNetwork, RecordRef, SeedClient } from '@atproto/dev-env'
 import AtpAgent, { AtUri } from '@atproto/api'
 import { BlockedActorError } from '@atproto/api/src/client/types/app/bsky/feed/getAuthorFeed'
 import { BlockedByActorError } from '@atproto/api/src/client/types/app/bsky/feed/getAuthorFeed'
@@ -7,9 +8,7 @@ import {
   isViewRecord as isEmbedViewRecord,
   isViewBlocked as isEmbedViewBlocked,
 } from '@atproto/api/src/client/types/app/bsky/embed/record'
-import { TestNetwork } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
-import { RecordRef, SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 
 describe('pds views with blocking', () => {
@@ -32,7 +31,7 @@ describe('pds views with blocking', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     carol = sc.dids.carol
@@ -226,8 +225,10 @@ describe('pds views with blocking', () => {
       { headers: await network.serviceHeaders(carol) },
     )
     expect(resCarol.data.profiles[0].viewer?.blocking).toBeUndefined()
+    expect(resCarol.data.profiles[0].viewer?.blockingByList).toBeUndefined()
     expect(resCarol.data.profiles[0].viewer?.blockedBy).toBe(false)
     expect(resCarol.data.profiles[1].viewer?.blocking).toBeUndefined()
+    expect(resCarol.data.profiles[1].viewer?.blockingByList).toBeUndefined()
     expect(resCarol.data.profiles[1].viewer?.blockedBy).toBe(true)
 
     const resDan = await agent.api.app.bsky.actor.getProfiles(
@@ -235,8 +236,10 @@ describe('pds views with blocking', () => {
       { headers: await network.serviceHeaders(dan) },
     )
     expect(resDan.data.profiles[0].viewer?.blocking).toBeUndefined()
+    expect(resDan.data.profiles[0].viewer?.blockingByList).toBeUndefined()
     expect(resDan.data.profiles[0].viewer?.blockedBy).toBe(false)
     expect(resDan.data.profiles[1].viewer?.blocking).toBeDefined()
+    expect(resDan.data.profiles[1].viewer?.blockingByList).toBeUndefined()
     expect(resDan.data.profiles[1].viewer?.blockedBy).toBe(false)
   })
 

package/tests/views/follows.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
-import { SeedClient } from '../seeds/client'
 import followsSeed from '../seeds/follows'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 
@@ -18,8 +17,7 @@ describe('pds follow views', () => {
       dbPostgresSchema: 'bsky_views_follows',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await followsSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/views/likes.test.ts

@@ -1,13 +1,11 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import likesSeed from '../seeds/likes'
 import { constantDate, forSnapshot, paginateAll, stripViewer } from '../_util'
 
 describe('pds like views', () => {
   let network: TestNetwork
   let agent: AtpAgent
-  let pdsAgent: AtpAgent
   let sc: SeedClient
 
   // account dids, for convenience
@@ -19,8 +17,7 @@ describe('pds like views', () => {
       dbPostgresSchema: 'bsky_views_likes',
     })
     agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await likesSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/tests/views/list-feed.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewerFromPost } from '../_util'
-import { RecordRef, SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 
@@ -22,8 +21,7 @@ describe('list feed views', () => {
       dbPostgresSchema: 'bsky_views_list_feed',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob

package/tests/views/mute-lists.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent, { AtUri } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import { forSnapshot } from '../_util'
-import { RecordRef, SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 
 describe('bsky views with mutes from mute lists', () => {
@@ -21,7 +20,7 @@ describe('bsky views with mutes from mute lists', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob
@@ -43,7 +42,7 @@ describe('bsky views with mutes from mute lists', () => {
   it('creates a list with some items', async () => {
     const avatar = await sc.uploadFile(
       alice,
-      'tests/image/fixtures/key-portrait-small.jpg',
+      'tests/sample-img/key-portrait-small.jpg',
       'image/jpeg',
     )
     // alice creates mute list with bob & carol that dan uses
@@ -80,6 +79,16 @@ describe('bsky views with mutes from mute lists', () => {
       },
       sc.getHeaders(alice),
     )
+    await pdsAgent.api.app.bsky.graph.listitem.create(
+      { repo: alice },
+      {
+        subject: sc.dids.dan,
+        list: list.uri,
+        reason: 'idk',
+        createdAt: new Date().toISOString(),
+      },
+      sc.getHeaders(alice),
+    )
     await network.processAll()
   })
 
@@ -161,6 +170,15 @@ describe('bsky views with mutes from mute lists', () => {
     expect(res.data.profiles[1].viewer?.mutedByList?.uri).toEqual(listUri)
   })
 
+  it('ignores self-mutes', async () => {
+    const res = await agent.api.app.bsky.actor.getProfile(
+      { actor: dan }, // dan subscribes to list that contains himself
+      { headers: await network.serviceHeaders(dan) },
+    )
+    expect(res.data.viewer?.muted).toBe(false)
+    expect(res.data.viewer?.mutedByList).toBeUndefined()
+  })
+
   it('does not return notifs for muted accounts', async () => {
     const res = await agent.api.app.bsky.notification.listNotifications(
       {
@@ -343,7 +361,7 @@ describe('bsky views with mutes from mute lists', () => {
     expect(got.data.list.name).toBe('updated alice mutes')
     expect(got.data.list.description).toBe('new descript')
     expect(got.data.list.avatar).toBeUndefined()
-    expect(got.data.items.length).toBe(2)
+    expect(got.data.items.length).toBe(3)
   })
 
   it('embeds lists in posts', async () => {

package/tests/views/mutes.test.ts

@@ -1,14 +1,12 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, paginateAll } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import usersBulkSeed from '../seeds/users-bulk'
 
 describe('mute views', () => {
   let network: TestNetwork
   let agent: AtpAgent
-  let pdsAgent: AtpAgent
   let sc: SeedClient
   let alice: string
   let bob: string
@@ -22,8 +20,7 @@ describe('mute views', () => {
       dbPostgresSchema: 'bsky_views_mutes',
     })
     agent = network.bsky.getClient()
-    pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await usersBulkSeed(sc, 10)
     alice = sc.dids.alice

package/tests/views/notifications.test.ts

@@ -1,8 +1,7 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, paginateAll } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { Notification } from '../../src/lexicon/types/app/bsky/notification/listNotifications'
 
@@ -19,8 +18,7 @@ describe('notification views', () => {
       dbPostgresSchema: 'bsky_views_notifications',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/views/posts.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent, { AppBskyFeedPost } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, stripViewerFromPost } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 
 describe('pds posts views', () => {
@@ -16,10 +15,9 @@ describe('pds posts views', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
-    await network.bsky.processAll()
   })
 
   afterAll(async () => {
@@ -99,7 +97,6 @@ describe('pds posts views', () => {
     )
 
     await network.processAll()
-    await network.bsky.processAll()
 
     const { data } = await agent.api.app.bsky.feed.getPosts({ uris: [uri] })
 

package/tests/views/profile.test.ts

@@ -1,10 +1,9 @@
 import fs from 'fs/promises'
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, stripViewer } from '../_util'
 import { ids } from '../../src/lexicon/lexicons'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 
 describe('pds profile views', () => {
@@ -24,7 +23,7 @@ describe('pds profile views', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()
@@ -109,10 +108,10 @@ describe('pds profile views', () => {
 
   it('presents avatars & banners', async () => {
     const avatarImg = await fs.readFile(
-      'tests/image/fixtures/key-portrait-small.jpg',
+      'tests/sample-img/key-portrait-small.jpg',
     )
     const bannerImg = await fs.readFile(
-      'tests/image/fixtures/key-landscape-small.jpg',
+      'tests/sample-img/key-landscape-small.jpg',
     )
     const avatarRes = await pdsAgent.api.com.atproto.repo.uploadBlob(
       avatarImg,

package/tests/views/reposts.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
-import { SeedClient } from '../seeds/client'
 import repostsSeed from '../seeds/reposts'
 
 describe('pds repost views', () => {
@@ -18,8 +17,7 @@ describe('pds repost views', () => {
       dbPostgresSchema: 'bsky_views_reposts',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await repostsSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/tests/views/suggested-follows.test.ts

@@ -1,6 +1,5 @@
 import AtpAgent, { AtUri } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
-import { SeedClient } from '../seeds/client'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import likesSeed from '../seeds/likes'
 
 describe('suggested follows', () => {
@@ -15,7 +14,7 @@ describe('suggested follows', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await likesSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/views/suggestions.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { stripViewer } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 
 describe('pds user search views', () => {
@@ -14,8 +13,7 @@ describe('pds user search views', () => {
       dbPostgresSchema: 'bsky_views_suggestions',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     await network.bsky.processAll()

package/tests/views/thread.test.ts

@@ -1,8 +1,7 @@
 import AtpAgent, { AppBskyFeedGetPostThread } from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, stripViewerFromThread } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import assert from 'assert'
 import { isThreadViewPost } from '@atproto/api/src/client/types/app/bsky/feed/defs'
@@ -22,8 +21,7 @@ describe('pds thread views', () => {
       dbPostgresSchema: 'bsky_views_thread',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     alice = sc.dids.alice
     bob = sc.dids.bob

package/tests/views/threadgating.test.ts

@@ -1,11 +1,10 @@
 import assert from 'assert'
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import {
   isNotFoundPost,
   isThreadViewPost,
 } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { forSnapshot } from '../_util'
 
@@ -21,7 +20,7 @@ describe('views with thread gating', () => {
     })
     agent = network.bsky.getClient()
     pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
   })

package/tests/views/timeline.test.ts

@@ -1,9 +1,8 @@
 import assert from 'assert'
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, getOriginator, paginateAll } from '../_util'
-import { SeedClient } from '../seeds/client'
 import basicSeed from '../seeds/basic'
 import { FeedAlgorithm } from '../../src/api/app/bsky/util/feed'
 import { FeedViewPost } from '../../src/lexicon/types/app/bsky/feed/defs'
@@ -24,8 +23,7 @@ describe('timeline views', () => {
       dbPostgresSchema: 'bsky_views_home_feed',
     })
     agent = network.bsky.getClient()
-    const pdsAgent = network.pds.getClient()
-    sc = new SeedClient(pdsAgent)
+    sc = network.getSeedClient()
     await basicSeed(sc)
     await network.processAll()
     alice = sc.dids.alice

package/dist/env.d.ts

@@ -1 +0,0 @@
-export {};

package/example.dev.env

@@ -1,5 +0,0 @@
-DB_POSTGRES_URL="postgres://bsky:yksb@localhost/bsky_dev"
-DEBUG_MODE=1
-LOG_ENABLED="true"
-LOG_LEVEL=debug
-LOG_DESTINATION=1

package/src/env.ts

@@ -1,9 +0,0 @@
-// NOTE: this file should be imported first, particularly before `@atproto/common` (for logging), to ensure that environment variables are respected in library code
-import dotenv from 'dotenv'
-
-const env = process.env.ENV
-if (env) {
-  dotenv.config({ path: `./.${env}.env` })
-} else {
-  dotenv.config()
-}