@atproto/bsky 0.0.18 → 0.0.20

package/dist/lexicon/lexicons.d.ts

@@ -6880,6 +6880,10 @@ export declare const schemaDict: {
                                     ref: string;
                                 };
                             };
+                            seenAt: {
+                                type: string;
+                                format: string;
+                            };
                         };
                     };
                 };

package/dist/lexicon/types/app/bsky/feed/getAuthorFeed.d.ts

@@ -5,7 +5,7 @@ export interface QueryParams {
     actor: string;
     limit: number;
     cursor?: string;
-    filter: 'posts_with_replies' | 'posts_no_replies' | 'posts_with_media' | (string & {});
+    filter: 'posts_with_replies' | 'posts_no_replies' | 'posts_with_media' | 'posts_and_author_threads' | (string & {});
 }
 export declare type InputSchema = undefined;
 export interface OutputSchema {

package/dist/lexicon/types/app/bsky/notification/listNotifications.d.ts

@@ -12,6 +12,7 @@ export declare type InputSchema = undefined;
 export interface OutputSchema {
     cursor?: string;
     notifications: Notification[];
+    seenAt?: string;
     [k: string]: unknown;
 }
 export declare type HandlerInput = undefined;

package/dist/services/moderation/index.d.ts

@@ -89,6 +89,7 @@ export declare class ModerationService {
         legacyRefId: number | null;
     } | null | undefined>;
     getSubjectsDueForReversal(): Promise<ModerationSubjectStatusRow[]>;
+    isSubjectSuspended(did: string): Promise<boolean>;
     revertState({ createdBy, createdAt, comment, action, subject, }: ReversibleModerationEvent): Promise<{
         result: ModerationEventRow;
         restored?: TakedownSubjects;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -35,13 +35,13 @@
     "sharp": "^0.32.6",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.7.1",
+    "@atproto/api": "^0.7.3",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/syntax": "^0.1.5",
+    "@atproto/identity": "^0.3.2",
     "@atproto/lexicon": "^0.3.1",
     "@atproto/repo": "^0.3.6",
-    "@atproto/identity": "^0.3.2",
     "@atproto/xrpc-server": "^0.4.2"
   },
   "devDependencies": {
@@ -52,10 +52,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.7.1",
-    "@atproto/dev-env": "^0.2.18",
+    "@atproto/api": "^0.7.3",
+    "@atproto/dev-env": "^0.2.20",
     "@atproto/lex-cli": "^0.2.5",
-    "@atproto/pds": "^0.3.6",
+    "@atproto/pds": "^0.3.8",
     "@atproto/xrpc": "^0.4.1"
   },
   "scripts": {

package/src/api/app/bsky/actor/getProfile.ts

@@ -11,6 +11,7 @@ import {
 } from '../../../../services/actor'
 import { setRepoRev } from '../../../util'
 import { createPipeline, noRules } from '../../../../pipeline'
+import { ModerationService } from '../../../../services/moderation'
 
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
@@ -19,6 +20,7 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ auth, params, res }) => {
       const db = ctx.db.getReplica()
       const actorService = ctx.services.actor(db)
+      const modService = ctx.services.moderation(ctx.db.getPrimary())
       const viewer = 'did' in auth.credentials ? auth.credentials.did : null
       const canViewTakendownProfile =
         auth.credentials.type === 'role' && auth.credentials.triage
@@ -26,7 +28,7 @@ export default function (server: Server, ctx: AppContext) {
       const [result, repoRev] = await Promise.allSettled([
         getProfile(
           { ...params, viewer, canViewTakendownProfile },
-          { db, actorService },
+          { db, actorService, modService },
         ),
         actorService.getRepoRev(viewer),
       ])
@@ -50,17 +52,25 @@ const skeleton = async (
   params: Params,
   ctx: Context,
 ): Promise<SkeletonState> => {
-  const { actorService } = ctx
+  const { actorService, modService } = ctx
   const { canViewTakendownProfile } = params
   const actor = await actorService.getActor(params.actor, true)
   if (!actor) {
     throw new InvalidRequestError('Profile not found')
   }
   if (!canViewTakendownProfile && softDeleted(actor)) {
-    throw new InvalidRequestError(
-      'Account has been taken down',
-      'AccountTakedown',
-    )
+    const isSuspended = await modService.isSubjectSuspended(actor.did)
+    if (isSuspended) {
+      throw new InvalidRequestError(
+        'Account has been temporarily suspended',
+        'AccountTakedown',
+      )
+    } else {
+      throw new InvalidRequestError(
+        'Account has been taken down',
+        'AccountTakedown',
+      )
+    }
   }
   return { params, actor }
 }
@@ -95,6 +105,7 @@ const presentation = (state: HydrationState, ctx: Context) => {
 type Context = {
   db: Database
   actorService: ActorService
+  modService: ModerationService
 }
 
 type Params = QueryParams & {

package/src/api/app/bsky/feed/getAuthorFeed.ts

@@ -102,6 +102,13 @@ export const skeleton = async (
     feedItemsQb = feedItemsQb.where((qb) =>
       qb.where('post.replyParent', 'is', null).orWhere('type', '=', 'repost'),
     )
+  } else if (filter === 'posts_and_author_threads') {
+    feedItemsQb = feedItemsQb.where((qb) =>
+      qb
+        .where('type', '=', 'repost')
+        .orWhere('post.replyParent', 'is', null)
+        .orWhere('post.replyRoot', 'like', `at://${actorDid}/%`),
+    )
   }
 
   const keyset = new FeedKeyset(ref('feed_item.sortAt'), ref('feed_item.cid'))

package/src/api/app/bsky/notification/listNotifications.ts

@@ -148,7 +148,7 @@ const presentation = (state: HydrationState) => {
       labels: [...recordLabels, ...recordSelfLabels],
     }
   })
-  return { notifications, cursor }
+  return { notifications, cursor, seenAt: lastSeenNotifs }
 }
 
 const getRecordMap = async (

package/src/lexicon/lexicons.ts

@@ -5572,6 +5572,7 @@ export const schemaDict = {
                 'posts_with_replies',
                 'posts_no_replies',
                 'posts_with_media',
+                'posts_and_author_threads',
               ],
               default: 'posts_with_replies',
             },
@@ -7324,6 +7325,10 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.notification.listNotifications#notification',
                 },
               },
+              seenAt: {
+                type: 'string',
+                format: 'datetime',
+              },
             },
           },
         },

package/src/lexicon/types/app/bsky/feed/getAuthorFeed.ts

@@ -17,6 +17,7 @@ export interface QueryParams {
     | 'posts_with_replies'
     | 'posts_no_replies'
     | 'posts_with_media'
+    | 'posts_and_author_threads'
     | (string & {})
 }
 

package/src/lexicon/types/app/bsky/notification/listNotifications.ts

@@ -21,6 +21,7 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   notifications: Notification[]
+  seenAt?: string
   [k: string]: unknown
 }
 

package/src/services/moderation/index.ts

@@ -323,6 +323,18 @@ export class ModerationService {
     return subjectsDueForReversal
   }
 
+  async isSubjectSuspended(did: string): Promise<boolean> {
+    const res = await this.db.db
+      .selectFrom('moderation_subject_status')
+      .where('did', '=', did)
+      .where('recordPath', '=', '')
+      .where('suspendUntil', '>', new Date().toISOString())
+      .select('did')
+      .limit(1)
+      .executeTakeFirst()
+    return !!res
+  }
+
   async revertState({
     createdBy,
     createdAt,

package/tests/seeds/author-feed.ts

@@ -0,0 +1,95 @@
+import { SeedClient } from '@atproto/dev-env'
+import basicSeed from './basic'
+
+export default async (sc: SeedClient) => {
+  await basicSeed(sc)
+  await sc.createAccount('eve', {
+    email: 'eve@test.com',
+    handle: 'eve.test',
+    password: 'eve-pass',
+  })
+  await sc.createAccount('fred', {
+    email: 'fred@test.com',
+    handle: 'fred.test',
+    password: 'fred-pass',
+  })
+
+  const alice = sc.dids.alice
+  const eve = sc.dids.eve
+  const fred = sc.dids.fred
+
+  /*
+   * Self thread
+   */
+  await sc.post(eve, evePosts[0])
+  await sc.reply(
+    eve,
+    sc.posts[eve][0].ref,
+    sc.posts[eve][0].ref,
+    eveOwnThreadReplies[0],
+  )
+  await sc.reply(
+    eve,
+    sc.posts[eve][0].ref,
+    sc.replies[eve][0].ref,
+    eveOwnThreadReplies[1],
+  )
+  await sc.reply(
+    eve,
+    sc.posts[eve][0].ref,
+    sc.replies[eve][1].ref,
+    eveOwnThreadReplies[2],
+  )
+
+  /**
+   * Two replies to Alice
+   */
+  await sc.reply(
+    eve,
+    sc.posts[alice][1].ref,
+    sc.posts[alice][1].ref,
+    eveAliceReplies[0],
+  )
+  await sc.reply(
+    eve,
+    sc.posts[alice][1].ref,
+    sc.replies[eve][3].ref,
+    eveAliceReplies[1],
+  )
+
+  /**
+   * Two replies to Fred, who replied to Eve's root post. This creates a
+   * "detached" thread, where one Fred post breaks the continuity.
+   */
+  await sc.post(eve, evePosts[1])
+  await sc.reply(
+    fred,
+    sc.posts[eve][1].ref,
+    sc.posts[eve][1].ref,
+    fredReplies[0],
+  )
+  await sc.reply(
+    eve,
+    sc.posts[eve][1].ref,
+    sc.replies[fred][0].ref,
+    eveFredReplies[0],
+  )
+  await sc.reply(
+    eve,
+    sc.posts[eve][1].ref,
+    sc.replies[eve][4].ref,
+    eveFredReplies[1],
+  )
+
+  return sc
+}
+
+const evePosts = ['eve own thread', 'eve detached thread']
+const eveOwnThreadReplies = [
+  'eve own reply 1',
+  'eve own reply 2',
+  'eve own reply 3',
+]
+const eveAliceReplies = ['eve reply to alice 1', 'eve reply to alice 2']
+const eveFredReplies = ['eve reply to fred 1', 'eve reply to fred 2']
+const fredReplies = ['fred reply to eve 1']

package/tests/views/__snapshots__/author-feed.test.ts.snap

@@ -178,7 +178,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(2)",
         "viewer": Object {},
@@ -395,7 +395,7 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000000Z",
         "text": "again",
       },
-      "replyCount": 2,
+      "replyCount": 3,
       "repostCount": 1,
       "uri": "record(2)",
       "viewer": Object {},
@@ -590,7 +590,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(1)",
         "viewer": Object {
@@ -638,7 +638,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(1)",
         "viewer": Object {
@@ -961,7 +961,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(6)",
         "viewer": Object {
@@ -1009,7 +1009,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(6)",
         "viewer": Object {
@@ -1326,7 +1326,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(3)",
         "viewer": Object {
@@ -1376,7 +1376,7 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000000Z",
         "text": "again",
       },
-      "replyCount": 2,
+      "replyCount": 3,
       "repostCount": 1,
       "uri": "record(3)",
       "viewer": Object {
@@ -1765,7 +1765,7 @@ Array [
           "createdAt": "1970-01-01T00:00:00.000000Z",
           "text": "again",
         },
-        "replyCount": 2,
+        "replyCount": 3,
         "repostCount": 1,
         "uri": "record(4)",
         "viewer": Object {
@@ -1987,7 +1987,7 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000000Z",
         "text": "again",
       },
-      "replyCount": 2,
+      "replyCount": 3,
       "repostCount": 1,
       "uri": "record(4)",
       "viewer": Object {

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

@@ -1,7 +1,7 @@
 import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { forSnapshot, paginateAll, stripViewerFromPost } from '../_util'
-import basicSeed from '../seeds/basic'
+import authorFeedSeed from '../seeds/author-feed'
 import { isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
 import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
 import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
@@ -16,6 +16,7 @@ describe('pds author feed views', () => {
   let bob: string
   let carol: string
   let dan: string
+  let eve: string
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -23,12 +24,13 @@ describe('pds author feed views', () => {
     })
     agent = network.bsky.getClient()
     sc = network.getSeedClient()
-    await basicSeed(sc)
+    await authorFeedSeed(sc)
     await network.processAll()
     alice = sc.dids.alice
     bob = sc.dids.bob
     carol = sc.dids.carol
     dan = sc.dids.dan
+    eve = sc.dids.eve
   })
 
   afterAll(async () => {
@@ -305,4 +307,20 @@ describe('pds author feed views', () => {
       }),
     ).toBeTruthy()
   })
+
+  it('posts_and_author_threads includes self-replies', async () => {
+    const { data: eveFeed } = await agent.api.app.bsky.feed.getAuthorFeed({
+      actor: eve,
+      filter: 'posts_and_author_threads',
+    })
+
+    expect(eveFeed.feed.length).toEqual(7)
+    expect(
+      eveFeed.feed.some(({ post }) => {
+        return (
+          isRecord(post.record) && post.record.reply && post.author.did === eve
+        )
+      }),
+    ).toBeTruthy()
+  })
 })

package/tests/views/notifications.test.ts

@@ -176,6 +176,13 @@ describe('notification views', () => {
         encoding: 'application/json',
       },
     )
+    const full2 = await agent.api.app.bsky.notification.listNotifications(
+      {},
+      { headers: await network.serviceHeaders(alice) },
+    )
+    expect(full2.data.notifications.length).toBe(full.data.notifications.length)
+    expect(full2.data.seenAt).toEqual(seenAt)
+
     const notifCount = await agent.api.app.bsky.notification.getUnreadCount(
       {},
       { headers: await network.serviceHeaders(alice) },

package/tests/views/profile.test.ts

@@ -224,6 +224,52 @@ describe('pds profile views', () => {
     )
   })
 
+  it('blocked by actor suspension', async () => {
+    await agent.api.com.atproto.admin.emitModerationEvent(
+      {
+        event: {
+          $type: 'com.atproto.admin.defs#modEventTakedown',
+          durationInHours: 1,
+        },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: alice,
+        },
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
+    const promise = agent.api.app.bsky.actor.getProfile(
+      { actor: alice },
+      { headers: await network.serviceHeaders(bob) },
+    )
+
+    await expect(promise).rejects.toThrow(
+      'Account has been temporarily suspended',
+    )
+
+    // Cleanup
+    await agent.api.com.atproto.admin.emitModerationEvent(
+      {
+        event: { $type: 'com.atproto.admin.defs#modEventReverseTakedown' },
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: alice,
+        },
+        createdBy: 'did:example:admin',
+        reason: 'Y',
+      },
+      {
+        encoding: 'application/json',
+        headers: network.pds.adminAuthHeaders(),
+      },
+    )
+  })
+
   async function updateProfile(did: string, record: Record<string, unknown>) {
     return await pdsAgent.api.com.atproto.repo.putRecord(
       {