@atproto/pds 0.4.1 → 0.4.2

package/tests/proxied/admin.test.ts

@@ -8,7 +8,8 @@ import {
 import { forSnapshot } from '../_util'
 import { NotFoundError } from '@atproto/api/src/client/types/app/bsky/feed/getPostThread'
 
-describe('proxies admin requests', () => {
+// @TODO skipping during appview v2 buildout, as appview frontends no longer contains moderation endpoints
+describe.skip('proxies admin requests', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
@@ -32,7 +33,7 @@ describe('proxies admin requests', () => {
       )
     await basicSeed(sc, {
       inviteCode: invite.code,
-      addModLabels: true,
+      addModLabels: network.bsky,
     })
     await network.processAll()
   })

package/tests/proxied/feedgen.test.ts

@@ -8,7 +8,6 @@ describe('feedgen proxy view', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
-
   let feedUri: AtUri
 
   beforeAll(async () => {
@@ -17,7 +16,7 @@ describe('feedgen proxy view', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
 
     feedUri = AtUri.make(sc.dids.alice, 'app.bsky.feed.generator', 'mutuals')
 

package/tests/proxied/procedures.test.ts

@@ -17,7 +17,7 @@ describe('proxies appview procedures', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
@@ -142,7 +142,11 @@ describe('proxies appview procedures', () => {
         { headers: sc.getHeaders(alice) },
       )
     expect(result1.notifications.length).toBeGreaterThanOrEqual(5)
-    expect(result1.notifications.every((n) => !n.isRead)).toBe(true)
+    expect(
+      result1.notifications.every((n, i) => {
+        return (i === 0 && !n.isRead) || (i !== 0 && n.isRead)
+      }),
+    ).toBe(true)
     // update last seen
     const { indexedAt: lastSeenAt } = result1.notifications[2]
     await agent.api.app.bsky.notification.updateSeen(
@@ -163,7 +167,7 @@ describe('proxies appview procedures', () => {
     expect(result2.notifications).toEqual(
       result1.notifications.map((n) => ({
         ...n,
-        isRead: n.indexedAt <= lastSeenAt,
+        isRead: n.indexedAt < lastSeenAt,
       })),
     )
   })

package/tests/proxied/read-after-write.test.ts

@@ -22,7 +22,7 @@ describe('proxy read after write', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     await network.processAll()
     alice = sc.dids.alice
     carol = sc.dids.carol

package/tests/proxied/views.test.ts

@@ -19,7 +19,7 @@ describe('proxies view requests', () => {
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc, { addModLabels: true })
+    await basicSeed(sc, { addModLabels: network.bsky })
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
@@ -79,9 +79,8 @@ describe('proxies view requests', () => {
       { did: sc.dids.carol, order: 2 },
       { did: sc.dids.dan, order: 3 },
     ]
-    await network.bsky.ctx.db
-      .getPrimary()
-      .db.insertInto('suggested_follow')
+    await network.bsky.db.db
+      .insertInto('suggested_follow')
       .values(suggestions)
       .execute()
 
@@ -334,7 +333,8 @@ describe('proxies view requests', () => {
     expect([...pt1.data.feed, ...pt2.data.feed]).toEqual(res.data.feed)
   })
 
-  it('unspecced.getPopularFeedGenerators', async () => {
+  // @TODO disabled during appview v2 buildout
+  it.skip('unspecced.getPopularFeedGenerators', async () => {
     const res = await agent.api.app.bsky.unspecced.getPopularFeedGenerators(
       {},
       {

package/tests/seeds/basic.ts

@@ -1,10 +1,10 @@
-import { SeedClient } from '@atproto/dev-env'
+import { SeedClient, TestBsky } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 import usersSeed from './users'
 
 export default async (
   sc: SeedClient,
-  opts?: { inviteCode?: string; addModLabels?: boolean },
+  opts?: { inviteCode?: string; addModLabels?: TestBsky },
 ) => {
   await usersSeed(sc, opts)
 
@@ -134,24 +134,7 @@ export default async (
   await sc.repost(dan, alicesReplyToBob.ref)
 
   if (opts?.addModLabels) {
-    await sc.agent.com.atproto.admin.emitModerationEvent(
-      {
-        event: {
-          createLabelVals: ['repo-action-label'],
-          negateLabelVals: [],
-          $type: 'com.atproto.admin.defs#modEventLabel',
-        },
-        subject: {
-          $type: 'com.atproto.admin.defs#repoRef',
-          did: dan,
-        },
-        createdBy: 'did:example:admin',
-      },
-      {
-        encoding: 'application/json',
-        headers: sc.adminAuthHeaders(),
-      },
-    )
+    await createLabel(opts.addModLabels, { did: dan, val: 'repo-action-label' })
   }
 
   return sc
@@ -169,3 +152,20 @@ export const replies = {
   bob: ['hear that label_me label_me_2'],
   carol: ['of course'],
 }
+
+const createLabel = async (
+  bsky: TestBsky,
+  opts: { did: string; val: string },
+) => {
+  await bsky.db.db
+    .insertInto('label')
+    .values({
+      uri: opts.did,
+      cid: '',
+      val: opts.val,
+      cts: new Date().toISOString(),
+      neg: false,
+      src: 'did:example:labeler',
+    })
+    .execute()
+}