@atproto/bsky 0.0.19 → 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/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.19",
+  "version": "0.0.20",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -35,7 +35,7 @@
     "sharp": "^0.32.6",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.7.2",
+    "@atproto/api": "^0.7.3",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/syntax": "^0.1.5",
@@ -52,10 +52,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.7.2",
-    "@atproto/dev-env": "^0.2.19",
+    "@atproto/api": "^0.7.3",
+    "@atproto/dev-env": "^0.2.20",
     "@atproto/lex-cli": "^0.2.5",
-    "@atproto/pds": "^0.3.7",
+    "@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/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

@@ -7325,6 +7325,10 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.notification.listNotifications#notification',
                 },
               },
+              seenAt: {
+                type: 'string',
+                format: 'datetime',
+              },
             },
           },
         },

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/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(
       {