@atproto/ozone 0.1.108 → 0.1.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.108",
+  "version": "0.1.109",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -35,14 +35,14 @@
     "uint8arrays": "3.0.0",
     "undici": "^6.14.1",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.15.5",
-    "@atproto/common": "^0.4.10",
+    "@atproto/api": "^0.15.6",
+    "@atproto/common": "^0.4.11",
     "@atproto/crypto": "^0.4.4",
-    "@atproto/identity": "^0.4.7",
-    "@atproto/lexicon": "^0.4.10",
+    "@atproto/identity": "^0.4.8",
+    "@atproto/lexicon": "^0.4.11",
     "@atproto/syntax": "^0.4.0",
-    "@atproto/xrpc": "^0.6.12",
-    "@atproto/xrpc-server": "^0.7.17"
+    "@atproto/xrpc": "^0.7.0",
+    "@atproto/xrpc-server": "^0.7.18"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -54,8 +54,8 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.8.0",
-    "@atproto/pds": "^0.4.134"
+    "@atproto/lex-cli": "^0.8.1",
+    "@atproto/pds": "^0.4.135"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/health.ts

@@ -17,7 +17,7 @@ export const createRouter = (ctx: AppContext): Router => {
     try {
       await sql`select 1`.execute(ctx.db.db)
     } catch (err) {
-      req.log.error(err, 'failed health check')
+      req.log.error({ err }, 'failed health check')
       return res.status(503).send({ version, error: 'Service Unavailable' })
     }
     res.send({ version })

package/src/api/verification/grantVerifications.ts

@@ -20,10 +20,26 @@ export default function (server: Server, ctx: AppContext) {
       }
 
       const modViews = ctx.modService(ctx.db).views
+      const profilesBefore = await modViews.getProfiles(
+        input.body.verifications.map((v) => v.subject),
+      )
+
+      // Filter out any subject for which, the current issuer already has a valid verification record indexed
+      const verificationsToBeGranted = input.body.verifications.filter(
+        (verificationInput) => {
+          const hasValidVerification = profilesBefore
+            .get(verificationInput.subject)
+            ?.verification?.verifications.find(
+              (v) => v.issuer === ctx.cfg.verifier?.did && v.isValid,
+            )
+          return !hasValidVerification
+        },
+      )
+
       const verificationIssuer = ctx.verificationIssuer(ctx.cfg.verifier)
       const verificationService = ctx.verificationService(ctx.db)
       const { grantedVerifications, failedVerifications } =
-        await verificationIssuer.verify(input.body.verifications)
+        await verificationIssuer.verify(verificationsToBeGranted)
 
       if (!grantedVerifications.length) {
         return {

package/src/background.ts

@@ -63,7 +63,7 @@ export class BackgroundQueue {
         await task(this.db, abortController.signal)
       } catch (err) {
         if (!isCausedBySignal(err, abortController.signal)) {
-          dbLogger.error(err, 'background queue task failed')
+          dbLogger.error({ err }, 'background queue task failed')
         }
       } finally {
         abortController.abort()

package/src/error.ts

@@ -3,7 +3,7 @@ import { XRPCError } from '@atproto/xrpc-server'
 import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {
-  log.error(err, 'unexpected internal server error')
+  log.error({ err }, 'unexpected internal server error')
   if (res.headersSent) {
     return next(err)
   }

package/src/jetstream/service.ts

@@ -6,11 +6,7 @@ type OnCreateCallback<T extends JetstreamRecord> = (
 ) => Promise<void>
 
 export type JetstreamOptions = {
-  /**
-   * The full subscription endpoint to connect to.
-   * @default "wss://jetstream1.us-east.bsky.network/subscribe"
-   */
-  endpoint?: string
+  endpoint: string
   /**
    * The record collections that you want to receive updates for.
    * Leave this empty to receive updates for all record collections.
@@ -61,9 +57,7 @@ export class Jetstream {
   public cursor?: number
 
   constructor(opts: JetstreamOptions) {
-    this.url = new URL(
-      opts.endpoint ?? 'wss://jetstream1.us-east.bsky.network/subscribe',
-    )
+    this.url = new URL(opts.endpoint)
     opts.wantedCollections?.forEach((collection) => {
       this.url.searchParams.append('wantedCollections', collection)
     })

package/src/lexicon/index.ts

@@ -230,6 +230,9 @@ export const COM_ATPROTO_MODERATION = {
   DefsReasonOther: 'com.atproto.moderation.defs#reasonOther',
   DefsReasonAppeal: 'com.atproto.moderation.defs#reasonAppeal',
 }
+export const APP_BSKY_ACTOR = {
+  StatusLive: 'app.bsky.actor.status#live',
+}
 export const APP_BSKY_FEED = {
   DefsRequestLess: 'app.bsky.feed.defs#requestLess',
   DefsRequestMore: 'app.bsky.feed.defs#requestMore',

package/src/lexicon/lexicons.ts

@@ -4568,6 +4568,10 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#verificationState',
           },
+          status: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#statusView',
+          },
         },
       },
       profileView: {
@@ -4623,6 +4627,10 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#verificationState',
           },
+          status: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#statusView',
+          },
         },
       },
       profileViewDetailed: {
@@ -4699,6 +4707,10 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#verificationState',
           },
+          status: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#statusView',
+          },
         },
       },
       profileAssociated: {
@@ -5240,6 +5252,36 @@ export const schemaDict = {
           },
         },
       },
+      statusView: {
+        type: 'object',
+        required: ['status', 'record'],
+        properties: {
+          status: {
+            type: 'string',
+            description: 'The status for the account.',
+            knownValues: ['app.bsky.actor.status#live'],
+          },
+          record: {
+            type: 'unknown',
+          },
+          embed: {
+            type: 'union',
+            description: 'An optional embed associated with the status.',
+            refs: ['lex:app.bsky.embed.external#view'],
+          },
+          expiresAt: {
+            type: 'string',
+            description:
+              'The date when this status will expire. The application might choose to no longer return the status after expiration.',
+            format: 'datetime',
+          },
+          isActive: {
+            type: 'boolean',
+            description:
+              'True if the status is not expired, false if it is expired. Only present if expiration was set.',
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -5569,6 +5611,48 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyActorStatus: {
+    lexicon: 1,
+    id: 'app.bsky.actor.status',
+    defs: {
+      main: {
+        type: 'record',
+        description: 'A declaration of a Bluesky account status.',
+        key: 'literal:self',
+        record: {
+          type: 'object',
+          required: ['status', 'createdAt'],
+          properties: {
+            status: {
+              type: 'string',
+              description: 'The status for the account.',
+              knownValues: ['app.bsky.actor.status#live'],
+            },
+            embed: {
+              type: 'union',
+              description: 'An optional embed associated with the status.',
+              refs: ['lex:app.bsky.embed.external'],
+            },
+            durationMinutes: {
+              type: 'integer',
+              description:
+                'The duration of the status in minutes. Applications can choose to impose minimum and maximum limits.',
+              minimum: 1,
+            },
+            createdAt: {
+              type: 'string',
+              format: 'datetime',
+            },
+          },
+        },
+      },
+      live: {
+        type: 'token',
+        description:
+          'Advertises an account as currently offering live content.',
+      },
+    },
+  },
   AppBskyEmbedDefs: {
     lexicon: 1,
     id: 'app.bsky.embed.defs',
@@ -16113,6 +16197,7 @@ export const ids = {
   AppBskyActorPutPreferences: 'app.bsky.actor.putPreferences',
   AppBskyActorSearchActors: 'app.bsky.actor.searchActors',
   AppBskyActorSearchActorsTypeahead: 'app.bsky.actor.searchActorsTypeahead',
+  AppBskyActorStatus: 'app.bsky.actor.status',
   AppBskyEmbedDefs: 'app.bsky.embed.defs',
   AppBskyEmbedExternal: 'app.bsky.embed.external',
   AppBskyEmbedImages: 'app.bsky.embed.images',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -14,6 +14,7 @@ import type * as AppBskyGraphDefs from '../graph/defs.js'
 import type * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef.js'
 import type * as AppBskyFeedThreadgate from '../feed/threadgate.js'
 import type * as AppBskyFeedPostgate from '../feed/postgate.js'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -30,6 +31,7 @@ export interface ProfileViewBasic {
   labels?: ComAtprotoLabelDefs.Label[]
   createdAt?: string
   verification?: VerificationState
+  status?: StatusView
 }
 
 const hashProfileViewBasic = 'profileViewBasic'
@@ -55,6 +57,7 @@ export interface ProfileView {
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   verification?: VerificationState
+  status?: StatusView
 }
 
 const hashProfileView = 'profileView'
@@ -86,6 +89,7 @@ export interface ProfileViewDetailed {
   labels?: ComAtprotoLabelDefs.Label[]
   pinnedPost?: ComAtprotoRepoStrongRef.Main
   verification?: VerificationState
+  status?: StatusView
 }
 
 const hashProfileViewDetailed = 'profileViewDetailed'
@@ -592,3 +596,25 @@ export function validatePostInteractionSettingsPref<V>(v: V) {
     hashPostInteractionSettingsPref,
   )
 }
+
+export interface StatusView {
+  $type?: 'app.bsky.actor.defs#statusView'
+  /** The status for the account. */
+  status: 'app.bsky.actor.status#live' | (string & {})
+  record: { [_ in string]: unknown }
+  embed?: $Typed<AppBskyEmbedExternal.View> | { $type: string }
+  /** The date when this status will expire. The application might choose to no longer return the status after expiration. */
+  expiresAt?: string
+  /** True if the status is not expired, false if it is expired. Only present if expiration was set. */
+  isActive?: boolean
+}
+
+const hashStatusView = 'statusView'
+
+export function isStatusView<V>(v: V) {
+  return is$typed(v, id, hashStatusView)
+}
+
+export function validateStatusView<V>(v: V) {
+  return validate<StatusView & V>(v, id, hashStatusView)
+}

package/src/lexicon/types/app/bsky/actor/status.ts

@@ -0,0 +1,40 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import type * as AppBskyEmbedExternal from '../embed/external.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.actor.status'
+
+export interface Record {
+  $type: 'app.bsky.actor.status'
+  /** The status for the account. */
+  status: 'app.bsky.actor.status#live' | (string & {})
+  embed?: $Typed<AppBskyEmbedExternal.Main> | { $type: string }
+  /** The duration of the status in minutes. Applications can choose to impose minimum and maximum limits. */
+  durationMinutes?: number
+  createdAt: string
+  [k: string]: unknown
+}
+
+const hashRecord = 'main'
+
+export function isRecord<V>(v: V) {
+  return is$typed(v, id, hashRecord)
+}
+
+export function validateRecord<V>(v: V) {
+  return validate<Record & V>(v, id, hashRecord, true)
+}
+
+/** Advertises an account as currently offering live content. */
+export const LIVE = `${id}#live`

package/src/mod-service/index.ts

@@ -727,7 +727,7 @@ export class ModerationService {
               this.eventPusher
                 .attemptBlobEvent(evt.id)
                 .catch((err) =>
-                  log.error({ err, ...evt }, 'failed to push blob event'),
+                  log.error({ ...evt, err }, 'failed to push blob event'),
                 ),
             ),
           )

package/src/mod-service/views.ts

@@ -544,10 +544,14 @@ export class ModerationViews {
     subjects: string[],
     includeNeg?: boolean,
   ): Promise<Map<string, Label[]>> {
+    const now = new Date().toISOString()
     const labels = new Map<string, Label[]>()
     const res = await this.db.db
       .selectFrom('label')
       .where('label.uri', 'in', subjects)
+      .where((qb) =>
+        qb.where('label.exp', 'is', null).orWhere('label.exp', '>', now),
+      )
       .if(!includeNeg, (qb) => qb.where('neg', '=', false))
       .selectAll()
       .execute()

package/src/team/index.ts

@@ -229,11 +229,8 @@ export class TeamService {
           profiles.set(profile.did, profile)
         })
       }
-    } catch (error) {
-      httpLogger.error(
-        { error, dids },
-        'Failed to get profiles for team members',
-      )
+    } catch (err) {
+      httpLogger.error({ err, dids }, 'Failed to get profiles for team members')
     }
 
     return profiles

package/tests/expiring-label.test.ts

@@ -0,0 +1,72 @@
+import AtpAgent from '@atproto/api'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+} from '@atproto/dev-env'
+import { ids } from '../src/lexicon/lexicons'
+
+describe('expiring label', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+  let agent: AtpAgent
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_expiring_label_test',
+    })
+    sc = network.getSeedClient()
+    agent = network.ozone.getClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const emitExpiringLabel = async (did: string) =>
+    modClient.emitEvent(
+      {
+        subject: { $type: 'com.atproto.admin.defs#repoRef', did },
+        event: {
+          $type: 'tools.ozone.moderation.defs#modEventLabel',
+          comment: 'Testing expiring label',
+          createLabelVals: ['expiring'],
+          negateLabelVals: [],
+          durationInHours: 1,
+        },
+        createdBy: sc.dids.alice,
+      },
+      'moderator',
+    )
+
+  it('Returns expiring label only within expiration period', async () => {
+    const getRepo = async (did: string) =>
+      agent.tools.ozone.moderation.getRepo(
+        { did },
+        {
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneModerationGetRepo,
+          ),
+        },
+      )
+
+    const now = new Date().toISOString()
+    await emitExpiringLabel(sc.dids.carol)
+    const { data: repoWithExpiringLabel } = await getRepo(sc.dids.carol)
+    expect(repoWithExpiringLabel.labels?.[0].val).toEqual('expiring')
+    // Manually expire the label in db
+    await network.ozone.ctx.db.db
+      .updateTable('label')
+      .set({ exp: now })
+      .where('uri', '=', sc.dids.carol)
+      .execute()
+
+    const { data: repoAfterExpiringLabel } = await getRepo(sc.dids.carol)
+    expect(repoAfterExpiringLabel.labels?.length).toEqual(0)
+  })
+})

package/tests/verification.test.ts

@@ -133,4 +133,34 @@ describe('verification', () => {
       )
     })
   })
+
+  it('does not publish record if a valid one already exists', async () => {
+    const { data: beforePublish } =
+      await adminAgent.tools.ozone.verification.listVerifications({
+        subjects: [sc.dids.bob],
+      })
+    const {
+      data: { verifications },
+    } = await adminAgent.tools.ozone.verification.grantVerifications({
+      verifications: [
+        {
+          subject: sc.dids.bob,
+          handle: sc.accounts[sc.dids.bob].handle,
+          displayName: 'bobby',
+        },
+      ],
+    })
+
+    const { data: afterPublish } =
+      await adminAgent.tools.ozone.verification.listVerifications({
+        subjects: [sc.dids.bob],
+      })
+
+    // assert that the response does not contain any new verification
+    expect(verifications.length).toEqual(0)
+    // assert that the list of verifications in db hasn't changed
+    expect(afterPublish.verifications.length).toEqual(
+      beforePublish.verifications.length,
+    )
+  })
 })