@atproto/api 0.12.26-next.0 → 0.12.26

package/src/bsky-agent.ts

@@ -9,6 +9,7 @@ import {
   AppBskyLabelerDefs,
   ComAtprotoRepoPutRecord,
 } from './client'
+import { MutedWord } from './client/types/app/bsky/actor/defs'
 import {
   BskyPreferences,
   BskyFeedViewPreference,
@@ -477,6 +478,14 @@ export class BskyAgent extends AtpAgent {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { $type, ...v } = pref
         prefs.moderationPrefs.mutedWords = v.items
+
+        if (prefs.moderationPrefs.mutedWords.length) {
+          prefs.moderationPrefs.mutedWords =
+            prefs.moderationPrefs.mutedWords.map((word) => {
+              word.actorTarget = word.actorTarget || 'all'
+              return word
+            })
+        }
       } else if (
         AppBskyActorDefs.isHiddenPostsPref(pref) &&
         AppBskyActorDefs.validateHiddenPostsPref(pref).success
@@ -937,7 +946,19 @@ export class BskyAgent extends AtpAgent {
     })
   }
 
-  async upsertMutedWords(newMutedWords: AppBskyActorDefs.MutedWord[]) {
+  /**
+   * Add a muted word to user preferences.
+   */
+  async addMutedWord(
+    mutedWord: Pick<
+      MutedWord,
+      'value' | 'targets' | 'actorTarget' | 'expiresAt'
+    >,
+  ) {
+    const sanitizedValue = sanitizeMutedWordValue(mutedWord.value)
+
+    if (!sanitizedValue) return
+
     await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
       let mutedWordsPref = prefs.findLast(
         (pref) =>
@@ -945,40 +966,27 @@ export class BskyAgent extends AtpAgent {
           AppBskyActorDefs.validateMutedWordsPref(pref).success,
       )
 
-      if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
-        for (const updatedWord of newMutedWords) {
-          let foundMatch = false
-          const sanitizedUpdatedValue = sanitizeMutedWordValue(
-            updatedWord.value,
-          )
-
-          // was trimmed down to an empty string e.g. single `#`
-          if (!sanitizedUpdatedValue) continue
+      const newMutedWord: AppBskyActorDefs.MutedWord = {
+        id: TID.nextStr(),
+        value: sanitizedValue,
+        targets: mutedWord.targets || [],
+        actorTarget: mutedWord.actorTarget || 'all',
+        expiresAt: mutedWord.expiresAt || undefined,
+      }
 
-          for (const existingItem of mutedWordsPref.items) {
-            if (existingItem.value === sanitizedUpdatedValue) {
-              existingItem.targets = Array.from(
-                new Set([...existingItem.targets, ...updatedWord.targets]),
-              )
-              foundMatch = true
-              break
-            }
-          }
+      if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
+        mutedWordsPref.items.push(newMutedWord)
 
-          if (!foundMatch) {
-            mutedWordsPref.items.push({
-              ...updatedWord,
-              value: sanitizedUpdatedValue,
-            })
-          }
-        }
+        /**
+         * Migrate any old muted words that don't have an id
+         */
+        mutedWordsPref.items = migrateLegacyMutedWordsItems(
+          mutedWordsPref.items,
+        )
       } else {
         // if the pref doesn't exist, create it
         mutedWordsPref = {
-          items: newMutedWords.map((w) => ({
-            ...w,
-            value: sanitizeMutedWordValue(w.value),
-          })),
+          items: [newMutedWord],
         }
       }
 
@@ -990,6 +998,28 @@ export class BskyAgent extends AtpAgent {
     })
   }
 
+  /**
+   * Convenience method to add muted words to user preferences
+   */
+  async addMutedWords(newMutedWords: AppBskyActorDefs.MutedWord[]) {
+    await Promise.all(newMutedWords.map((word) => this.addMutedWord(word)))
+  }
+
+  /**
+   * @deprecated use `addMutedWords` or `addMutedWord` instead
+   */
+  async upsertMutedWords(
+    mutedWords: Pick<
+      MutedWord,
+      'value' | 'targets' | 'actorTarget' | 'expiresAt'
+    >[],
+  ) {
+    await this.addMutedWords(mutedWords)
+  }
+
+  /**
+   * Update a muted word in user preferences.
+   */
   async updateMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
       const mutedWordsPref = prefs.findLast(
@@ -999,22 +1029,48 @@ export class BskyAgent extends AtpAgent {
       )
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
-        for (const existingItem of mutedWordsPref.items) {
-          if (existingItem.value === mutedWord.value) {
-            existingItem.targets = mutedWord.targets
-            break
+        mutedWordsPref.items = mutedWordsPref.items.map((existingItem) => {
+          const match = matchMutedWord(existingItem, mutedWord)
+
+          if (match) {
+            const updated = {
+              ...existingItem,
+              ...mutedWord,
+            }
+            return {
+              id: existingItem.id || TID.nextStr(),
+              value:
+                sanitizeMutedWordValue(updated.value) || existingItem.value,
+              targets: updated.targets || [],
+              actorTarget: updated.actorTarget || 'all',
+              expiresAt: updated.expiresAt || undefined,
+            }
+          } else {
+            return existingItem
           }
-        }
+        })
+
+        /**
+         * Migrate any old muted words that don't have an id
+         */
+        mutedWordsPref.items = migrateLegacyMutedWordsItems(
+          mutedWordsPref.items,
+        )
+
+        return prefs
+          .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
+          .concat([
+            { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
+          ])
       }
 
       return prefs
-        .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-        .concat([
-          { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-        ])
     })
   }
 
+  /**
+   * Remove a muted word from user preferences.
+   */
   async removeMutedWord(mutedWord: AppBskyActorDefs.MutedWord) {
     await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
       const mutedWordsPref = prefs.findLast(
@@ -1025,22 +1081,39 @@ export class BskyAgent extends AtpAgent {
 
       if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
         for (let i = 0; i < mutedWordsPref.items.length; i++) {
-          const existing = mutedWordsPref.items[i]
-          if (existing.value === mutedWord.value) {
+          const match = matchMutedWord(mutedWordsPref.items[i], mutedWord)
+
+          if (match) {
             mutedWordsPref.items.splice(i, 1)
             break
           }
         }
+
+        /**
+         * Migrate any old muted words that don't have an id
+         */
+        mutedWordsPref.items = migrateLegacyMutedWordsItems(
+          mutedWordsPref.items,
+        )
+
+        return prefs
+          .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
+          .concat([
+            { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
+          ])
       }
 
       return prefs
-        .filter((p) => !AppBskyActorDefs.isMutedWordsPref(p))
-        .concat([
-          { ...mutedWordsPref, $type: 'app.bsky.actor.defs#mutedWordsPref' },
-        ])
     })
   }
 
+  /**
+   * Convenience method to remove muted words from user preferences
+   */
+  async removeMutedWords(mutedWords: AppBskyActorDefs.MutedWord[]) {
+    await Promise.all(mutedWords.map((word) => this.removeMutedWord(word)))
+  }
+
   async hidePost(postUri: string) {
     await updateHiddenPost(this, postUri, 'hide')
   }
@@ -1369,3 +1442,24 @@ function isBskyPrefs(v: any): v is BskyPreferences {
 function isModPrefs(v: any): v is ModerationPrefs {
   return v && typeof v === 'object' && 'labelers' in v
 }
+
+function migrateLegacyMutedWordsItems(items: AppBskyActorDefs.MutedWord[]) {
+  return items.map((item) => ({
+    ...item,
+    id: item.id || TID.nextStr(),
+  }))
+}
+
+function matchMutedWord(
+  existingWord: AppBskyActorDefs.MutedWord,
+  newWord: AppBskyActorDefs.MutedWord,
+): boolean {
+  // id is undefined in legacy implementation
+  const existingId = existingWord.id
+  // prefer matching based on id
+  const matchById = existingId && existingId === newWord.id
+  // handle legacy case where id is not set
+  const legacyMatchByValue = !existingId && existingWord.value === newWord.value
+
+  return matchById || legacyMatchByValue
+}

package/src/client/index.ts

@@ -95,12 +95,10 @@ import * as AppBskyActorProfile from './types/app/bsky/actor/profile'
 import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
 import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
 import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-import * as AppBskyEmbedDefs from './types/app/bsky/embed/defs'
 import * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
 import * as AppBskyEmbedImages from './types/app/bsky/embed/images'
 import * as AppBskyEmbedRecord from './types/app/bsky/embed/record'
 import * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia'
-import * as AppBskyEmbedVideo from './types/app/bsky/embed/video'
 import * as AppBskyFeedDefs from './types/app/bsky/feed/defs'
 import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
 import * as AppBskyFeedGenerator from './types/app/bsky/feed/generator'
@@ -294,12 +292,10 @@ export * as AppBskyActorProfile from './types/app/bsky/actor/profile'
 export * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
 export * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
 export * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
-export * as AppBskyEmbedDefs from './types/app/bsky/embed/defs'
 export * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
 export * as AppBskyEmbedImages from './types/app/bsky/embed/images'
 export * as AppBskyEmbedRecord from './types/app/bsky/embed/record'
 export * as AppBskyEmbedRecordWithMedia from './types/app/bsky/embed/recordWithMedia'
-export * as AppBskyEmbedVideo from './types/app/bsky/embed/video'
 export * as AppBskyFeedDefs from './types/app/bsky/feed/defs'
 export * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator'
 export * as AppBskyFeedGenerator from './types/app/bsky/feed/generator'

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',
@@ -6563,7 +6487,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,12 +11756,10 @@ 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',
   AppBskyFeedGenerator: 'app.bsky.feed.generator',

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/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