@atproto/bsky 0.0.16 → 0.0.17

package/tests/views/thread.test.ts

@@ -165,22 +165,21 @@ describe('pds thread views', () => {
 
   describe('takedown', () => {
     it('blocks post by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: alice,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: alice,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as shallow post thread test, minus alice
       const promise = agent.api.app.bsky.feed.getPostThread(
@@ -211,22 +210,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks replies by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: carol,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: carol,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as deep post thread test, minus carol
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -255,22 +253,21 @@ describe('pds thread views', () => {
     })
 
     it('blocks ancestors by actor', async () => {
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.admin.defs#repoRef',
-              did: bob,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: bob,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus bob
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -300,23 +297,22 @@ describe('pds thread views', () => {
 
     it('blocks post by record', async () => {
       const postRef = sc.posts[alice][1].ref
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: postRef.uriStr,
-              cid: postRef.cidStr,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: postRef.uriStr,
+            cid: postRef.cidStr,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       const promise = agent.api.app.bsky.feed.getPostThread(
         { depth: 1, uri: postRef.uriStr },
@@ -354,23 +350,22 @@ describe('pds thread views', () => {
 
       const parent = threadPreTakedown.data.thread.parent?.['post']
 
-      const { data: modAction } =
-        await agent.api.com.atproto.admin.emitModerationEvent(
-          {
-            event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
-            subject: {
-              $type: 'com.atproto.repo.strongRef',
-              uri: parent.uri,
-              cid: parent.cid,
-            },
-            createdBy: 'did:example:admin',
-            reason: 'Y',
-          },
-          {
-            encoding: 'application/json',
-            headers: network.pds.adminAuthHeaders(),
+      await agent.api.com.atproto.admin.emitModerationEvent(
+        {
+          event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+          subject: {
+            $type: 'com.atproto.repo.strongRef',
+            uri: parent.uri,
+            cid: parent.cid,
           },
-        )
+          createdBy: 'did:example:admin',
+          reason: 'Y',
+        },
+        {
+          encoding: 'application/json',
+          headers: network.pds.adminAuthHeaders(),
+        },
+      )
 
       // Same as ancestor post thread test, minus parent post
       const thread = await agent.api.app.bsky.feed.getPostThread(
@@ -407,7 +402,7 @@ describe('pds thread views', () => {
       const post1 = threadPreTakedown.data.thread.replies?.[0].post
       const post2 = threadPreTakedown.data.thread.replies?.[1].replies[0].post
 
-      const actionResults = await Promise.all(
+      await Promise.all(
         [post1, post2].map((post) =>
           agent.api.com.atproto.admin.emitModerationEvent(
             {

package/tests/views/threadgating.test.ts

@@ -49,6 +49,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(sc.dids.alice, post.ref, post.ref, 'empty rules reply')
     await network.processAll()
     const {
@@ -64,6 +65,33 @@ describe('views with thread gating', () => {
     await checkReplyDisabled(post.ref.uriStr, sc.dids.alice, true)
   })
 
+  it('does not generate notifications when post violates threadgate.', async () => {
+    const post = await sc.post(sc.dids.carol, 'notifications')
+    await pdsAgent.api.app.bsky.feed.threadgate.create(
+      { repo: sc.dids.carol, rkey: post.ref.uri.rkey },
+      { post: post.ref.uriStr, createdAt: iso(), allow: [] },
+      sc.getHeaders(sc.dids.carol),
+    )
+    await network.processAll()
+    const reply = await sc.reply(
+      sc.dids.alice,
+      post.ref,
+      post.ref,
+      'notifications reply',
+    )
+    await network.processAll()
+    const {
+      data: { notifications },
+    } = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(sc.dids.carol) },
+    )
+    const notificationFromReply = notifications.find(
+      (notif) => notif.uri === reply.ref.uriStr,
+    )
+    expect(notificationFromReply).toBeUndefined()
+  })
+
   it('applies gate for mention rule.', async () => {
     const post = await sc.post(
       sc.dids.carol,
@@ -92,6 +120,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -141,6 +170,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     await sc.reply(
       sc.dids.dan,
@@ -231,6 +261,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     //
     await sc.reply(sc.dids.bob, post.ref, post.ref, 'list rule reply disallow')
     const aliceReply = await sc.reply(
@@ -298,6 +329,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -339,6 +371,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice, and the post mentions dan.
     await sc.reply(sc.dids.bob, post.ref, post.ref, 'multi rule reply disallow')
     const aliceReply = await sc.reply(
@@ -397,6 +430,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso() },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     const aliceReply = await sc.reply(
       sc.dids.alice,
       post.ref,
@@ -432,6 +466,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     const orphanedReply = await sc.reply(
       sc.dids.alice,
@@ -493,6 +528,7 @@ describe('views with thread gating', () => {
       { post: post.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     const selfReply = await sc.reply(
       sc.dids.carol,
       post.ref,
@@ -527,6 +563,7 @@ describe('views with thread gating', () => {
       },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     // carol only follows alice
     const badReply = await sc.reply(
       sc.dids.dan,
@@ -571,6 +608,7 @@ describe('views with thread gating', () => {
       { post: postB.ref.uriStr, createdAt: iso(), allow: [] },
       sc.getHeaders(sc.dids.carol),
     )
+    await network.processAll()
     await sc.reply(sc.dids.alice, postA.ref, postA.ref, 'ungated reply')
     await sc.reply(sc.dids.alice, postB.ref, postB.ref, 'ungated reply')
     await network.processAll()

package/dist/db/tables/did-cache.d.ts

@@ -1,10 +0,0 @@
-import { DidDocument } from '@atproto/identity';
-export interface DidCache {
-    did: string;
-    doc: DidDocument;
-    updatedAt: number;
-}
-export declare const tableName = "did_cache";
-export declare type PartialDB = {
-    [tableName]: DidCache;
-};

package/dist/feed-gen/best-of-follows.d.ts

@@ -1,29 +0,0 @@
-import { AlgoHandler } from './types';
-import { GenericKeyset } from '../db/pagination';
-declare const handler: AlgoHandler;
-export default handler;
-declare type Result = {
-    score: number;
-    cid: string;
-};
-declare type LabeledResult = {
-    primary: number;
-    secondary: string;
-};
-export declare class ScoreKeyset extends GenericKeyset<Result, LabeledResult> {
-    labelResult(result: Result): {
-        primary: number;
-        secondary: string;
-    };
-    labeledResultToCursor(labeled: LabeledResult): {
-        primary: string;
-        secondary: string;
-    };
-    cursorToLabeledResult(cursor: {
-        primary: string;
-        secondary: string;
-    }): {
-        primary: number;
-        secondary: string;
-    };
-}

package/dist/feed-gen/whats-hot.d.ts

@@ -1,29 +0,0 @@
-import { AlgoHandler } from './types';
-import { GenericKeyset } from '../db/pagination';
-declare const handler: AlgoHandler;
-export default handler;
-declare type Result = {
-    score: number;
-    cid: string;
-};
-declare type LabeledResult = {
-    primary: number;
-    secondary: string;
-};
-export declare class ScoreKeyset extends GenericKeyset<Result, LabeledResult> {
-    labelResult(result: Result): {
-        primary: number;
-        secondary: string;
-    };
-    labeledResultToCursor(labeled: LabeledResult): {
-        primary: string;
-        secondary: string;
-    };
-    cursorToLabeledResult(cursor: {
-        primary: string;
-        secondary: string;
-    }): {
-        primary: number;
-        secondary: string;
-    };
-}

package/dist/feed-gen/with-friends.d.ts

@@ -1,3 +0,0 @@
-import { AlgoHandler } from './types';
-declare const handler: AlgoHandler;
-export default handler;

package/dist/label-cache.d.ts

@@ -1,19 +0,0 @@
-import { PrimaryDatabase } from './db';
-import { Label } from './db/tables/label';
-export declare class LabelCache {
-    db: PrimaryDatabase;
-    bySubject: Record<string, Label[]>;
-    latestLabel: string;
-    refreshes: number;
-    destroyed: boolean;
-    constructor(db: PrimaryDatabase);
-    start(): void;
-    fullRefresh(): Promise<void>;
-    partialRefresh(): Promise<void>;
-    poll(): Promise<void>;
-    processLabels(labels: Label[]): void;
-    wipeCache(): void;
-    stop(): void;
-    forSubject(subject: string, includeNeg?: boolean): Label[];
-    forSubjects(subjects: string[], includeNeg?: boolean): Label[];
-}

package/src/db/tables/did-cache.ts

@@ -1,13 +0,0 @@
-import { DidDocument } from '@atproto/identity'
-
-export interface DidCache {
-  did: string
-  doc: DidDocument
-  updatedAt: number
-}
-
-export const tableName = 'did_cache'
-
-export type PartialDB = {
-  [tableName]: DidCache
-}

package/src/feed-gen/best-of-follows.ts

@@ -1,77 +0,0 @@
-import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { QueryParams as SkeletonParams } from '../lexicon/types/app/bsky/feed/getFeedSkeleton'
-import { AlgoHandler, AlgoResponse } from './types'
-import { GenericKeyset, paginate } from '../db/pagination'
-import AppContext from '../context'
-
-const handler: AlgoHandler = async (
-  ctx: AppContext,
-  params: SkeletonParams,
-  viewer: string | null,
-): Promise<AlgoResponse> => {
-  if (!viewer) {
-    throw new AuthRequiredError('This feed requires being logged-in')
-  }
-
-  const { limit, cursor } = params
-  const db = ctx.db.getReplica('feed')
-  const feedService = ctx.services.feed(db)
-  const { ref } = db.db.dynamic
-
-  // candidates are ranked within a materialized view by like count, depreciated over time.
-
-  let builder = feedService
-    .selectPostQb()
-    .innerJoin('algo_whats_hot_view as candidate', 'candidate.uri', 'post.uri')
-    .where((qb) =>
-      qb
-        .where('post.creator', '=', viewer)
-        .orWhereExists((inner) =>
-          inner
-            .selectFrom('follow')
-            .where('follow.creator', '=', viewer)
-            .whereRef('follow.subjectDid', '=', 'post.creator'),
-        ),
-    )
-    .select('candidate.score')
-    .select('candidate.cid')
-
-  const keyset = new ScoreKeyset(ref('candidate.score'), ref('candidate.cid'))
-  builder = paginate(builder, { limit, cursor, keyset })
-
-  const feedItems = await builder.execute()
-
-  return {
-    feedItems,
-    cursor: keyset.packFromResult(feedItems),
-  }
-}
-
-export default handler
-
-type Result = { score: number; cid: string }
-type LabeledResult = { primary: number; secondary: string }
-export class ScoreKeyset extends GenericKeyset<Result, LabeledResult> {
-  labelResult(result: Result) {
-    return {
-      primary: result.score,
-      secondary: result.cid,
-    }
-  }
-  labeledResultToCursor(labeled: LabeledResult) {
-    return {
-      primary: Math.round(labeled.primary).toString(),
-      secondary: labeled.secondary,
-    }
-  }
-  cursorToLabeledResult(cursor: { primary: string; secondary: string }) {
-    const score = parseInt(cursor.primary, 10)
-    if (isNaN(score)) {
-      throw new InvalidRequestError('Malformed cursor')
-    }
-    return {
-      primary: score,
-      secondary: cursor.secondary,
-    }
-  }
-}

package/src/feed-gen/whats-hot.ts

@@ -1,101 +0,0 @@
-import { NotEmptyArray } from '@atproto/common'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { QueryParams as SkeletonParams } from '../lexicon/types/app/bsky/feed/getFeedSkeleton'
-import { AlgoHandler, AlgoResponse } from './types'
-import { GenericKeyset, paginate } from '../db/pagination'
-import AppContext from '../context'
-import { valuesList } from '../db/util'
-import { sql } from 'kysely'
-import { FeedItemType } from '../services/feed/types'
-
-const NO_WHATS_HOT_LABELS: NotEmptyArray<string> = [
-  '!no-promote',
-  'corpse',
-  'self-harm',
-  'porn',
-  'sexual',
-  'nudity',
-  'underwear',
-]
-
-const handler: AlgoHandler = async (
-  ctx: AppContext,
-  params: SkeletonParams,
-  _viewer: string | null,
-): Promise<AlgoResponse> => {
-  const { limit, cursor } = params
-  const db = ctx.db.getReplica('feed')
-
-  const { ref } = db.db.dynamic
-
-  // candidates are ranked within a materialized view by like count, depreciated over time.
-
-  let builder = db.db
-    .selectFrom('algo_whats_hot_view as candidate')
-    .innerJoin('post', 'post.uri', 'candidate.uri')
-    .leftJoin('post_embed_record', 'post_embed_record.postUri', 'candidate.uri')
-    .whereNotExists((qb) =>
-      qb
-        .selectFrom('label')
-        .selectAll()
-        .whereRef('val', 'in', valuesList(NO_WHATS_HOT_LABELS))
-        .where('neg', '=', false)
-        .where((clause) =>
-          clause
-            .whereRef('label.uri', '=', ref('post.creator'))
-            .orWhereRef('label.uri', '=', ref('post.uri'))
-            .orWhereRef('label.uri', '=', ref('post_embed_record.embedUri')),
-        ),
-    )
-    .select([
-      sql<FeedItemType>`${'post'}`.as('type'),
-      'post.uri as uri',
-      'post.uri as postUri',
-      'post.creator as originatorDid',
-      'post.creator as postAuthorDid',
-      'post.replyParent as replyParent',
-      'post.replyRoot as replyRoot',
-      'post.indexedAt as sortAt',
-      'candidate.score',
-      'candidate.cid',
-    ])
-
-  const keyset = new ScoreKeyset(ref('candidate.score'), ref('candidate.cid'))
-  builder = paginate(builder, { limit, cursor, keyset })
-
-  const feedItems = await builder.execute()
-
-  return {
-    feedItems,
-    cursor: keyset.packFromResult(feedItems),
-  }
-}
-
-export default handler
-
-type Result = { score: number; cid: string }
-type LabeledResult = { primary: number; secondary: string }
-export class ScoreKeyset extends GenericKeyset<Result, LabeledResult> {
-  labelResult(result: Result) {
-    return {
-      primary: result.score,
-      secondary: result.cid,
-    }
-  }
-  labeledResultToCursor(labeled: LabeledResult) {
-    return {
-      primary: Math.round(labeled.primary).toString(),
-      secondary: labeled.secondary,
-    }
-  }
-  cursorToLabeledResult(cursor: { primary: string; secondary: string }) {
-    const score = parseInt(cursor.primary, 10)
-    if (isNaN(score)) {
-      throw new InvalidRequestError('Malformed cursor')
-    }
-    return {
-      primary: score,
-      secondary: cursor.secondary,
-    }
-  }
-}

package/src/feed-gen/with-friends.ts

@@ -1,43 +0,0 @@
-import AppContext from '../context'
-import { QueryParams as SkeletonParams } from '../lexicon/types/app/bsky/feed/getFeedSkeleton'
-import { paginate } from '../db/pagination'
-import { AlgoHandler, AlgoResponse } from './types'
-import { FeedKeyset, getFeedDateThreshold } from '../api/app/bsky/util/feed'
-import { AuthRequiredError } from '@atproto/xrpc-server'
-
-const handler: AlgoHandler = async (
-  ctx: AppContext,
-  params: SkeletonParams,
-  viewer: string | null,
-): Promise<AlgoResponse> => {
-  if (!viewer) {
-    throw new AuthRequiredError('This feed requires being logged-in')
-  }
-
-  const { cursor, limit = 50 } = params
-  const db = ctx.db.getReplica('feed')
-  const feedService = ctx.services.feed(db)
-  const { ref } = db.db.dynamic
-
-  const keyset = new FeedKeyset(ref('post.sortAt'), ref('post.cid'))
-  const sortFrom = keyset.unpack(cursor)?.primary
-
-  let postsQb = feedService
-    .selectPostQb()
-    .innerJoin('follow', 'follow.subjectDid', 'post.creator')
-    .innerJoin('post_agg', 'post_agg.uri', 'post.uri')
-    .where('post_agg.likeCount', '>=', 5)
-    .where('follow.creator', '=', viewer)
-    .where('post.sortAt', '>', getFeedDateThreshold(sortFrom))
-
-  postsQb = paginate(postsQb, { limit, cursor, keyset, tryIndex: true })
-
-  const feedItems = await postsQb.execute()
-
-  return {
-    feedItems,
-    cursor: keyset.packFromResult(feedItems),
-  }
-}
-
-export default handler