@atproto/api 0.6.2 → 0.6.4

package/dist/moderation/accumulator.d.ts

@@ -7,6 +7,7 @@ export declare class ModerationCauseAccumulator {
     setDid(did: string): void;
     addBlocking(blocking: string | undefined): void;
     addBlockedBy(blockedBy: boolean | undefined): void;
+    addBlockOther(blockOther: boolean | undefined): void;
     addLabel(label: Label, opts: ModerationOpts): void;
     addMuted(muted: boolean | undefined): void;
     addMutedByList(mutedByList: AppBskyGraphDefs.ListViewBasic | undefined): void;

package/dist/moderation/types.d.ts

@@ -61,6 +61,10 @@ export declare type ModerationCause = {
     type: 'blocked-by';
     source: ModerationCauseSource;
     priority: 4;
+} | {
+    type: 'block-other';
+    source: ModerationCauseSource;
+    priority: 4;
 } | {
     type: 'label';
     source: ModerationCauseSource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "main": "dist/index.js",
   "scripts": {
     "codegen": "yarn docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/client/lexicons.ts

@@ -28,6 +28,11 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:com.atproto.admin.defs#actionType',
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long this action was meant to be in effect before automatically expiring.',
+          },
           subject: {
             type: 'union',
             refs: [
@@ -96,6 +101,11 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:com.atproto.admin.defs#actionType',
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long this action was meant to be in effect before automatically expiring.',
+          },
           subject: {
             type: 'union',
             refs: [
@@ -159,6 +169,11 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:com.atproto.admin.defs#actionType',
           },
+          durationInHours: {
+            type: 'integer',
+            description:
+              'Indicates how long this action was meant to be in effect before automatically expiring.',
+          },
         },
       },
       actionReversal: {
@@ -1264,6 +1279,11 @@ export const schemaDict = {
               reason: {
                 type: 'string',
               },
+              durationInHours: {
+                type: 'integer',
+                description:
+                  'Indicates how long this action was meant to be in effect before automatically expiring.',
+              },
               createdBy: {
                 type: 'string',
                 format: 'did',
@@ -4283,22 +4303,34 @@ export const schemaDict = {
       },
       viewNotFound: {
         type: 'object',
-        required: ['uri'],
+        required: ['uri', 'notFound'],
         properties: {
           uri: {
             type: 'string',
             format: 'at-uri',
           },
+          notFound: {
+            type: 'boolean',
+            const: true,
+          },
         },
       },
       viewBlocked: {
         type: 'object',
-        required: ['uri'],
+        required: ['uri', 'blocked', 'author'],
         properties: {
           uri: {
             type: 'string',
             format: 'at-uri',
           },
+          blocked: {
+            type: 'boolean',
+            const: true,
+          },
+          author: {
+            type: 'ref',
+            ref: 'lex:app.bsky.feed.defs#blockedAuthor',
+          },
         },
       },
     },

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

@@ -84,6 +84,7 @@ export function validateViewRecord(v: unknown): ValidationResult {
 
 export interface ViewNotFound {
   uri: string
+  notFound: true
   [k: string]: unknown
 }
 
@@ -101,6 +102,8 @@ export function validateViewNotFound(v: unknown): ValidationResult {
 
 export interface ViewBlocked {
   uri: string
+  blocked: true
+  author: AppBskyFeedDefs.BlockedAuthor
   [k: string]: unknown
 }
 

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

@@ -13,6 +13,8 @@ import * as ComAtprotoLabelDefs from '../label/defs'
 export interface ActionView {
   id: number
   action: ActionType
+  /** Indicates how long this action was meant to be in effect before automatically expiring. */
+  durationInHours?: number
   subject:
     | RepoRef
     | ComAtprotoRepoStrongRef.Main
@@ -43,6 +45,8 @@ export function validateActionView(v: unknown): ValidationResult {
 export interface ActionViewDetail {
   id: number
   action: ActionType
+  /** Indicates how long this action was meant to be in effect before automatically expiring. */
+  durationInHours?: number
   subject:
     | RepoView
     | RepoViewNotFound
@@ -75,6 +79,8 @@ export function validateActionViewDetail(v: unknown): ValidationResult {
 export interface ActionViewCurrent {
   id: number
   action: ActionType
+  /** Indicates how long this action was meant to be in effect before automatically expiring. */
+  durationInHours?: number
   [k: string]: unknown
 }
 

package/src/client/types/com/atproto/admin/takeModerationAction.ts

@@ -25,6 +25,8 @@ export interface InputSchema {
   createLabelVals?: string[]
   negateLabelVals?: string[]
   reason: string
+  /** Indicates how long this action was meant to be in effect before automatically expiring. */
+  durationInHours?: number
   createdBy: string
   [k: string]: unknown
 }

package/src/moderation/accumulator.ts

@@ -38,6 +38,16 @@ export class ModerationCauseAccumulator {
     }
   }
 
+  addBlockOther(blockOther: boolean | undefined) {
+    if (blockOther) {
+      this.causes.push({
+        type: 'block-other',
+        source: { type: 'user' },
+        priority: 4,
+      })
+    }
+  }
+
   addLabel(label: Label, opts: ModerationOpts) {
     // look up the label definition
     const labelDef = LABELS[label.val]
@@ -134,7 +144,11 @@ export class ModerationCauseAccumulator {
     mod.additionalCauses = this.causes.slice(1)
 
     // blocked user
-    if (mod.cause.type === 'blocking' || mod.cause.type === 'blocked-by') {
+    if (
+      mod.cause.type === 'blocking' ||
+      mod.cause.type === 'blocked-by' ||
+      mod.cause.type === 'block-other'
+    ) {
       // filter and blur, dont allow override
       mod.filter = true
       mod.blur = true

package/src/moderation/subjects/quoted-post.ts

@@ -17,6 +17,15 @@ export function decideQuotedPost(
         acc.addLabel(label, opts)
       }
     }
+  } else if (AppBskyEmbedRecord.isViewBlocked(subject.record)) {
+    acc.setDid(subject.record.author.did)
+    if (subject.record.author.viewer?.blocking) {
+      acc.addBlocking(subject.record.author.viewer?.blocking)
+    } else if (subject.record.author.viewer?.blockedBy) {
+      acc.addBlockedBy(subject.record.author.viewer?.blockedBy)
+    } else {
+      acc.addBlockOther(true)
+    }
   }
 
   return acc.finalizeDecision(opts)
@@ -46,6 +55,15 @@ export function decideQuotedPostWithMedia(
         acc.addLabel(label, opts)
       }
     }
+  } else if (AppBskyEmbedRecord.isViewBlocked(subject.record.record)) {
+    acc.setDid(subject.record.record.author.did)
+    if (subject.record.record.author.viewer?.blocking) {
+      acc.addBlocking(subject.record.record.author.viewer?.blocking)
+    } else if (subject.record.record.author.viewer?.blockedBy) {
+      acc.addBlockedBy(subject.record.record.author.viewer?.blockedBy)
+    } else {
+      acc.addBlockOther(true)
+    }
   }
 
   return acc.finalizeDecision(opts)

package/src/moderation/types.ts

@@ -100,6 +100,7 @@ export type ModerationCauseSource =
 export type ModerationCause =
   | { type: 'blocking'; source: ModerationCauseSource; priority: 3 }
   | { type: 'blocked-by'; source: ModerationCauseSource; priority: 4 }
+  | { type: 'block-other'; source: ModerationCauseSource; priority: 4 }
   | {
       type: 'label'
       source: ModerationCauseSource

package/src/moderation/util.ts

@@ -70,25 +70,13 @@ export function isModerationDecisionNoop(
 }
 
 export function isQuotedPost(embed: unknown): embed is AppBskyEmbedRecord.View {
-  return Boolean(
-    embed &&
-      AppBskyEmbedRecord.isView(embed) &&
-      AppBskyEmbedRecord.isViewRecord(embed.record) &&
-      AppBskyFeedPost.isRecord(embed.record.value) &&
-      AppBskyFeedPost.validateRecord(embed.record.value).success,
-  )
+  return Boolean(embed && AppBskyEmbedRecord.isView(embed))
 }
 
 export function isQuotedPostWithMedia(
   embed: unknown,
 ): embed is AppBskyEmbedRecordWithMedia.View {
-  return Boolean(
-    embed &&
-      AppBskyEmbedRecordWithMedia.isView(embed) &&
-      AppBskyEmbedRecord.isViewRecord(embed.record.record) &&
-      AppBskyFeedPost.isRecord(embed.record.record.value) &&
-      AppBskyFeedPost.validateRecord(embed.record.record.value).success,
-  )
+  return Boolean(embed && AppBskyEmbedRecordWithMedia.isView(embed))
 }
 
 export function toModerationUI(decision: ModerationDecision): ModerationUI {