@atproto/pds 0.4.17 → 0.4.19

package/src/lexicon/lexicons.ts

@@ -4833,6 +4833,12 @@ export const schemaDict = {
               'lex:app.bsky.feed.defs#blockedPost',
             ],
           },
+          grandparentAuthor: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileViewBasic',
+            description:
+              'When parent is a reply to another post, this is the author of that post.',
+          },
         },
       },
       reasonRepost: {
@@ -8408,6 +8414,9 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventAcknowledge',
               'lex:tools.ozone.moderation.defs#modEventEscalate',
               'lex:tools.ozone.moderation.defs#modEventMute',
+              'lex:tools.ozone.moderation.defs#modEventUnmute',
+              'lex:tools.ozone.moderation.defs#modEventMuteReporter',
+              'lex:tools.ozone.moderation.defs#modEventUnmuteReporter',
               'lex:tools.ozone.moderation.defs#modEventEmail',
               'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
               'lex:tools.ozone.moderation.defs#modEventDivert',
@@ -8467,6 +8476,9 @@ export const schemaDict = {
               'lex:tools.ozone.moderation.defs#modEventAcknowledge',
               'lex:tools.ozone.moderation.defs#modEventEscalate',
               'lex:tools.ozone.moderation.defs#modEventMute',
+              'lex:tools.ozone.moderation.defs#modEventUnmute',
+              'lex:tools.ozone.moderation.defs#modEventMuteReporter',
+              'lex:tools.ozone.moderation.defs#modEventUnmuteReporter',
               'lex:tools.ozone.moderation.defs#modEventEmail',
               'lex:tools.ozone.moderation.defs#modEventResolveAppeal',
               'lex:tools.ozone.moderation.defs#modEventDivert',
@@ -8546,6 +8558,10 @@ export const schemaDict = {
             type: 'string',
             format: 'datetime',
           },
+          muteReportingUntil: {
+            type: 'string',
+            format: 'datetime',
+          },
           lastReviewedBy: {
             type: 'string',
             format: 'did',
@@ -8669,6 +8685,11 @@ export const schemaDict = {
           comment: {
             type: 'string',
           },
+          isReporterMuted: {
+            type: 'boolean',
+            description:
+              "Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject.",
+          },
           reportType: {
             type: 'ref',
             ref: 'lex:com.atproto.moderation.defs#reasonType',
@@ -8737,6 +8758,30 @@ export const schemaDict = {
           },
         },
       },
+      modEventMuteReporter: {
+        type: 'object',
+        description: 'Mute incoming reports from an account',
+        required: ['durationInHours'],
+        properties: {
+          comment: {
+            type: 'string',
+          },
+          durationInHours: {
+            type: 'integer',
+            description: 'Indicates how long the account should remain muted.',
+          },
+        },
+      },
+      modEventUnmuteReporter: {
+        type: 'object',
+        description: 'Unmute incoming reports from an account',
+        properties: {
+          comment: {
+            type: 'string',
+            description: 'Describe reasoning behind the reversal.',
+          },
+        },
+      },
       modEventEmail: {
         type: 'object',
         description: 'Keep a log of outgoing email to a user',
@@ -9121,8 +9166,10 @@ export const schemaDict = {
                   'lex:tools.ozone.moderation.defs#modEventLabel',
                   'lex:tools.ozone.moderation.defs#modEventReport',
                   'lex:tools.ozone.moderation.defs#modEventMute',
-                  'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventUnmute',
+                  'lex:tools.ozone.moderation.defs#modEventMuteReporter',
+                  'lex:tools.ozone.moderation.defs#modEventUnmuteReporter',
+                  'lex:tools.ozone.moderation.defs#modEventReverseTakedown',
                   'lex:tools.ozone.moderation.defs#modEventEmail',
                   'lex:tools.ozone.moderation.defs#modEventTag',
                 ],
@@ -9429,6 +9476,11 @@ export const schemaDict = {
               description:
                 "By default, we don't include muted subjects in the results. Set this to true to include them.",
             },
+            onlyMuted: {
+              type: 'boolean',
+              description:
+                'When set to true, only muted subjects and reporters will be returned.',
+            },
             reviewState: {
               type: 'string',
               description: 'Specify when fetching subjects in a certain state',

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

@@ -97,6 +97,7 @@ export interface ReplyRef {
     | NotFoundPost
     | BlockedPost
     | { $type: string; [k: string]: unknown }
+  grandparentAuthor?: AppBskyActorDefs.ProfileViewBasic
   [k: string]: unknown
 }
 

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -22,6 +22,9 @@ export interface ModEventView {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventUnmute
+    | ModEventMuteReporter
+    | ModEventUnmuteReporter
     | ModEventEmail
     | ModEventResolveAppeal
     | ModEventDivert
@@ -61,6 +64,9 @@ export interface ModEventViewDetail {
     | ModEventAcknowledge
     | ModEventEscalate
     | ModEventMute
+    | ModEventUnmute
+    | ModEventMuteReporter
+    | ModEventUnmuteReporter
     | ModEventEmail
     | ModEventResolveAppeal
     | ModEventDivert
@@ -105,6 +111,7 @@ export interface SubjectStatusView {
   /** Sticky comment on the subject. */
   comment?: string
   muteUntil?: string
+  muteReportingUntil?: string
   lastReviewedBy?: string
   lastReviewedAt?: string
   lastReportedAt?: string
@@ -237,6 +244,8 @@ export function validateModEventComment(v: unknown): ValidationResult {
 /** Report a subject */
 export interface ModEventReport {
   comment?: string
+  /** Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. */
+  isReporterMuted?: boolean
   reportType: ComAtprotoModerationDefs.ReasonType
   [k: string]: unknown
 }
@@ -346,6 +355,53 @@ export function validateModEventUnmute(v: unknown): ValidationResult {
   return lexicons.validate('tools.ozone.moderation.defs#modEventUnmute', v)
 }
 
+/** Mute incoming reports from an account */
+export interface ModEventMuteReporter {
+  comment?: string
+  /** Indicates how long the account should remain muted. */
+  durationInHours: number
+  [k: string]: unknown
+}
+
+export function isModEventMuteReporter(v: unknown): v is ModEventMuteReporter {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventMuteReporter'
+  )
+}
+
+export function validateModEventMuteReporter(v: unknown): ValidationResult {
+  return lexicons.validate(
+    'tools.ozone.moderation.defs#modEventMuteReporter',
+    v,
+  )
+}
+
+/** Unmute incoming reports from an account */
+export interface ModEventUnmuteReporter {
+  /** Describe reasoning behind the reversal. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventUnmuteReporter(
+  v: unknown,
+): v is ModEventUnmuteReporter {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'tools.ozone.moderation.defs#modEventUnmuteReporter'
+  )
+}
+
+export function validateModEventUnmuteReporter(v: unknown): ValidationResult {
+  return lexicons.validate(
+    'tools.ozone.moderation.defs#modEventUnmuteReporter',
+    v,
+  )
+}
+
 /** Keep a log of outgoing email to a user */
 export interface ModEventEmail {
   /** The subject line of the email sent to the user. */

package/src/lexicon/types/tools/ozone/moderation/emitEvent.ts

@@ -22,8 +22,10 @@ export interface InputSchema {
     | ToolsOzoneModerationDefs.ModEventLabel
     | ToolsOzoneModerationDefs.ModEventReport
     | ToolsOzoneModerationDefs.ModEventMute
-    | ToolsOzoneModerationDefs.ModEventReverseTakedown
     | ToolsOzoneModerationDefs.ModEventUnmute
+    | ToolsOzoneModerationDefs.ModEventMuteReporter
+    | ToolsOzoneModerationDefs.ModEventUnmuteReporter
+    | ToolsOzoneModerationDefs.ModEventReverseTakedown
     | ToolsOzoneModerationDefs.ModEventEmail
     | ToolsOzoneModerationDefs.ModEventTag
     | { $type: string; [k: string]: unknown }

package/src/lexicon/types/tools/ozone/moderation/queryStatuses.ts

@@ -23,6 +23,8 @@ export interface QueryParams {
   reviewedBefore?: string
   /** By default, we don't include muted subjects in the results. Set this to true to include them. */
   includeMuted?: boolean
+  /** When set to true, only muted subjects and reporters will be returned. */
+  onlyMuted?: boolean
   /** Specify when fetching subjects in a certain state */
   reviewState?: string
   ignoreSubjects?: string[]

package/src/pipethrough.ts

@@ -9,6 +9,14 @@ import { httpLogger } from './logger'
 import { getServiceEndpoint, noUndefinedVals } from '@atproto/common'
 import AppContext from './context'
 
+type PipethroughOptions = {
+  /**
+   * Request headers to pass-through, in addition to those defined in
+   * {@link REQ_HEADERS_TO_FORWARD}
+   */
+  reqHeadersToForward?: string[]
+}
+
 const defaultService = (
   ctx: AppContext,
   path: string,
@@ -39,12 +47,14 @@ export const pipethrough = async (
   req: express.Request,
   requester?: string,
   audOverride?: string,
+  options?: PipethroughOptions,
 ): Promise<HandlerPipeThrough> => {
   const { url, headers } = await createUrlAndHeaders(
     ctx,
     req,
     requester,
     audOverride,
+    options,
   )
   const reqInit: RequestInit = {
     headers,
@@ -106,6 +116,7 @@ export const createUrlAndHeaders = async (
   req: express.Request,
   requester?: string,
   audOverride?: string,
+  options?: PipethroughOptions,
 ): Promise<{ url: URL; headers: { authorization?: string } }> => {
   const proxyTo = await parseProxyHeader(ctx, req)
   const defaultProxy = defaultService(ctx, req.path)
@@ -121,8 +132,11 @@ export const createUrlAndHeaders = async (
   const headers = requester
     ? (await ctx.serviceAuthHeaders(requester, aud)).headers
     : {}
+  const allowedHeaders = REQ_HEADERS_TO_FORWARD.concat(
+    options?.reqHeadersToForward ?? [],
+  )
   // forward select headers to upstream services
-  for (const header of REQ_HEADERS_TO_FORWARD) {
+  for (const header of allowedHeaders) {
     const val = req.headers[header]
     if (val) {
       headers[header] = val

package/tests/proxied/__snapshots__/admin.test.ts.snap

@@ -50,6 +50,7 @@ Array [
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
       "comment": "impersonation",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonOther",
     },
     "id": 3,
@@ -63,6 +64,7 @@ Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
     "createdBy": "user(3)",
+    "creatorHandle": "mod-authority.test",
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [
@@ -85,6 +87,7 @@ Array [
     "creatorHandle": "alice.test",
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventReport",
+      "isReporterMuted": false,
       "reportType": "com.atproto.moderation.defs#reasonSpam",
     },
     "id": 1,
@@ -164,6 +167,7 @@ Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
     "createdBy": "user(0)",
+    "creatorHandle": "mod-authority.test",
     "event": Object {
       "$type": "tools.ozone.moderation.defs#modEventTag",
       "add": Array [

package/tests/proxied/__snapshots__/views.test.ts.snap

@@ -203,6 +203,21 @@ Array [
       "muted": false,
     },
   },
+  Object {
+    "associated": Object {
+      "labeler": true,
+    },
+    "description": "The pretend version of mod.bsky.app",
+    "did": "user(6)",
+    "displayName": "Dev-env Moderation",
+    "handle": "mod-authority.test",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "labels": Array [],
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
 ]
 `;
 
@@ -275,6 +290,19 @@ Array [
       "muted": false,
     },
   },
+  Object {
+    "associated": Object {
+      "labeler": true,
+    },
+    "did": "user(6)",
+    "displayName": "Dev-env Moderation",
+    "handle": "mod-authority.test",
+    "labels": Array [],
+    "viewer": Object {
+      "blockedBy": false,
+      "muted": false,
+    },
+  },
 ]
 `;
 
@@ -709,6 +737,32 @@ Object {
         "viewer": Object {},
       },
       "reply": Object {
+        "grandparentAuthor": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "did": "user(0)",
+          "displayName": "ali",
+          "handle": "alice.test",
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
+          "viewer": Object {
+            "blockedBy": false,
+            "muted": false,
+          },
+        },
         "parent": Object {
           "$type": "app.bsky.feed.defs#postView",
           "author": Object {
@@ -1567,6 +1621,32 @@ Object {
         "indexedAt": "1970-01-01T00:00:00.000Z",
       },
       "reply": Object {
+        "grandparentAuthor": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "did": "user(0)",
+          "displayName": "ali",
+          "handle": "alice.test",
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
+          "viewer": Object {
+            "blockedBy": false,
+            "muted": false,
+          },
+        },
         "parent": Object {
           "$type": "app.bsky.feed.defs#postView",
           "author": Object {
@@ -1982,6 +2062,32 @@ Object {
         "viewer": Object {},
       },
       "reply": Object {
+        "grandparentAuthor": Object {
+          "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+          "did": "user(0)",
+          "displayName": "ali",
+          "handle": "alice.test",
+          "labels": Array [
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-a",
+            },
+            Object {
+              "cid": "cids(2)",
+              "cts": "1970-01-01T00:00:00.000Z",
+              "src": "user(0)",
+              "uri": "record(1)",
+              "val": "self-label-b",
+            },
+          ],
+          "viewer": Object {
+            "blockedBy": false,
+            "muted": false,
+          },
+        },
         "parent": Object {
           "$type": "app.bsky.feed.defs#postView",
           "author": Object {