@atproto/ozone 0.0.17 → 0.1.0

package/dist/lexicon/lexicons.d.ts

@@ -2206,6 +2206,11 @@ export declare const schemaDict: {
                                 description: string;
                                 ref: string;
                             };
+                            contact: {
+                                type: string;
+                                description: string;
+                                ref: string;
+                            };
                             did: {
                                 type: string;
                                 format: string;
@@ -2225,6 +2230,14 @@ export declare const schemaDict: {
                     };
                 };
             };
+            contact: {
+                type: string;
+                properties: {
+                    email: {
+                        type: string;
+                    };
+                };
+            };
         };
     };
     ComAtprotoServerGetAccountInviteCodes: {

package/dist/lexicon/types/com/atproto/server/describeServer.d.ts

@@ -9,6 +9,7 @@ export interface OutputSchema {
     phoneVerificationRequired?: boolean;
     availableUserDomains: string[];
     links?: Links;
+    contact?: Contact;
     did: string;
     [k: string]: unknown;
 }
@@ -40,3 +41,9 @@ export interface Links {
 }
 export declare function isLinks(v: unknown): v is Links;
 export declare function validateLinks(v: unknown): ValidationResult;
+export interface Contact {
+    email?: string;
+    [k: string]: unknown;
+}
+export declare function isContact(v: unknown): v is Contact;
+export declare function validateContact(v: unknown): ValidationResult;

package/dist/mod-service/index.d.ts

@@ -180,6 +180,8 @@ export declare class ModerationService {
         subject: string;
     }): Promise<void>;
 }
+export declare const TAKEDOWN_LABEL = "!takedown";
+export declare const SUSPEND_LABEL = "!suspend";
 export type TakedownSubjects = {
     did: string;
     subjects: (RepoRef | RepoBlobRef | StrongRef)[];

package/dist/mod-service/types.d.ts

@@ -17,5 +17,3 @@ export type ModerationSubjectStatusRowWithHandle = ModerationSubjectStatusRow &
     handle: string | null;
 };
 export type ModEventType = ToolsOzoneModerationDefs.ModEventTakedown | ToolsOzoneModerationDefs.ModEventAcknowledge | ToolsOzoneModerationDefs.ModEventEscalate | ToolsOzoneModerationDefs.ModEventComment | ToolsOzoneModerationDefs.ModEventLabel | ToolsOzoneModerationDefs.ModEventReport | ToolsOzoneModerationDefs.ModEventMute | ToolsOzoneModerationDefs.ModEventReverseTakedown | ToolsOzoneModerationDefs.ModEventTag;
-export declare const UNSPECCED_TAKEDOWN_LABEL = "!unspecced-takedown";
-export declare const UNSPECCED_TAKEDOWN_BLOBS_LABEL = "!unspecced-takedown-blobs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.0.17",
+  "version": "0.1.0",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -30,7 +30,7 @@
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.11.0",
+    "@atproto/api": "^0.11.1",
     "@atproto/common": "^0.3.4",
     "@atproto/crypto": "^0.3.0",
     "@atproto/identity": "^0.3.3",
@@ -47,10 +47,10 @@
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
     "nodemailer": "^6.8.0",
-    "@atproto/api": "^0.11.0",
-    "@atproto/dev-env": "^0.2.38",
+    "@atproto/api": "^0.11.1",
+    "@atproto/dev-env": "^0.2.39",
     "@atproto/lex-cli": "^0.3.2",
-    "@atproto/pds": "^0.4.6",
+    "@atproto/pds": "^0.4.7",
     "@atproto/xrpc": "^0.4.3"
   },
   "scripts": {

package/src/api/label/fetchLabels.ts

@@ -1,30 +1,18 @@
 import { Server } from '../../lexicon'
 import AppContext from '../../context'
-import {
-  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-  UNSPECCED_TAKEDOWN_LABEL,
-} from '../../mod-service/types'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.temp.fetchLabels({
     auth: ctx.authVerifier.standardOptionalOrAdminToken,
-    handler: async ({ auth, params }) => {
+    handler: async ({ params }) => {
       const { limit } = params
       const since =
         params.since !== undefined ? new Date(params.since).toISOString() : ''
-      const includeUnspeccedTakedowns =
-        auth.credentials.type === 'none' ? false : auth.credentials.isAdmin
       const labelRes = await ctx.db.db
         .selectFrom('label')
         .selectAll()
         .orderBy('label.cts', 'asc')
         .where('cts', '>', since)
-        .if(!includeUnspeccedTakedowns, (q) =>
-          q.where('label.val', 'not in', [
-            UNSPECCED_TAKEDOWN_LABEL,
-            UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-          ]),
-        )
         .limit(limit)
         .execute()
 

package/src/lexicon/lexicons.ts

@@ -2420,6 +2420,11 @@ export const schemaDict = {
                 description: 'URLs of service policy documents.',
                 ref: 'lex:com.atproto.server.describeServer#links',
               },
+              contact: {
+                type: 'ref',
+                description: 'Contact information',
+                ref: 'lex:com.atproto.server.describeServer#contact',
+              },
               did: {
                 type: 'string',
                 format: 'did',
@@ -2439,6 +2444,14 @@ export const schemaDict = {
           },
         },
       },
+      contact: {
+        type: 'object',
+        properties: {
+          email: {
+            type: 'string',
+          },
+        },
+      },
     },
   },
   ComAtprotoServerGetAccountInviteCodes: {

package/src/lexicon/types/com/atproto/server/describeServer.ts

@@ -20,6 +20,7 @@ export interface OutputSchema {
   /** List of domain suffixes that can be used in account handles. */
   availableUserDomains: string[]
   links?: Links
+  contact?: Contact
   did: string
   [k: string]: unknown
 }
@@ -66,3 +67,20 @@ export function isLinks(v: unknown): v is Links {
 export function validateLinks(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.server.describeServer#links', v)
 }
+
+export interface Contact {
+  email?: string
+  [k: string]: unknown
+}
+
+export function isContact(v: unknown): v is Contact {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.server.describeServer#contact'
+  )
+}
+
+export function validateContact(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+}

package/src/mod-service/index.ts

@@ -29,8 +29,6 @@ import {
   ModerationEventRow,
   ModerationSubjectStatusRow,
   ReversibleModerationEvent,
-  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-  UNSPECCED_TAKEDOWN_LABEL,
 } from './types'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
@@ -480,8 +478,10 @@ export class ModerationService {
       )
       .returning('id')
       .execute()
+
+    const takedownLabel = isSuspend ? SUSPEND_LABEL : TAKEDOWN_LABEL
     await this.formatAndCreateLabels(subject.did, null, {
-      create: [UNSPECCED_TAKEDOWN_LABEL],
+      create: [takedownLabel],
     })
 
     this.db.onCommit(() => {
@@ -506,8 +506,18 @@ export class ModerationService {
       })
       .returning('id')
       .execute()
+
+    const existingTakedownLabels = await this.db.db
+      .selectFrom('label')
+      .where('label.uri', '=', subject.did)
+      .where('label.val', 'in', [TAKEDOWN_LABEL, SUSPEND_LABEL])
+      .where('neg', '=', false)
+      .selectAll()
+      .execute()
+
+    const takedownVals = existingTakedownLabels.map((row) => row.val)
     await this.formatAndCreateLabels(subject.did, null, {
-      negate: [UNSPECCED_TAKEDOWN_LABEL],
+      negate: takedownVals,
     })
 
     this.db.onCommit(() => {
@@ -521,44 +531,12 @@ export class ModerationService {
 
   async takedownRecord(subject: RecordSubject, takedownId: number) {
     this.db.assertTransaction()
-    const takedownRef = `BSKY-TAKEDOWN-${takedownId}`
-    const values = this.eventPusher.takedowns.map((eventType) => ({
-      eventType,
-      subjectDid: subject.did,
-      subjectUri: subject.uri,
-      subjectCid: subject.cid,
-      takedownRef,
-    }))
-    const blobCids = subject.blobCids
-    const labels: string[] = [UNSPECCED_TAKEDOWN_LABEL]
-    if (blobCids && blobCids.length > 0) {
-      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL)
-    }
-    const recordEvts = await this.db.db
-      .insertInto('record_push_event')
-      .values(values)
-      .onConflict((oc) =>
-        oc.columns(['subjectUri', 'eventType']).doUpdateSet({
-          takedownRef,
-          confirmedAt: null,
-          attempts: 0,
-          lastAttempted: null,
-        }),
-      )
-      .returning('id')
-      .execute()
     await this.formatAndCreateLabels(subject.uri, subject.cid, {
-      create: labels,
-    })
-
-    this.db.onCommit(() => {
-      this.backgroundQueue.add(async () => {
-        await Promise.all(
-          recordEvts.map((evt) => this.eventPusher.attemptRecordEvent(evt.id)),
-        )
-      })
+      create: [TAKEDOWN_LABEL],
     })
 
+    const takedownRef = `BSKY-TAKEDOWN-${takedownId}`
+    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobValues: Insertable<BlobPushEvent>[] = []
       for (const eventType of this.eventPusher.takedowns) {
@@ -613,37 +591,11 @@ export class ModerationService {
 
   async reverseTakedownRecord(subject: RecordSubject) {
     this.db.assertTransaction()
-    const labels: string[] = [UNSPECCED_TAKEDOWN_LABEL]
-    const blobCids = subject.blobCids
-    if (blobCids && blobCids.length > 0) {
-      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL)
-    }
-    const recordEvts = await this.db.db
-      .updateTable('record_push_event')
-      .where('eventType', 'in', TAKEDOWNS)
-      .where('subjectDid', '=', subject.did)
-      .where('subjectUri', '=', subject.uri)
-      .set({
-        takedownRef: null,
-        confirmedAt: null,
-        attempts: 0,
-        lastAttempted: null,
-      })
-      .returning('id')
-      .execute()
     await this.formatAndCreateLabels(subject.uri, subject.cid, {
-      negate: labels,
-    }),
-      this.db.onCommit(() => {
-        this.backgroundQueue.add(async () => {
-          await Promise.all(
-            recordEvts.map((evt) =>
-              this.eventPusher.attemptRecordEvent(evt.id),
-            ),
-          )
-        })
-      })
+      negate: [TAKEDOWN_LABEL],
+    })
 
+    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobEvts = await this.db.db
         .updateTable('blob_push_event')
@@ -907,6 +859,9 @@ export class ModerationService {
           id: sql`${excluded('id')}`,
           neg: sql`${excluded('neg')}`,
           cts: sql`${excluded('cts')}`,
+          exp: sql`${excluded('exp')}`,
+          sig: sql`${excluded('sig')}`,
+          signingKeyId: sql`${excluded('signingKeyId')}`,
         }),
       )
       .returningAll()
@@ -960,6 +915,9 @@ const isSafeUrl = (url: URL) => {
 
 const TAKEDOWNS = ['pds_takedown' as const, 'appview_takedown' as const]
 
+export const TAKEDOWN_LABEL = '!takedown'
+export const SUSPEND_LABEL = '!suspend'
+
 export type TakedownSubjects = {
   did: string
   subjects: (RepoRef | RepoBlobRef | StrongRef)[]

package/src/mod-service/types.ts

@@ -31,7 +31,3 @@ export type ModEventType =
   | ToolsOzoneModerationDefs.ModEventMute
   | ToolsOzoneModerationDefs.ModEventReverseTakedown
   | ToolsOzoneModerationDefs.ModEventTag
-
-export const UNSPECCED_TAKEDOWN_LABEL = '!unspecced-takedown'
-
-export const UNSPECCED_TAKEDOWN_BLOBS_LABEL = '!unspecced-takedown-blobs'

package/src/mod-service/util.ts

@@ -12,7 +12,7 @@ export const formatLabel = (row: LabelRow): Label => {
     uri: row.uri,
     cid: row.cid === '' ? undefined : row.cid,
     val: row.val,
-    neg: row.neg,
+    neg: row.neg === true ? true : undefined,
     cts: row.cts,
     exp: row.exp ?? undefined,
     sig: row.sig ? new Uint8Array(row.sig) : undefined,

package/src/mod-service/views.ts

@@ -573,6 +573,6 @@ export function getSelfLabels(details: {
       ? normalizeDatetimeAlways(record.createdAt)
       : new Date(0).toISOString()
   return record.labels.values.map(({ val }) => {
-    return { src, uri, cid, val, cts, neg: false }
+    return { src, uri, cid, val, cts }
   })
 }

package/tests/__snapshots__/get-record.test.ts.snap

@@ -10,19 +10,17 @@ Object {
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
-      "neg": false,
       "sig": Object {
         "$bytes": "sig(0)",
       },
       "src": "user(2)",
       "uri": "record(0)",
-      "val": "!unspecced-takedown",
+      "val": "!takedown",
       "ver": 1,
     },
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
-      "neg": false,
       "src": "user(0)",
       "uri": "record(0)",
       "val": "self-label",
@@ -111,19 +109,17 @@ Object {
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
-      "neg": false,
       "sig": Object {
         "$bytes": "sig(0)",
       },
       "src": "user(2)",
       "uri": "record(0)",
-      "val": "!unspecced-takedown",
+      "val": "!takedown",
       "ver": 1,
     },
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
-      "neg": false,
       "src": "user(0)",
       "uri": "record(0)",
       "val": "self-label",

package/tests/__snapshots__/get-repo.test.ts.snap

@@ -11,13 +11,12 @@ Object {
   "labels": Array [
     Object {
       "cts": "1970-01-01T00:00:00.000Z",
-      "neg": false,
       "sig": Object {
         "$bytes": "sig(0)",
       },
       "src": "user(2)",
       "uri": "user(0)",
-      "val": "!unspecced-takedown",
+      "val": "!takedown",
       "ver": 1,
     },
   ],

package/tests/moderation.test.ts

@@ -1,5 +1,6 @@
 import {
   TestNetwork,
+  TestOzone,
   ImageRef,
   RecordRef,
   SeedClient,
@@ -20,12 +21,8 @@ import {
   REVIEWESCALATED,
 } from '../src/lexicon/types/tools/ozone/moderation/defs'
 import { EventReverser } from '../src'
-import { TestOzone } from '@atproto/dev-env/src/ozone'
 import { ImageInvalidator } from '../src/image-invalidator'
-import {
-  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-  UNSPECCED_TAKEDOWN_LABEL,
-} from '../src/mod-service/types'
+import { TAKEDOWN_LABEL } from '../src/mod-service'
 
 describe('moderation', () => {
   let network: TestNetwork
@@ -542,10 +539,7 @@ describe('moderation', () => {
       )
       expect(bskyRes1.data.takedown?.applied).toBe(true)
 
-      const takedownLabel1 = await getLabel(
-        sc.dids.bob,
-        UNSPECCED_TAKEDOWN_LABEL,
-      )
+      const takedownLabel1 = await getLabel(sc.dids.bob, TAKEDOWN_LABEL)
       expect(takedownLabel1).toBeDefined()
 
       // cleanup
@@ -570,52 +564,7 @@ describe('moderation', () => {
       )
       expect(bskyRes2.data.takedown?.applied).toBe(false)
 
-      const takedownLabel2 = await getLabel(
-        sc.dids.bob,
-        UNSPECCED_TAKEDOWN_LABEL,
-      )
-      expect(takedownLabel2).toBeUndefined()
-    })
-
-    it('fans out record takedowns', async () => {
-      const post = sc.posts[sc.dids.bob][0].ref
-      const uri = post.uriStr
-      await modClient.performTakedown({
-        subject: recordSubject(post),
-      })
-      await ozone.processAll()
-
-      const pdsRes1 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
-        { uri },
-        { headers: network.pds.adminAuthHeaders() },
-      )
-      expect(pdsRes1.data.takedown?.applied).toBe(true)
-
-      const bskyRes1 = await bskyAgent.api.com.atproto.admin.getSubjectStatus(
-        { uri },
-        { headers: network.bsky.adminAuthHeaders() },
-      )
-      expect(bskyRes1.data.takedown?.applied).toBe(true)
-
-      const takedownLabel1 = await getLabel(uri, UNSPECCED_TAKEDOWN_LABEL)
-      expect(takedownLabel1).toBeDefined()
-
-      // cleanup
-      await modClient.performReverseTakedown({ subject: recordSubject(post) })
-      await ozone.processAll()
-
-      const pdsRes2 = await pdsAgent.api.com.atproto.admin.getSubjectStatus(
-        { uri },
-        { headers: network.pds.adminAuthHeaders() },
-      )
-      expect(pdsRes2.data.takedown?.applied).toBe(false)
-      const bskyRes2 = await bskyAgent.api.com.atproto.admin.getSubjectStatus(
-        { uri },
-        { headers: network.bsky.adminAuthHeaders() },
-      )
-      expect(bskyRes2.data.takedown?.applied).toBe(false)
-
-      const takedownLabel2 = await getLabel(uri, UNSPECCED_TAKEDOWN_LABEL)
+      const takedownLabel2 = await getLabel(sc.dids.bob, TAKEDOWN_LABEL)
       expect(takedownLabel2).toBeUndefined()
     })
 
@@ -713,22 +662,6 @@ describe('moderation', () => {
       })
     })
 
-    it('serves label when authed', async () => {
-      const { data: unauthed } = await agent.api.com.atproto.temp.fetchLabels(
-        {},
-      )
-      expect(unauthed.labels.map((l) => l.val)).not.toContain(
-        UNSPECCED_TAKEDOWN_LABEL,
-      )
-      const { data: authed } = await agent.api.com.atproto.temp.fetchLabels(
-        {},
-        { headers: network.bsky.adminAuthHeaders() },
-      )
-      expect(authed.labels.map((l) => l.val)).toContain(
-        UNSPECCED_TAKEDOWN_LABEL,
-      )
-    })
-
     async function emitLabelEvent(
       opts: Partial<ToolsOzoneModerationEmitEvent.InputSchema> & {
         subject: ToolsOzoneModerationEmitEvent.InputSchema['subject']
@@ -860,14 +793,6 @@ describe('moderation', () => {
       expect(res.data.takedown?.applied).toBe(true)
     })
 
-    it('creates a takedown blobs label', async () => {
-      const label = await getLabel(
-        post.ref.uriStr,
-        UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-      )
-      expect(label).toBeDefined()
-    })
-
     it('restores blob when action is reversed.', async () => {
       await modClient.performReverseTakedown({
         subject: recordSubject(post.ref),
@@ -898,30 +823,6 @@ describe('moderation', () => {
       )
       expect(res.data.takedown?.applied).toBe(false)
     })
-
-    it('serves label when authed', async () => {
-      const { data: unauthed } = await agent.api.com.atproto.temp.fetchLabels(
-        {},
-      )
-      expect(unauthed.labels.map((l) => l.val)).not.toContain(
-        UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-      )
-      const { data: authed } = await agent.api.com.atproto.temp.fetchLabels(
-        {},
-        { headers: network.bsky.adminAuthHeaders() },
-      )
-      expect(authed.labels.map((l) => l.val)).toContain(
-        UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-      )
-    })
-
-    it('negates takedown blobs label on reversal', async () => {
-      const label = await getLabel(
-        post.ref.uriStr,
-        UNSPECCED_TAKEDOWN_BLOBS_LABEL,
-      )
-      expect(label).toBeUndefined()
-    })
   })
 })
 

package/tests/query-labels.test.ts

@@ -30,42 +30,36 @@ describe('ozone query labels', () => {
         src: EXAMPLE_LABELER,
         uri: 'did:example:blah',
         val: 'spam',
-        neg: false,
         cts: new Date().toISOString(),
       },
       {
         src: EXAMPLE_LABELER,
         uri: 'did:example:blah',
         val: 'impersonation',
-        neg: false,
         cts: new Date().toISOString(),
       },
       {
         src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.feed.post/1234abcde',
         val: 'spam',
-        neg: false,
         cts: new Date().toISOString(),
       },
       {
         src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.feed.post/1234abcfg',
         val: 'spam',
-        neg: false,
         cts: new Date().toISOString(),
       },
       {
         src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.actor.profile/self',
         val: 'spam',
-        neg: false,
         cts: new Date().toISOString(),
       },
       {
         src: EXAMPLE_LABELER,
         uri: 'did:example:thing',
         val: 'spam',
-        neg: false,
         cts: new Date().toISOString(),
       },
     ]

package/tests/sequencer.test.ts

@@ -37,6 +37,7 @@ describe('sequencer', () => {
     return {
       id: e.seq,
       ...label,
+      neg: !!label.neg,
       cid: label.cid ? label.cid : '',
       exp: null,
       sig: label.sig ? Buffer.from(label.sig) : null,