@atproto/api 0.12.26-next.0 → 0.12.27

package/src/client/lexicons.ts

@@ -4341,6 +4341,9 @@ export const schemaDict = {
         description: 'A word that the account owner has muted.',
         required: ['value', 'targets'],
         properties: {
+          id: {
+            type: 'string',
+          },
           value: {
             type: 'string',
             description: 'The muted word itself.',
@@ -4355,6 +4358,19 @@ export const schemaDict = {
               ref: 'lex:app.bsky.actor.defs#mutedWordTarget',
             },
           },
+          actorTarget: {
+            type: 'string',
+            description:
+              'Groups of users to apply the muted word to. If undefined, applies to all users.',
+            knownValues: ['all', 'exclude-following'],
+            default: 'all',
+          },
+          expiresAt: {
+            type: 'string',
+            format: 'datetime',
+            description:
+              'The date and time at which the muted word will expire and no longer be applied.',
+          },
         },
       },
       mutedWordsPref: {
@@ -4762,28 +4778,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyEmbedDefs: {
-    lexicon: 1,
-    id: 'app.bsky.embed.defs',
-    defs: {
-      aspectRatio: {
-        type: 'object',
-        description:
-          'width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit.',
-        required: ['width', 'height'],
-        properties: {
-          width: {
-            type: 'integer',
-            minimum: 1,
-          },
-          height: {
-            type: 'integer',
-            minimum: 1,
-          },
-        },
-      },
-    },
-  },
   AppBskyEmbedExternal: {
     lexicon: 1,
     id: 'app.bsky.embed.external',
@@ -4888,7 +4882,23 @@ export const schemaDict = {
           },
           aspectRatio: {
             type: 'ref',
-            ref: 'lex:app.bsky.embed.defs#aspectRatio',
+            ref: 'lex:app.bsky.embed.images#aspectRatio',
+          },
+        },
+      },
+      aspectRatio: {
+        type: 'object',
+        description:
+          'width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit.',
+        required: ['width', 'height'],
+        properties: {
+          width: {
+            type: 'integer',
+            minimum: 1,
+          },
+          height: {
+            type: 'integer',
+            minimum: 1,
           },
         },
       },
@@ -4929,7 +4939,7 @@ export const schemaDict = {
           },
           aspectRatio: {
             type: 'ref',
-            ref: 'lex:app.bsky.embed.defs#aspectRatio',
+            ref: 'lex:app.bsky.embed.images#aspectRatio',
           },
         },
       },
@@ -5011,7 +5021,6 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.embed.images#view',
-                'lex:app.bsky.embed.video#view',
                 'lex:app.bsky.embed.external#view',
                 'lex:app.bsky.embed.record#view',
                 'lex:app.bsky.embed.recordWithMedia#view',
@@ -5074,11 +5083,7 @@ export const schemaDict = {
           },
           media: {
             type: 'union',
-            refs: [
-              'lex:app.bsky.embed.images',
-              'lex:app.bsky.embed.video',
-              'lex:app.bsky.embed.external',
-            ],
+            refs: ['lex:app.bsky.embed.images', 'lex:app.bsky.embed.external'],
           },
         },
       },
@@ -5094,7 +5099,6 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:app.bsky.embed.images#view',
-              'lex:app.bsky.embed.video#view',
               'lex:app.bsky.embed.external#view',
             ],
           },
@@ -5102,85 +5106,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyEmbedVideo: {
-    lexicon: 1,
-    id: 'app.bsky.embed.video',
-    description: 'A video embedded in a Bluesky record (eg, a post).',
-    defs: {
-      main: {
-        type: 'object',
-        required: ['video'],
-        properties: {
-          video: {
-            type: 'blob',
-            accept: ['video/mp4'],
-            maxSize: 50000000,
-          },
-          captions: {
-            type: 'array',
-            items: {
-              type: 'ref',
-              ref: 'lex:app.bsky.embed.video#caption',
-            },
-            maxLength: 20,
-          },
-          alt: {
-            type: 'string',
-            description:
-              'Alt text description of the video, for accessibility.',
-            maxGraphemes: 1000,
-            maxLength: 10000,
-          },
-          aspectRatio: {
-            type: 'ref',
-            ref: 'lex:app.bsky.embed.defs#aspectRatio',
-          },
-        },
-      },
-      caption: {
-        type: 'object',
-        required: ['lang', 'file'],
-        properties: {
-          lang: {
-            type: 'string',
-            format: 'language',
-          },
-          file: {
-            type: 'blob',
-            accept: ['text/vtt'],
-            maxSize: 20000,
-          },
-        },
-      },
-      view: {
-        type: 'object',
-        required: ['cid', 'playlist'],
-        properties: {
-          cid: {
-            type: 'string',
-            format: 'cid',
-          },
-          playlist: {
-            type: 'string',
-            format: 'uri',
-          },
-          thumbnail: {
-            type: 'string',
-            format: 'uri',
-          },
-          alt: {
-            type: 'string',
-            maxGraphemes: 1000,
-            maxLength: 10000,
-          },
-          aspectRatio: {
-            type: 'ref',
-            ref: 'lex:app.bsky.embed.defs#aspectRatio',
-          },
-        },
-      },
-    },
-  },
   AppBskyFeedDefs: {
     lexicon: 1,
     id: 'app.bsky.feed.defs',
@@ -5208,7 +5133,6 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:app.bsky.embed.images#view',
-              'lex:app.bsky.embed.video#view',
               'lex:app.bsky.embed.external#view',
               'lex:app.bsky.embed.record#view',
               'lex:app.bsky.embed.recordWithMedia#view',
@@ -5672,6 +5596,42 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyFeedDetach: {
+    lexicon: 1,
+    id: 'app.bsky.feed.detach',
+    defs: {
+      main: {
+        type: 'record',
+        key: 'tid',
+        description:
+          'Record defining post URIs detached from a root post. The record key (rkey) of the detach record must match the record key of the root post in question, and that record must be in the same repository.',
+        record: {
+          type: 'object',
+          required: ['post', 'targets', 'updatedAt'],
+          properties: {
+            post: {
+              type: 'string',
+              format: 'at-uri',
+              description: 'Reference (AT-URI) to the post record.',
+            },
+            targets: {
+              type: 'array',
+              maxLength: 50,
+              items: {
+                type: 'string',
+                format: 'at-uri',
+              },
+              description: 'List of detached post URIs.',
+            },
+            updatedAt: {
+              type: 'string',
+              format: 'datetime',
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyFeedGenerator: {
     lexicon: 1,
     id: 'app.bsky.feed.generator',
@@ -6563,7 +6523,6 @@ export const schemaDict = {
               type: 'union',
               refs: [
                 'lex:app.bsky.embed.images',
-                'lex:app.bsky.embed.video',
                 'lex:app.bsky.embed.external',
                 'lex:app.bsky.embed.record',
                 'lex:app.bsky.embed.recordWithMedia',
@@ -11833,14 +11792,13 @@ export const ids = {
   AppBskyActorPutPreferences: 'app.bsky.actor.putPreferences',
   AppBskyActorSearchActors: 'app.bsky.actor.searchActors',
   AppBskyActorSearchActorsTypeahead: 'app.bsky.actor.searchActorsTypeahead',
-  AppBskyEmbedDefs: 'app.bsky.embed.defs',
   AppBskyEmbedExternal: 'app.bsky.embed.external',
   AppBskyEmbedImages: 'app.bsky.embed.images',
   AppBskyEmbedRecord: 'app.bsky.embed.record',
   AppBskyEmbedRecordWithMedia: 'app.bsky.embed.recordWithMedia',
-  AppBskyEmbedVideo: 'app.bsky.embed.video',
   AppBskyFeedDefs: 'app.bsky.feed.defs',
   AppBskyFeedDescribeFeedGenerator: 'app.bsky.feed.describeFeedGenerator',
+  AppBskyFeedDetach: 'app.bsky.feed.detach',
   AppBskyFeedGenerator: 'app.bsky.feed.generator',
   AppBskyFeedGetActorFeeds: 'app.bsky.feed.getActorFeeds',
   AppBskyFeedGetActorLikes: 'app.bsky.feed.getActorLikes',

package/src/client/types/app/bsky/actor/defs.ts

@@ -370,10 +370,15 @@ export type MutedWordTarget = 'content' | 'tag' | (string & {})
 
 /** A word that the account owner has muted. */
 export interface MutedWord {
+  id?: string
   /** The muted word itself. */
   value: string
   /** The intended targets of the muted word. */
   targets: MutedWordTarget[]
+  /** Groups of users to apply the muted word to. If undefined, applies to all users. */
+  actorTarget: 'all' | 'exclude-following' | (string & {})
+  /** The date and time at which the muted word will expire and no longer be applied. */
+  expiresAt?: string
   [k: string]: unknown
 }
 

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

@@ -5,7 +5,6 @@ import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { isObj, hasProp } from '../../../../util'
 import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
-import * as AppBskyEmbedDefs from './defs'
 
 export interface Main {
   images: Image[]
@@ -29,7 +28,7 @@ export interface Image {
   image: BlobRef
   /** Alt text description of the image, for accessibility. */
   alt: string
-  aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  aspectRatio?: AspectRatio
   [k: string]: unknown
 }
 
@@ -43,6 +42,25 @@ export function validateImage(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.embed.images#image', v)
 }
 
+/** width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. */
+export interface AspectRatio {
+  width: number
+  height: number
+  [k: string]: unknown
+}
+
+export function isAspectRatio(v: unknown): v is AspectRatio {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.embed.images#aspectRatio'
+  )
+}
+
+export function validateAspectRatio(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.embed.images#aspectRatio', v)
+}
+
 export interface View {
   images: ViewImage[]
   [k: string]: unknown
@@ -65,7 +83,7 @@ export interface ViewImage {
   fullsize: string
   /** Alt text description of the image, for accessibility. */
   alt: string
-  aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  aspectRatio?: AspectRatio
   [k: string]: unknown
 }
 

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

@@ -12,7 +12,6 @@ import * as AppBskyLabelerDefs from '../labeler/defs'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 import * as AppBskyEmbedRecordWithMedia from './recordWithMedia'
 
@@ -69,7 +68,6 @@ export interface ViewRecord {
   likeCount?: number
   embeds?: (
     | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
     | AppBskyEmbedExternal.View
     | View
     | AppBskyEmbedRecordWithMedia.View

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

@@ -7,14 +7,12 @@ import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
 import * as AppBskyEmbedRecord from './record'
 import * as AppBskyEmbedImages from './images'
-import * as AppBskyEmbedVideo from './video'
 import * as AppBskyEmbedExternal from './external'
 
 export interface Main {
   record: AppBskyEmbedRecord.Main
   media:
     | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
     | AppBskyEmbedExternal.Main
     | { $type: string; [k: string]: unknown }
   [k: string]: unknown
@@ -37,7 +35,6 @@ export interface View {
   record: AppBskyEmbedRecord.View
   media:
     | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
     | AppBskyEmbedExternal.View
     | { $type: string; [k: string]: unknown }
   [k: string]: unknown

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

@@ -7,7 +7,6 @@ import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
 import * as AppBskyEmbedExternal from '../embed/external'
 import * as AppBskyEmbedRecord from '../embed/record'
 import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
@@ -22,7 +21,6 @@ export interface PostView {
   record: {}
   embed?:
     | AppBskyEmbedImages.View
-    | AppBskyEmbedVideo.View
     | AppBskyEmbedExternal.View
     | AppBskyEmbedRecord.View
     | AppBskyEmbedRecordWithMedia.View

package/src/client/types/app/bsky/feed/detach.ts

@@ -0,0 +1,29 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+
+export interface Record {
+  /** Reference (AT-URI) to the post record. */
+  post: string
+  /** List of detached post URIs. */
+  targets: string[]
+  updatedAt: string
+  [k: string]: unknown
+}
+
+export function isRecord(v: unknown): v is Record {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'app.bsky.feed.detach#main' ||
+      v.$type === 'app.bsky.feed.detach')
+  )
+}
+
+export function validateRecord(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.feed.detach#main', v)
+}

package/src/client/types/app/bsky/feed/post.ts

@@ -7,7 +7,6 @@ import { lexicons } from '../../../../lexicons'
 import { CID } from 'multiformats/cid'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
-import * as AppBskyEmbedVideo from '../embed/video'
 import * as AppBskyEmbedExternal from '../embed/external'
 import * as AppBskyEmbedRecord from '../embed/record'
 import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
@@ -24,7 +23,6 @@ export interface Record {
   reply?: ReplyRef
   embed?:
     | AppBskyEmbedImages.Main
-    | AppBskyEmbedVideo.Main
     | AppBskyEmbedExternal.Main
     | AppBskyEmbedRecord.Main
     | AppBskyEmbedRecordWithMedia.Main

package/src/moderation/mutewords.ts

@@ -27,12 +27,14 @@ export function hasMutedWord({
   facets,
   outlineTags,
   languages,
+  actor,
 }: {
   mutedWords: AppBskyActorDefs.MutedWord[]
   text: string
   facets?: AppBskyRichtextFacet.Main[]
   outlineTags?: string[]
   languages?: string[]
+  actor?: AppBskyActorDefs.ProfileView
 }) {
   const exception = LANGUAGE_EXCEPTIONS.includes(languages?.[0] || '')
   const tags = ([] as string[])
@@ -48,6 +50,15 @@ export function hasMutedWord({
     const mutedWord = mute.value.toLowerCase()
     const postText = text.toLowerCase()
 
+    // expired, ignore
+    if (mute.expiresAt && mute.expiresAt < new Date().toISOString()) continue
+
+    if (
+      mute.actorTarget === 'exclude-following' &&
+      Boolean(actor?.viewer?.following)
+    )
+      continue
+
     // `content` applies to tags as well
     if (tags.includes(mutedWord)) return true
     // rest of the checks are for `content` only

package/src/moderation/subjects/post.ts

@@ -141,6 +141,8 @@ function checkMutedWords(
     return false
   }
 
+  const postAuthor = subject.author
+
   if (AppBskyFeedPost.isRecord(subject.record)) {
     // post text
     if (
@@ -150,6 +152,7 @@ function checkMutedWords(
         facets: subject.record.facets,
         outlineTags: subject.record.tags,
         languages: subject.record.langs,
+        actor: postAuthor,
       })
     ) {
       return true
@@ -166,6 +169,7 @@ function checkMutedWords(
             mutedWords,
             text: image.alt,
             languages: subject.record.langs,
+            actor: postAuthor,
           })
         ) {
           return true
@@ -179,6 +183,7 @@ function checkMutedWords(
     if (AppBskyEmbedRecord.isViewRecord(subject.embed.record)) {
       if (AppBskyFeedPost.isRecord(subject.embed.record.value)) {
         const embeddedPost = subject.embed.record.value
+        const embedAuthor = subject.embed.record.author
 
         // quoted post text
         if (
@@ -188,6 +193,7 @@ function checkMutedWords(
             facets: embeddedPost.facets,
             outlineTags: embeddedPost.tags,
             languages: embeddedPost.langs,
+            actor: embedAuthor,
           })
         ) {
           return true
@@ -201,6 +207,7 @@ function checkMutedWords(
                 mutedWords,
                 text: image.alt,
                 languages: embeddedPost.langs,
+                actor: embedAuthor,
               })
             ) {
               return true
@@ -216,6 +223,7 @@ function checkMutedWords(
               mutedWords,
               text: external.title + ' ' + external.description,
               languages: [],
+              actor: embedAuthor,
             })
           ) {
             return true
@@ -231,6 +239,7 @@ function checkMutedWords(
                 mutedWords,
                 text: external.title + ' ' + external.description,
                 languages: [],
+                actor: embedAuthor,
               })
             ) {
               return true
@@ -247,6 +256,7 @@ function checkMutedWords(
                   languages: AppBskyFeedPost.isRecord(embeddedPost.record)
                     ? embeddedPost.langs
                     : [],
+                  actor: embedAuthor,
                 })
               ) {
                 return true
@@ -264,6 +274,7 @@ function checkMutedWords(
           mutedWords,
           text: external.title + ' ' + external.description,
           languages: [],
+          actor: postAuthor,
         })
       ) {
         return true
@@ -274,6 +285,8 @@ function checkMutedWords(
       AppBskyEmbedRecordWithMedia.isView(subject.embed) &&
       AppBskyEmbedRecord.isViewRecord(subject.embed.record.record)
     ) {
+      const embedAuthor = subject.embed.record.record.author
+
       // quoted post text
       if (AppBskyFeedPost.isRecord(subject.embed.record.record.value)) {
         const post = subject.embed.record.record.value
@@ -284,6 +297,7 @@ function checkMutedWords(
             facets: post.facets,
             outlineTags: post.tags,
             languages: post.langs,
+            actor: embedAuthor,
           })
         ) {
           return true
@@ -300,6 +314,7 @@ function checkMutedWords(
               languages: AppBskyFeedPost.isRecord(subject.record)
                 ? subject.record.langs
                 : [],
+              actor: embedAuthor,
             })
           ) {
             return true