@atproto/ozone 0.1.37 → 0.1.39

package/src/lexicon/lexicons.ts

@@ -4989,6 +4989,7 @@ export const schemaDict = {
               'lex:app.bsky.embed.record#viewRecord',
               'lex:app.bsky.embed.record#viewNotFound',
               'lex:app.bsky.embed.record#viewBlocked',
+              'lex:app.bsky.embed.record#viewDetached',
               'lex:app.bsky.feed.defs#generatorView',
               'lex:app.bsky.graph.defs#listView',
               'lex:app.bsky.labeler.defs#labelerView',
@@ -5083,6 +5084,20 @@ export const schemaDict = {
           },
         },
       },
+      viewDetached: {
+        type: 'object',
+        required: ['uri', 'detached'],
+        properties: {
+          uri: {
+            type: 'string',
+            format: 'at-uri',
+          },
+          detached: {
+            type: 'boolean',
+            const: true,
+          },
+        },
+      },
     },
   },
   AppBskyEmbedRecordWithMedia: {
@@ -5165,6 +5180,9 @@ export const schemaDict = {
           likeCount: {
             type: 'integer',
           },
+          quoteCount: {
+            type: 'integer',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -5205,6 +5223,9 @@ export const schemaDict = {
           replyDisabled: {
             type: 'boolean',
           },
+          embeddingDisabled: {
+            type: 'boolean',
+          },
         },
       },
       feedViewPost: {
@@ -6280,6 +6301,69 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyFeedGetQuotes: {
+    lexicon: 1,
+    id: 'app.bsky.feed.getQuotes',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get a list of quotes for a given post.',
+        parameters: {
+          type: 'params',
+          required: ['uri'],
+          properties: {
+            uri: {
+              type: 'string',
+              format: 'at-uri',
+              description: 'Reference (AT-URI) of post record',
+            },
+            cid: {
+              type: 'string',
+              format: 'cid',
+              description:
+                'If supplied, filters to quotes of specific version (by CID) of the post record.',
+            },
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 100,
+              default: 50,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['uri', 'posts'],
+            properties: {
+              uri: {
+                type: 'string',
+                format: 'at-uri',
+              },
+              cid: {
+                type: 'string',
+                format: 'cid',
+              },
+              cursor: {
+                type: 'string',
+              },
+              posts: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.feed.defs#postView',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyFeedGetRepostedBy: {
     lexicon: 1,
     id: 'app.bsky.feed.getRepostedBy',
@@ -6596,6 +6680,56 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyFeedPostgate: {
+    lexicon: 1,
+    id: 'app.bsky.feed.postgate',
+    defs: {
+      main: {
+        type: 'record',
+        key: 'tid',
+        description:
+          'Record defining interaction rules for a post. The record key (rkey) of the postgate record must match the record key of the post, and that record must be in the same repository.',
+        record: {
+          type: 'object',
+          required: ['post', 'createdAt'],
+          properties: {
+            createdAt: {
+              type: 'string',
+              format: 'datetime',
+            },
+            post: {
+              type: 'string',
+              format: 'at-uri',
+              description: 'Reference (AT-URI) to the post record.',
+            },
+            detachedEmbeddingUris: {
+              type: 'array',
+              maxLength: 50,
+              items: {
+                type: 'string',
+                format: 'at-uri',
+              },
+              description:
+                'List of AT-URIs embedding this post that the author has detached from.',
+            },
+            embeddingRules: {
+              type: 'array',
+              maxLength: 5,
+              items: {
+                type: 'union',
+                refs: ['lex:app.bsky.feed.postgate#disableRule'],
+              },
+            },
+          },
+        },
+      },
+      disableRule: {
+        type: 'object',
+        description: 'Disables embedding of this post.',
+        properties: {},
+      },
+    },
+  },
   AppBskyFeedRepost: {
     lexicon: 1,
     id: 'app.bsky.feed.repost',
@@ -6807,6 +6941,15 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            hiddenReplies: {
+              type: 'array',
+              maxLength: 50,
+              items: {
+                type: 'string',
+                format: 'at-uri',
+              },
+              description: 'List of hidden reply URIs.',
+            },
           },
         },
       },
@@ -11792,11 +11935,13 @@ export const ids = {
   AppBskyFeedGetListFeed: 'app.bsky.feed.getListFeed',
   AppBskyFeedGetPostThread: 'app.bsky.feed.getPostThread',
   AppBskyFeedGetPosts: 'app.bsky.feed.getPosts',
+  AppBskyFeedGetQuotes: 'app.bsky.feed.getQuotes',
   AppBskyFeedGetRepostedBy: 'app.bsky.feed.getRepostedBy',
   AppBskyFeedGetSuggestedFeeds: 'app.bsky.feed.getSuggestedFeeds',
   AppBskyFeedGetTimeline: 'app.bsky.feed.getTimeline',
   AppBskyFeedLike: 'app.bsky.feed.like',
   AppBskyFeedPost: 'app.bsky.feed.post',
+  AppBskyFeedPostgate: 'app.bsky.feed.postgate',
   AppBskyFeedRepost: 'app.bsky.feed.repost',
   AppBskyFeedSearchPosts: 'app.bsky.feed.searchPosts',
   AppBskyFeedSendInteractions: 'app.bsky.feed.sendInteractions',

package/src/lexicon/types/app/bsky/embed/record.ts

@@ -38,6 +38,7 @@ export interface View {
     | ViewRecord
     | ViewNotFound
     | ViewBlocked
+    | ViewDetached
     | AppBskyFeedDefs.GeneratorView
     | AppBskyGraphDefs.ListView
     | AppBskyLabelerDefs.LabelerView
@@ -125,3 +126,21 @@ export function isViewBlocked(v: unknown): v is ViewBlocked {
 export function validateViewBlocked(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.embed.record#viewBlocked', v)
 }
+
+export interface ViewDetached {
+  uri: string
+  detached: true
+  [k: string]: unknown
+}
+
+export function isViewDetached(v: unknown): v is ViewDetached {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.embed.record#viewDetached'
+  )
+}
+
+export function validateViewDetached(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.embed.record#viewDetached', v)
+}

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

@@ -28,6 +28,7 @@ export interface PostView {
   replyCount?: number
   repostCount?: number
   likeCount?: number
+  quoteCount?: number
   indexedAt: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
@@ -51,6 +52,7 @@ export interface ViewerState {
   like?: string
   threadMuted?: boolean
   replyDisabled?: boolean
+  embeddingDisabled?: boolean
   [k: string]: unknown
 }
 

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

@@ -0,0 +1,54 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as AppBskyFeedDefs from './defs'
+
+export interface QueryParams {
+  /** Reference (AT-URI) of post record */
+  uri: string
+  /** If supplied, filters to quotes of specific version (by CID) of the post record. */
+  cid?: string
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  uri: string
+  cid?: string
+  cursor?: string
+  posts: AppBskyFeedDefs.PostView[]
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

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

@@ -0,0 +1,47 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  createdAt: string
+  /** Reference (AT-URI) to the post record. */
+  post: string
+  /** List of AT-URIs embedding this post that the author has detached from. */
+  detachedEmbeddingUris?: string[]
+  embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'app.bsky.feed.postgate#main' ||
+      v.$type === 'app.bsky.feed.postgate')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.postgate#main', v)
+}
+
+/** Disables embedding of this post. */
+export interface DisableRule {
+  [k: string]: unknown
+}
+
+export function isDisableRule(v: unknown): v is DisableRule {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.feed.postgate#disableRule'
+  )
+}
+
+export function validateDisableRule(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.postgate#disableRule', v)
+}

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

@@ -16,6 +16,8 @@ export interface Record {
     | { $type: string; [k: string]: unknown }
   )[]
   createdAt: string
+  /** List of hidden reply URIs. */
+  hiddenReplies?: string[]
   [k: string]: unknown
 }
 

package/src/mod-service/index.ts

@@ -49,6 +49,7 @@ import { ImageInvalidator } from '../image-invalidator'
 import { httpLogger as log } from '../logger'
 import { OzoneConfig } from '../config'
 import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
+import { ids } from '../lexicon/lexicons'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 
@@ -62,7 +63,10 @@ export class ModerationService {
     public idResolver: IdResolver,
     public eventPusher: EventPusher,
     public appviewAgent: AtpAgent,
-    private createAuthHeaders: (aud: string) => Promise<AuthHeaders>,
+    private createAuthHeaders: (
+      aud: string,
+      method: string,
+    ) => Promise<AuthHeaders>,
     public imgInvalidator?: ImageInvalidator,
   ) {}
 
@@ -74,7 +78,7 @@ export class ModerationService {
     idResolver: IdResolver,
     eventPusher: EventPusher,
     appviewAgent: AtpAgent,
-    createAuthHeaders: (aud: string) => Promise<AuthHeaders>,
+    createAuthHeaders: (aud: string, method: string) => Promise<AuthHeaders>,
     imgInvalidator?: ImageInvalidator,
   ) {
     return (db: Database) =>
@@ -97,8 +101,11 @@ export class ModerationService {
     this.signingKey,
     this.signingKeyId,
     this.appviewAgent,
-    async (labelers?: ParsedLabelers) => {
-      const authHeaders = await this.createAuthHeaders(this.cfg.appview.did)
+    async (method: string, labelers?: ParsedLabelers) => {
+      const authHeaders = await this.createAuthHeaders(
+        this.cfg.appview.did,
+        method,
+      )
       if (labelers?.dids?.length) {
         authHeaders.headers[LABELER_HEADER_NAME] = labelers.dids.join(', ')
       }
@@ -936,7 +943,10 @@ export class ModerationService {
       },
       {
         encoding: 'application/json',
-        ...(await this.createAuthHeaders(serverInfo.did)),
+        ...(await this.createAuthHeaders(
+          serverInfo.did,
+          ids.ComAtprotoAdminSendEmail,
+        )),
       },
     )
     if (!delivery.sent) {

package/src/mod-service/views.ts

@@ -29,6 +29,7 @@ import { LabelRow } from '../db/schema/label'
 import { dbLogger } from '../logger'
 import { httpLogger } from '../logger'
 import { ParsedLabelers } from '../util'
+import { ids } from '../lexicon/lexicons'
 
 export type AuthHeaders = {
   headers: {
@@ -43,12 +44,12 @@ export class ModerationViews {
     private signingKey: Keypair,
     private signingKeyId: number,
     private appviewAgent: AtpAgent,
-    private appviewAuth: () => Promise<AuthHeaders>,
+    private appviewAuth: (method: string) => Promise<AuthHeaders>,
   ) {}
 
   async getAccoutInfosByDid(dids: string[]): Promise<Map<string, AccountView>> {
     if (dids.length === 0) return new Map()
-    const auth = await this.appviewAuth()
+    const auth = await this.appviewAuth(ids.ComAtprotoAdminGetAccountInfos)
     if (!auth) return new Map()
     try {
       const res = await this.appviewAgent.api.com.atproto.admin.getAccountInfos(
@@ -236,7 +237,7 @@ export class ModerationViews {
   async fetchRecords(
     subjects: RecordSubject[],
   ): Promise<Map<string, RecordInfo>> {
-    const auth = await this.appviewAuth()
+    const auth = await this.appviewAuth(ids.ComAtprotoRepoGetRecord)
     if (!auth) return new Map()
     const fetched = await Promise.all(
       subjects.map(async (subject) => {
@@ -547,7 +548,7 @@ export class ModerationViews {
   async fetchAuthorFeed(
     actor: string,
   ): Promise<AppBskyFeedDefs.FeedViewPost[]> {
-    const auth = await this.appviewAuth()
+    const auth = await this.appviewAuth(ids.AppBskyFeedGetAuthorFeed)
     if (!auth) return []
     const {
       data: { feed },

package/src/team/index.ts

@@ -7,6 +7,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { chunkArray } from '@atproto/common'
 import AppContext from '../context'
 import { httpLogger } from '../logger'
+import { ids } from '../lexicon/lexicons'
 
 export type TeamServiceCreator = (db: Database) => TeamService
 
@@ -168,7 +169,7 @@ export class TeamService {
     const profiles = new Map<string, ProfileViewDetailed>()
 
     try {
-      const headers = await ctx.appviewAuth()
+      const headers = await ctx.appviewAuth(ids.AppBskyActorGetProfiles)
 
       for (const actors of chunkArray(dids, 25)) {
         const { data } = await ctx.appviewAgent.api.app.bsky.actor.getProfiles(

package/tests/3p-labeler.test.ts

@@ -9,6 +9,7 @@ import {
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { LABELER_HEADER_NAME } from '../src/util'
+import { ids } from '../src/lexicon/lexicons'
 
 describe('labels from 3p labelers', () => {
   let network: TestNetwork
@@ -170,11 +171,17 @@ describe('labels from 3p labelers', () => {
       ] = await Promise.all([
         agent.api.tools.ozone.moderation.getRecord(
           { uri: sc.posts[sc.dids.alice][0].ref.uriStr },
-          { headers: await ozone.modHeaders() },
+          {
+            headers: await ozone.modHeaders(ids.ToolsOzoneModerationGetRecord),
+          },
         ),
         thirdPartyAgent.api.tools.ozone.moderation.getRecord(
           { uri: sc.posts[sc.dids.alice][0].ref.uriStr },
-          { headers: await thirdPartyLabeler.modHeaders() },
+          {
+            headers: await thirdPartyLabeler.modHeaders(
+              ids.ToolsOzoneModerationGetRecord,
+            ),
+          },
         ),
       ])
 
@@ -189,7 +196,9 @@ describe('labels from 3p labelers', () => {
     })
 
     it('includes labels from all authorities requested via header', async () => {
-      const authHeaders = await ozone.modHeaders()
+      const authHeaders = await ozone.modHeaders(
+        ids.ToolsOzoneModerationGetRecord,
+      )
       const { data: recordIncludingExternalLabels } =
         await agent.api.tools.ozone.moderation.getRecord(
           { uri: sc.posts[sc.dids.alice][0].ref.uriStr },
@@ -225,11 +234,17 @@ describe('labels from 3p labelers', () => {
         await Promise.all([
           agent.api.tools.ozone.moderation.getRepo(
             { did: sc.dids.alice },
-            { headers: await ozone.modHeaders() },
+            {
+              headers: await ozone.modHeaders(ids.ToolsOzoneModerationGetRepo),
+            },
           ),
           thirdPartyAgent.api.tools.ozone.moderation.getRepo(
             { did: sc.dids.alice },
-            { headers: await thirdPartyLabeler.modHeaders() },
+            {
+              headers: await thirdPartyLabeler.modHeaders(
+                ids.ToolsOzoneModerationGetRepo,
+              ),
+            },
           ),
         ])
 
@@ -244,7 +259,9 @@ describe('labels from 3p labelers', () => {
     })
 
     it('includes labels from all authorities requested via header', async () => {
-      const authHeaders = await ozone.modHeaders()
+      const authHeaders = await ozone.modHeaders(
+        ids.ToolsOzoneModerationGetRepo,
+      )
       const { data: recordIncludingExternalLabels } =
         await agent.api.tools.ozone.moderation.getRepo(
           { did: sc.dids.alice },

package/tests/communication-templates.test.ts

@@ -1,5 +1,6 @@
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { ids } from '../src/lexicon/lexicons'
 
 describe('communication-templates', () => {
   let network: TestNetwork
@@ -30,7 +31,10 @@ describe('communication-templates', () => {
     const { data } = await agent.api.tools.ozone.communication.listTemplates(
       {},
       {
-        headers: await network.ozone.modHeaders('moderator'),
+        headers: await network.ozone.modHeaders(
+          ids.ToolsOzoneCommunicationListTemplates,
+          'moderator',
+        ),
       },
     )
     return data.communicationTemplates
@@ -42,7 +46,10 @@ describe('communication-templates', () => {
         { ...templateOne, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('triage'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationCreateTemplate,
+            'triage',
+          ),
         },
       )
       await expect(moderatorReq).rejects.toThrow(
@@ -52,7 +59,10 @@ describe('communication-templates', () => {
         { ...templateOne, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('admin'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationCreateTemplate,
+            'admin',
+          ),
         },
       )
 
@@ -76,7 +86,10 @@ describe('communication-templates', () => {
         { ...templateTwo, createdBy: sc.dids.bob },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('admin'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationCreateTemplate,
+            'admin',
+          ),
         },
       )
 
@@ -91,7 +104,10 @@ describe('communication-templates', () => {
         { id: '1', updatedBy: sc.dids.bob, name: '1 Test template' },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('admin'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationUpdateTemplate,
+            'admin',
+          ),
         },
       )
 
@@ -105,7 +121,10 @@ describe('communication-templates', () => {
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('triage'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationDeleteTemplate,
+            'triage',
+          ),
         },
       )
 
@@ -117,7 +136,10 @@ describe('communication-templates', () => {
         { id: '1' },
         {
           encoding: 'application/json',
-          headers: await network.ozone.modHeaders('moderator'),
+          headers: await network.ozone.modHeaders(
+            ids.ToolsOzoneCommunicationDeleteTemplate,
+            'moderator',
+          ),
         },
       )
       const list = await listTemplates()

package/tests/get-config.test.ts

@@ -1,6 +1,7 @@
 import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
 import { TOOLS_OZONE_TEAM } from '../src/lexicon'
+import { ids } from '../src/lexicon/lexicons'
 
 describe('get-config', () => {
   let network: TestNetwork
@@ -25,7 +26,10 @@ describe('get-config', () => {
     const { data } = await agent.api.tools.ozone.server.getConfig(
       {},
       {
-        headers: await network.ozone.modHeaders(role),
+        headers: await network.ozone.modHeaders(
+          ids.ToolsOzoneServerGetConfig,
+          role,
+        ),
       },
     )
     return data

package/tests/get-lists.test.ts

@@ -8,6 +8,7 @@ import {
 } from '@atproto/dev-env'
 import { AtpAgent, BSKY_LABELER_DID } from '@atproto/api'
 import { TAKEDOWN_LABEL } from '../src/mod-service'
+import { ids } from '../src/lexicon/lexicons'
 
 describe('admin get lists', () => {
   let network: TestNetwork
@@ -42,7 +43,7 @@ describe('admin get lists', () => {
     const [{ data: fromOzone }, { data: fromAppview }] = await Promise.all([
       agent.api.app.bsky.graph.getLists(
         { actor: sc.dids.alice },
-        { headers: await ozone.modHeaders() },
+        { headers: await ozone.modHeaders(ids.AppBskyGraphGetLists) },
       ),
       appviewAgent.api.app.bsky.graph.getLists({ actor: sc.dids.alice }),
     ])