@atproto/bsky 0.0.15 → 0.0.17

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

@@ -48,6 +48,7 @@ export function validatePostView(v: unknown): ValidationResult {
 export interface ViewerState {
   repost?: string
   like?: string
+  replyDisabled?: boolean
   [k: string]: unknown
 }
 
@@ -137,7 +138,6 @@ export interface ThreadViewPost {
     | BlockedPost
     | { $type: string; [k: string]: unknown }
   )[]
-  viewer?: ViewerThreadState
   [k: string]: unknown
 }
 
@@ -208,23 +208,6 @@ export function validateBlockedAuthor(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.feed.defs#blockedAuthor', v)
 }
 
-export interface ViewerThreadState {
-  canReply?: boolean
-  [k: string]: unknown
-}
-
-export function isViewerThreadState(v: unknown): v is ViewerThreadState {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'app.bsky.feed.defs#viewerThreadState'
-  )
-}
-
-export function validateViewerThreadState(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.defs#viewerThreadState', v)
-}
-
 export interface GeneratorView {
   uri: string
   cid: string

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

@@ -58,6 +58,7 @@ export function validateListView(v: unknown): ValidationResult {
 }
 
 export interface ListItemView {
+  uri: string
   subject: AppBskyActorDefs.ProfileView
   [k: string]: unknown
 }

package/src/lexicon/types/com/atproto/admin/defs.ts

@@ -28,43 +28,55 @@ export function validateStatusAttr(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#statusAttr', v)
 }
 
-export interface ActionView {
+export interface ModEventView {
   id: number
-  action: ActionType
-  /** Indicates how long this action is meant to be in effect before automatically expiring. */
-  durationInHours?: number
+  event:
+    | ModEventTakedown
+    | ModEventReverseTakedown
+    | ModEventComment
+    | ModEventReport
+    | ModEventLabel
+    | ModEventAcknowledge
+    | ModEventEscalate
+    | ModEventMute
+    | ModEventEmail
+    | { $type: string; [k: string]: unknown }
   subject:
     | RepoRef
     | ComAtprotoRepoStrongRef.Main
     | { $type: string; [k: string]: unknown }
   subjectBlobCids: string[]
-  createLabelVals?: string[]
-  negateLabelVals?: string[]
-  reason: string
   createdBy: string
   createdAt: string
-  reversal?: ActionReversal
-  resolvedReportIds: number[]
+  creatorHandle?: string
+  subjectHandle?: string
   [k: string]: unknown
 }
 
-export function isActionView(v: unknown): v is ActionView {
+export function isModEventView(v: unknown): v is ModEventView {
   return (
     isObj(v) &&
     hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#actionView'
+    v.$type === 'com.atproto.admin.defs#modEventView'
   )
 }
 
-export function validateActionView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#actionView', v)
+export function validateModEventView(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventView', v)
 }
 
-export interface ActionViewDetail {
+export interface ModEventViewDetail {
   id: number
-  action: ActionType
-  /** Indicates how long this action is meant to be in effect before automatically expiring. */
-  durationInHours?: number
+  event:
+    | ModEventTakedown
+    | ModEventReverseTakedown
+    | ModEventComment
+    | ModEventReport
+    | ModEventLabel
+    | ModEventAcknowledge
+    | ModEventEscalate
+    | ModEventMute
+    | { $type: string; [k: string]: unknown }
   subject:
     | RepoView
     | RepoViewNotFound
@@ -72,123 +84,100 @@ export interface ActionViewDetail {
     | RecordViewNotFound
     | { $type: string; [k: string]: unknown }
   subjectBlobs: BlobView[]
-  createLabelVals?: string[]
-  negateLabelVals?: string[]
-  reason: string
   createdBy: string
   createdAt: string
-  reversal?: ActionReversal
-  resolvedReports: ReportView[]
   [k: string]: unknown
 }
 
-export function isActionViewDetail(v: unknown): v is ActionViewDetail {
+export function isModEventViewDetail(v: unknown): v is ModEventViewDetail {
   return (
     isObj(v) &&
     hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#actionViewDetail'
+    v.$type === 'com.atproto.admin.defs#modEventViewDetail'
   )
 }
 
-export function validateActionViewDetail(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#actionViewDetail', v)
+export function validateModEventViewDetail(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventViewDetail', v)
 }
 
-export interface ActionViewCurrent {
+export interface ReportView {
   id: number
-  action: ActionType
-  /** Indicates how long this action is meant to be in effect before automatically expiring. */
-  durationInHours?: number
-  [k: string]: unknown
-}
-
-export function isActionViewCurrent(v: unknown): v is ActionViewCurrent {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#actionViewCurrent'
-  )
-}
-
-export function validateActionViewCurrent(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#actionViewCurrent', v)
-}
-
-export interface ActionReversal {
-  reason: string
-  createdBy: string
+  reasonType: ComAtprotoModerationDefs.ReasonType
+  comment?: string
+  subjectRepoHandle?: string
+  subject:
+    | RepoRef
+    | ComAtprotoRepoStrongRef.Main
+    | { $type: string; [k: string]: unknown }
+  reportedBy: string
   createdAt: string
+  resolvedByActionIds: number[]
   [k: string]: unknown
 }
 
-export function isActionReversal(v: unknown): v is ActionReversal {
+export function isReportView(v: unknown): v is ReportView {
   return (
     isObj(v) &&
     hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#actionReversal'
+    v.$type === 'com.atproto.admin.defs#reportView'
   )
 }
 
-export function validateActionReversal(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#actionReversal', v)
+export function validateReportView(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#reportView', v)
 }
 
-export type ActionType =
-  | 'lex:com.atproto.admin.defs#takedown'
-  | 'lex:com.atproto.admin.defs#flag'
-  | 'lex:com.atproto.admin.defs#acknowledge'
-  | 'lex:com.atproto.admin.defs#escalate'
-  | (string & {})
-
-/** Moderation action type: Takedown. Indicates that content should not be served by the PDS. */
-export const TAKEDOWN = 'com.atproto.admin.defs#takedown'
-/** Moderation action type: Flag. Indicates that the content was reviewed and considered to violate PDS rules, but may still be served. */
-export const FLAG = 'com.atproto.admin.defs#flag'
-/** Moderation action type: Acknowledge. Indicates that the content was reviewed and not considered to violate PDS rules. */
-export const ACKNOWLEDGE = 'com.atproto.admin.defs#acknowledge'
-/** Moderation action type: Escalate. Indicates that the content has been flagged for additional review. */
-export const ESCALATE = 'com.atproto.admin.defs#escalate'
-
-export interface ReportView {
+export interface SubjectStatusView {
   id: number
-  reasonType: ComAtprotoModerationDefs.ReasonType
-  reason?: string
-  subjectRepoHandle?: string
   subject:
     | RepoRef
     | ComAtprotoRepoStrongRef.Main
     | { $type: string; [k: string]: unknown }
-  reportedBy: string
+  subjectBlobCids?: string[]
+  subjectRepoHandle?: string
+  /** Timestamp referencing when the last update was made to the moderation status of the subject */
+  updatedAt: string
+  /** Timestamp referencing the first moderation status impacting event was emitted on the subject */
   createdAt: string
-  resolvedByActionIds: number[]
+  reviewState: SubjectReviewState
+  /** Sticky comment on the subject. */
+  comment?: string
+  muteUntil?: string
+  lastReviewedBy?: string
+  lastReviewedAt?: string
+  lastReportedAt?: string
+  takendown?: boolean
+  suspendUntil?: string
   [k: string]: unknown
 }
 
-export function isReportView(v: unknown): v is ReportView {
+export function isSubjectStatusView(v: unknown): v is SubjectStatusView {
   return (
     isObj(v) &&
     hasProp(v, '$type') &&
-    v.$type === 'com.atproto.admin.defs#reportView'
+    v.$type === 'com.atproto.admin.defs#subjectStatusView'
   )
 }
 
-export function validateReportView(v: unknown): ValidationResult {
-  return lexicons.validate('com.atproto.admin.defs#reportView', v)
+export function validateSubjectStatusView(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#subjectStatusView', v)
 }
 
 export interface ReportViewDetail {
   id: number
   reasonType: ComAtprotoModerationDefs.ReasonType
-  reason?: string
+  comment?: string
   subject:
     | RepoView
     | RepoViewNotFound
     | RecordView
     | RecordViewNotFound
     | { $type: string; [k: string]: unknown }
+  subjectStatus?: SubjectStatusView
   reportedBy: string
   createdAt: string
-  resolvedByActions: ActionView[]
+  resolvedByActions: ModEventView[]
   [k: string]: unknown
 }
 
@@ -400,7 +389,7 @@ export function validateRecordViewNotFound(v: unknown): ValidationResult {
 }
 
 export interface Moderation {
-  currentAction?: ActionViewCurrent
+  subjectStatus?: SubjectStatusView
   [k: string]: unknown
 }
 
@@ -417,9 +406,7 @@ export function validateModeration(v: unknown): ValidationResult {
 }
 
 export interface ModerationDetail {
-  currentAction?: ActionViewCurrent
-  actions: ActionView[]
-  reports: ReportView[]
+  subjectStatus?: SubjectStatusView
   [k: string]: unknown
 }
 
@@ -496,3 +483,208 @@ export function isVideoDetails(v: unknown): v is VideoDetails {
 export function validateVideoDetails(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#videoDetails', v)
 }
+
+export type SubjectReviewState =
+  | 'lex:com.atproto.admin.defs#reviewOpen'
+  | 'lex:com.atproto.admin.defs#reviewEscalated'
+  | 'lex:com.atproto.admin.defs#reviewClosed'
+  | (string & {})
+
+/** Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator */
+export const REVIEWOPEN = 'com.atproto.admin.defs#reviewOpen'
+/** Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator */
+export const REVIEWESCALATED = 'com.atproto.admin.defs#reviewEscalated'
+/** Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator */
+export const REVIEWCLOSED = 'com.atproto.admin.defs#reviewClosed'
+
+/** Take down a subject permanently or temporarily */
+export interface ModEventTakedown {
+  comment?: string
+  /** Indicates how long the takedown should be in effect before automatically expiring. */
+  durationInHours?: number
+  [k: string]: unknown
+}
+
+export function isModEventTakedown(v: unknown): v is ModEventTakedown {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventTakedown'
+  )
+}
+
+export function validateModEventTakedown(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventTakedown', v)
+}
+
+/** Revert take down action on a subject */
+export interface ModEventReverseTakedown {
+  /** Describe reasoning behind the reversal. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventReverseTakedown(
+  v: unknown,
+): v is ModEventReverseTakedown {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventReverseTakedown'
+  )
+}
+
+export function validateModEventReverseTakedown(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventReverseTakedown', v)
+}
+
+/** Add a comment to a subject */
+export interface ModEventComment {
+  comment: string
+  /** Make the comment persistent on the subject */
+  sticky?: boolean
+  [k: string]: unknown
+}
+
+export function isModEventComment(v: unknown): v is ModEventComment {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventComment'
+  )
+}
+
+export function validateModEventComment(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventComment', v)
+}
+
+/** Report a subject */
+export interface ModEventReport {
+  comment?: string
+  reportType: ComAtprotoModerationDefs.ReasonType
+  [k: string]: unknown
+}
+
+export function isModEventReport(v: unknown): v is ModEventReport {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventReport'
+  )
+}
+
+export function validateModEventReport(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventReport', v)
+}
+
+/** Apply/Negate labels on a subject */
+export interface ModEventLabel {
+  comment?: string
+  createLabelVals: string[]
+  negateLabelVals: string[]
+  [k: string]: unknown
+}
+
+export function isModEventLabel(v: unknown): v is ModEventLabel {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventLabel'
+  )
+}
+
+export function validateModEventLabel(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventLabel', v)
+}
+
+export interface ModEventAcknowledge {
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventAcknowledge(v: unknown): v is ModEventAcknowledge {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventAcknowledge'
+  )
+}
+
+export function validateModEventAcknowledge(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventAcknowledge', v)
+}
+
+export interface ModEventEscalate {
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventEscalate(v: unknown): v is ModEventEscalate {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventEscalate'
+  )
+}
+
+export function validateModEventEscalate(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventEscalate', v)
+}
+
+/** Mute incoming reports on a subject */
+export interface ModEventMute {
+  comment?: string
+  /** Indicates how long the subject should remain muted. */
+  durationInHours: number
+  [k: string]: unknown
+}
+
+export function isModEventMute(v: unknown): v is ModEventMute {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventMute'
+  )
+}
+
+export function validateModEventMute(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventMute', v)
+}
+
+/** Unmute action on a subject */
+export interface ModEventUnmute {
+  /** Describe reasoning behind the reversal. */
+  comment?: string
+  [k: string]: unknown
+}
+
+export function isModEventUnmute(v: unknown): v is ModEventUnmute {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventUnmute'
+  )
+}
+
+export function validateModEventUnmute(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventUnmute', v)
+}
+
+/** Keep a log of outgoing email to a user */
+export interface ModEventEmail {
+  /** The subject line of the email sent to the user. */
+  subjectLine: string
+  [k: string]: unknown
+}
+
+export function isModEventEmail(v: unknown): v is ModEventEmail {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#modEventEmail'
+  )
+}
+
+export function validateModEventEmail(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#modEventEmail', v)
+}

package/src/lexicon/types/com/atproto/admin/{resolveModerationReports.ts → deleteAccount.ts}

@@ -7,36 +7,25 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
 
 export interface QueryParams {}
 
 export interface InputSchema {
-  actionId: number
-  reportIds: number[]
-  createdBy: string
+  did: string
   [k: string]: unknown
 }
 
-export type OutputSchema = ComAtprotoAdminDefs.ActionView
-
 export interface HandlerInput {
   encoding: 'application/json'
   body: InputSchema
 }
 
-export interface HandlerSuccess {
-  encoding: 'application/json'
-  body: OutputSchema
-  headers?: { [key: string]: string }
-}
-
 export interface HandlerError {
   status: number
   message?: string
 }
 
-export type HandlerOutput = HandlerError | HandlerSuccess
+export type HandlerOutput = HandlerError | void
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   auth: HA
   params: QueryParams

package/src/lexicon/types/com/atproto/admin/{takeModerationAction.ts → emitModerationEvent.ts}

@@ -13,26 +13,28 @@ import * as ComAtprotoRepoStrongRef from '../repo/strongRef'
 export interface QueryParams {}
 
 export interface InputSchema {
-  action:
-    | 'com.atproto.admin.defs#takedown'
-    | 'com.atproto.admin.defs#flag'
-    | 'com.atproto.admin.defs#acknowledge'
-    | (string & {})
+  event:
+    | ComAtprotoAdminDefs.ModEventTakedown
+    | ComAtprotoAdminDefs.ModEventAcknowledge
+    | ComAtprotoAdminDefs.ModEventEscalate
+    | ComAtprotoAdminDefs.ModEventComment
+    | ComAtprotoAdminDefs.ModEventLabel
+    | ComAtprotoAdminDefs.ModEventReport
+    | ComAtprotoAdminDefs.ModEventMute
+    | ComAtprotoAdminDefs.ModEventReverseTakedown
+    | ComAtprotoAdminDefs.ModEventUnmute
+    | ComAtprotoAdminDefs.ModEventEmail
+    | { $type: string; [k: string]: unknown }
   subject:
     | ComAtprotoAdminDefs.RepoRef
     | ComAtprotoRepoStrongRef.Main
     | { $type: string; [k: string]: unknown }
   subjectBlobCids?: string[]
-  createLabelVals?: string[]
-  negateLabelVals?: string[]
-  reason: string
-  /** Indicates how long this action is meant to be in effect before automatically expiring. */
-  durationInHours?: number
   createdBy: string
   [k: string]: unknown
 }
 
-export type OutputSchema = ComAtprotoAdminDefs.ActionView
+export type OutputSchema = ComAtprotoAdminDefs.ModEventView
 
 export interface HandlerInput {
   encoding: 'application/json'

package/src/lexicon/types/com/atproto/admin/{getModerationReport.ts → getModerationEvent.ts}

@@ -14,7 +14,7 @@ export interface QueryParams {
 }
 
 export type InputSchema = undefined
-export type OutputSchema = ComAtprotoAdminDefs.ReportViewDetail
+export type OutputSchema = ComAtprotoAdminDefs.ModEventViewDetail
 export type HandlerInput = undefined
 
 export interface HandlerSuccess {

package/src/lexicon/types/com/atproto/admin/{getModerationActions.ts → queryModerationEvents.ts}

@@ -10,7 +10,14 @@ import { HandlerAuth } from '@atproto/xrpc-server'
 import * as ComAtprotoAdminDefs from './defs'
 
 export interface QueryParams {
+  /** The types of events (fully qualified string in the format of com.atproto.admin#modEvent<name>) to filter by. If not specified, all events are returned. */
+  types?: string[]
+  createdBy?: string
+  /** Sort direction for the events. Defaults to descending order of created at timestamp. */
+  sortDirection: 'asc' | 'desc'
   subject?: string
+  /** If true, events on all record types (posts, lists, profile etc.) owned by the did are returned */
+  includeAllUserRecords: boolean
   limit: number
   cursor?: string
 }
@@ -19,7 +26,7 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   cursor?: string
-  actions: ComAtprotoAdminDefs.ActionView[]
+  events: ComAtprotoAdminDefs.ModEventView[]
   [k: string]: unknown
 }
 

package/src/lexicon/types/com/atproto/admin/{getModerationReports.ts → queryModerationStatuses.ts}

@@ -11,29 +11,36 @@ import * as ComAtprotoAdminDefs from './defs'
 
 export interface QueryParams {
   subject?: string
+  /** Search subjects by keyword from comments */
+  comment?: string
+  /** Search subjects reported after a given timestamp */
+  reportedAfter?: string
+  /** Search subjects reported before a given timestamp */
+  reportedBefore?: string
+  /** Search subjects reviewed after a given timestamp */
+  reviewedAfter?: string
+  /** Search subjects reviewed before a given timestamp */
+  reviewedBefore?: string
+  /** By default, we don't include muted subjects in the results. Set this to true to include them. */
+  includeMuted?: boolean
+  /** Specify when fetching subjects in a certain state */
+  reviewState?: string
   ignoreSubjects?: string[]
-  /** Get all reports that were actioned by a specific moderator. */
-  actionedBy?: string
-  /** Filter reports made by one or more DIDs. */
-  reporters?: string[]
-  resolved?: boolean
-  actionType?:
-    | 'com.atproto.admin.defs#takedown'
-    | 'com.atproto.admin.defs#flag'
-    | 'com.atproto.admin.defs#acknowledge'
-    | 'com.atproto.admin.defs#escalate'
-    | (string & {})
+  /** Get all subject statuses that were reviewed by a specific moderator */
+  lastReviewedBy?: string
+  sortField: 'lastReviewedAt' | 'lastReportedAt'
+  sortDirection: 'asc' | 'desc'
+  /** Get subjects that were taken down */
+  takendown?: boolean
   limit: number
   cursor?: string
-  /** Reverse the order of the returned records. When true, returns reports in chronological order. */
-  reverse?: boolean
 }
 
 export type InputSchema = undefined
 
 export interface OutputSchema {
   cursor?: string
-  reports: ComAtprotoAdminDefs.ReportView[]
+  subjectStatuses: ComAtprotoAdminDefs.SubjectStatusView[]
   [k: string]: unknown
 }
 

package/src/lexicon/types/com/atproto/admin/sendEmail.ts

@@ -14,6 +14,7 @@ export interface InputSchema {
   recipientDid: string
   content: string
   subject?: string
+  senderDid: string
   [k: string]: unknown
 }