@atproto/bsky 0.0.112 → 0.0.114

package/src/hydration/hydrator.ts

@@ -1,21 +1,40 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { mapDefined } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client'
-import { Notification } from '../proto/bsky_pb'
 import { ids } from '../lexicon/lexicons'
 import { isMain as isEmbedRecord } from '../lexicon/types/app/bsky/embed/record'
 import { isMain as isEmbedRecordWithMedia } from '../lexicon/types/app/bsky/embed/recordWithMedia'
 import { isListRule as isThreadgateListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { hydrationLogger } from '../logger'
+import { Notification } from '../proto/bsky_pb'
+import { ParsedLabelers } from '../util'
+import { uriToDid, uriToDid as didFromUri } from '../util/uris'
 import {
   ActorHydrator,
-  ProfileAggs,
   Actors,
-  ProfileViewerStates,
-  ProfileViewerState,
   KnownFollowers,
+  ProfileAggs,
+  ProfileViewerState,
+  ProfileViewerStates,
 } from './actor'
+import {
+  FeedGenAggs,
+  FeedGenViewerStates,
+  FeedGens,
+  FeedHydrator,
+  FeedItem,
+  Likes,
+  Post,
+  PostAggs,
+  PostViewerStates,
+  Postgates,
+  Posts,
+  Reposts,
+  ThreadContexts,
+  ThreadRef,
+  Threadgates,
+} from './feed'
 import {
   Follows,
   GraphHydrator,
@@ -36,32 +55,13 @@ import {
 } from './label'
 import {
   HydrationMap,
-  RecordInfo,
   ItemRef,
-  urisByCollection,
+  RecordInfo,
+  mergeManyMaps,
   mergeMaps,
   mergeNestedMaps,
-  mergeManyMaps,
+  urisByCollection,
 } from './util'
-import { uriToDid as didFromUri } from '../util/uris'
-import {
-  FeedGenAggs,
-  FeedGens,
-  FeedGenViewerStates,
-  FeedHydrator,
-  Likes,
-  Post,
-  Posts,
-  Reposts,
-  PostAggs,
-  PostViewerStates,
-  Threadgates,
-  Postgates,
-  FeedItem,
-  ThreadContexts,
-  ThreadRef,
-} from './feed'
-import { ParsedLabelers } from '../util'
 
 export class HydrateCtx {
   labelers = this.vals.labelers
@@ -279,10 +279,11 @@ export class Hydrator {
   //   - profile basic
   async hydrateLists(uris: string[], ctx: HydrateCtx): Promise<HydrationState> {
     const [listsState, profilesState] = await Promise.all([
-      await this.hydrateListsBasic(uris, ctx),
-      await this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
+      this.hydrateListsBasic(uris, ctx, {
+        skipAuthors: true, // handled via author profile hydration
+      }),
+      this.hydrateProfilesBasic(uris.map(didFromUri), ctx),
     ])
-
     return mergeStates(listsState, profilesState)
   }
 
@@ -291,19 +292,26 @@ export class Hydrator {
   async hydrateListsBasic(
     uris: string[],
     ctx: HydrateCtx,
+    opts?: { skipAuthors: boolean },
   ): Promise<HydrationState> {
-    const [lists, listAggs, listViewers, labels] = await Promise.all([
+    const includeAuthorDids = opts?.skipAuthors ? [] : uris.map(uriToDid)
+    const [lists, listAggs, listViewers, labels, actors] = await Promise.all([
       this.graph.getLists(uris, ctx.includeTakedowns),
       this.graph.getListAggregates(uris.map((uri) => ({ uri }))),
       ctx.viewer ? this.graph.getListViewerStates(uris, ctx.viewer) : undefined,
-      this.label.getLabelsForSubjects(uris, ctx.labelers),
+      this.label.getLabelsForSubjects(
+        [...uris, ...includeAuthorDids],
+        ctx.labelers,
+      ),
+      this.actor.getActors(includeAuthorDids, ctx.includeTakedowns),
     ])
 
     if (!ctx.includeTakedowns) {
       actionTakedownLabels(uris, lists, labels)
+      actionTakedownLabels(includeAuthorDids, actors, labels)
     }
 
-    return { lists, listAggs, listViewers, labels, ctx }
+    return { lists, listAggs, listViewers, labels, actors, ctx }
   }
 
   // app.bsky.graph.defs#listItemView
@@ -533,12 +541,14 @@ export class Hydrator {
       }
     }
     // replace embed/parent/root pairs with block state
-    const blocks = await this.graph.getBidirectionalBlocks(relationships)
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(relationships),
+    )
     for (const [uri, { embed, parent, root }] of postBlocksPairs) {
       postBlocks.set(uri, {
-        embed: !!embed && blocks.isBlocked(...embed),
-        parent: !!parent && blocks.isBlocked(...parent),
-        root: !!root && blocks.isBlocked(...root),
+        embed: !!embed && !!isBlocked(blocks, embed),
+        parent: !!parent && !!isBlocked(blocks, parent),
+        root: !!root && !!isBlocked(blocks, root),
       })
     }
     return postBlocks
@@ -756,8 +766,8 @@ export class Hydrator {
         )
       },
     )
-    const blocks = await this.graph.getBidirectionalBlocks(
-      listCreatorMemberPairs,
+    const blocks = await this.hydrateBidirectionalBlocks(
+      pairsToMap(listCreatorMemberPairs),
     )
     // sample top list items per starter pack based on their follows
     const listMemberAggs = await this.actor.getProfileAggregates(listMemberDids)
@@ -772,7 +782,8 @@ export class Hydrator {
       // update aggregation with list items for top 12 most followed members
       agg.listItemSampleUris = [
         ...members.listitems.filter(
-          (li) => ctx.viewer === creator || !blocks?.isBlocked(creator, li.did),
+          (li) =>
+            ctx.viewer === creator || !isBlocked(blocks, [creator, li.did]),
         ),
       ]
         .sort((li1, li2) => {
@@ -814,11 +825,11 @@ export class Hydrator {
         pairs.push([authorDid, didFromUri(uri)])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const likeBlocks = new HydrationMap<LikeBlock>()
     for (const [uri, like] of likes) {
       if (like) {
-        likeBlocks.set(uri, blocks.isBlocked(authorDid, didFromUri(uri)))
+        likeBlocks.set(uri, isBlocked(blocks, [authorDid, didFromUri(uri)]))
       } else {
         likeBlocks.set(uri, null)
       }
@@ -898,13 +909,13 @@ export class Hydrator {
         pairs.push([didFromUri(uri), follow.record.subject])
       }
     }
-    const blocks = await this.graph.getBidirectionalBlocks(pairs)
+    const blocks = await this.hydrateBidirectionalBlocks(pairsToMap(pairs))
     const followBlocks = new HydrationMap<FollowBlock>()
     for (const [uri, follow] of follows) {
       if (follow) {
         followBlocks.set(
           uri,
-          blocks.isBlocked(didFromUri(uri), follow.record.subject),
+          isBlocked(blocks, [didFromUri(uri), follow.record.subject]),
         )
       } else {
         followBlocks.set(uri, null)
@@ -926,10 +937,32 @@ export class Hydrator {
     const result = new HydrationMap<HydrationMap<boolean>>()
     const blocks = await this.graph.getBidirectionalBlocks(pairs)
 
+    // lookup list authors to apply takedown status to blocklists
+    const listAuthorDids = new Set<string>()
+    for (const [source, targets] of didMap) {
+      for (const target of targets) {
+        const block = blocks.get(source, target)
+        if (block?.blockListUri) {
+          listAuthorDids.add(uriToDid(block.blockListUri))
+        }
+      }
+    }
+
+    const activeListAuthors = await this.actor.getActors(
+      [...listAuthorDids],
+      false,
+    )
+
     for (const [source, targets] of didMap) {
       const didBlocks = new HydrationMap<boolean>()
       for (const target of targets) {
-        didBlocks.set(target, blocks.isBlocked(source, target))
+        const block = blocks.get(source, target)
+        const isBlocked = !!(
+          block?.blockUri ||
+          (block?.blockListUri &&
+            activeListAuthors.get(uriToDid(block.blockListUri)))
+        )
+        didBlocks.set(target, isBlocked)
       }
       result.set(source, didBlocks)
     }
@@ -1198,6 +1231,20 @@ const getListUrisFromThreadgates = (gates: Threadgates) => {
   return uris
 }
 
+const isBlocked = (blocks: BidirectionalBlocks, [a, b]: RelationshipPair) => {
+  return blocks.get(a)?.get(b) ?? null
+}
+
+const pairsToMap = (pairs: RelationshipPair[]): Map<string, string[]> => {
+  const map = new Map<string, string[]>()
+  for (const [a, b] of pairs) {
+    const list = map.get(a) ?? []
+    list.push(b)
+    map.set(a, list)
+  }
+  return map
+}
+
 export const mergeStates = (
   stateA: HydrationState,
   stateB: HydrationState,

package/src/hydration/label.ts

@@ -1,6 +1,9 @@
+import { AtUri } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client'
-import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ids } from '../lexicon/lexicons'
 import { Record as LabelerRecord } from '../lexicon/types/app/bsky/labeler/service'
+import { Label } from '../lexicon/types/com/atproto/label/defs'
+import { ParsedLabelers } from '../util'
 import {
   HydrationMap,
   Merges,
@@ -9,9 +12,6 @@ import {
   parseRecord,
   parseString,
 } from './util'
-import { AtUri } from '@atproto/syntax'
-import { ids } from '../lexicon/lexicons'
-import { ParsedLabelers } from '../util'
 
 export type { Label } from '../lexicon/types/com/atproto/label/defs'
 

package/src/hydration/util.ts

@@ -1,7 +1,7 @@
-import { AtUri } from '@atproto/syntax'
-import { jsonToLex } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
 import * as ui8 from 'uint8arrays'
+import { jsonToLex } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
 import { lexicons } from '../lexicon/lexicons'
 import { Record } from '../proto/bsky_pb'
 

package/src/image/index.ts

@@ -1,2 +1,2 @@
 export * from './sharp'
-export type { Options, ImageInfo } from './util'
+export type { ImageInfo, Options } from './util'

package/src/image/server.ts

@@ -1,26 +1,25 @@
-import {
-  cloneStream,
-  createDecoders,
-  isErrnoException,
-  VerifyCidError,
-  VerifyCidTransform,
-} from '@atproto/common'
-import { BlobNotFoundError } from '@atproto/repo'
-import createError, { isHttpError } from 'http-errors'
 import fsSync from 'node:fs'
 import fs from 'node:fs/promises'
 import os from 'node:os'
 import path from 'node:path'
 import { Duplex, Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
-
-import { streamBlob, StreamBlobOptions } from '../api/blob-resolver'
-import AppContext from '../context'
+import createError, { isHttpError } from 'http-errors'
+import {
+  VerifyCidError,
+  VerifyCidTransform,
+  cloneStream,
+  createDecoders,
+  isErrnoException,
+} from '@atproto/common'
+import { BlobNotFoundError } from '@atproto/repo'
+import { StreamBlobOptions, streamBlob } from '../api/blob-resolver'
+import { AppContext } from '../context'
 import { Middleware, responseSignal } from '../util/http'
 import log from './logger'
 import { createImageProcessor, createImageUpscaler } from './sharp'
 import { BadPathError, ImageUriBuilder } from './uri'
-import { formatsToMimes, Options, SharpInfo } from './util'
+import { Options, SharpInfo, formatsToMimes } from './util'
 
 export function createMiddleware(
   ctx: AppContext,

package/src/image/sharp.ts

@@ -1,8 +1,8 @@
-import { errHasMsg } from '@atproto/common'
 import { PassThrough, Readable } from 'node:stream'
 import { pipeline } from 'node:stream/promises'
 import sharp from 'sharp'
-import { formatsToMimes, ImageInfo, Options } from './util'
+import { errHasMsg } from '@atproto/common'
+import { ImageInfo, Options, formatsToMimes } from './util'
 
 export type { Options }
 

package/src/index.ts

@@ -1,39 +1,39 @@
-import express from 'express'
-import http from 'http'
-import { AddressInfo } from 'net'
-import events from 'events'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import cors from 'cors'
+import events from 'node:events'
+import http from 'node:http'
+import { AddressInfo } from 'node:net'
 import compression from 'compression'
+import cors from 'cors'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { AtpAgent } from '@atproto/api'
-import { IdResolver } from '@atproto/identity'
 import { DAY, SECOND } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
-import API, { health, wellKnown, blobResolver } from './api'
-import * as error from './error'
-import { loggerMiddleware } from './logger'
-import { ServerConfig } from './config'
-import { createServer } from './lexicon'
-import { ImageUriBuilder } from './image/uri'
-import * as imageServer from './image/server'
-import AppContext from './context'
-import { createDataPlaneClient } from './data-plane/client'
-import { Hydrator } from './hydration/hydrator'
-import { Views } from './views'
+import { IdResolver } from '@atproto/identity'
+import API, { blobResolver, health, wellKnown } from './api'
+import { createBlobDispatcher } from './api/blob-dispatcher'
 import { AuthVerifier, createPublicKeyObject } from './auth-verifier'
 import { authWithApiKey as bsyncAuth, createBsyncClient } from './bsync'
+import { ServerConfig } from './config'
+import { AppContext } from './context'
 import { authWithApiKey as courierAuth, createCourierClient } from './courier'
+import { createDataPlaneClient } from './data-plane/client'
+import * as error from './error'
 import { FeatureGates } from './feature-gates'
+import { Hydrator } from './hydration/hydrator'
+import * as imageServer from './image/server'
+import { ImageUriBuilder } from './image/uri'
+import { createServer } from './lexicon'
+import { loggerMiddleware } from './logger'
+import { Views } from './views'
 import { VideoUriBuilder } from './views/util'
-import { createBlobDispatcher } from './api/blob-dispatcher'
 
-export * from './data-plane'
-export type { ServerConfigValues } from './config'
 export { ServerConfig } from './config'
-export { Database } from './data-plane/server/db'
-export { Redis } from './redis'
+export type { ServerConfigValues } from './config'
 export { AppContext } from './context'
+export * from './data-plane'
 export { BackgroundQueue } from './data-plane/server/background'
+export { Database } from './data-plane/server/db'
+export { Redis } from './redis'
 
 export class BskyAppView {
   public ctx: AppContext

package/src/lexicon/lexicons.ts

@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {

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

@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}

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

@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }

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

@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule

package/src/logger.ts

@@ -1,6 +1,6 @@
 import { IncomingMessage } from 'node:http'
 import { stdSerializers } from 'pino'
-import pinoHttp from 'pino-http'
+import { pinoHttp } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger: ReturnType<typeof subsystemLogger> =

package/src/redis.ts

@@ -1,4 +1,4 @@
-import assert from 'assert'
+import assert from 'node:assert'
 import { Redis as RedisDriver } from 'ioredis'
 
 export class Redis {

package/src/util/http.ts

@@ -1,5 +1,5 @@
-import createHttpError from 'http-errors'
 import { IncomingMessage, ServerResponse } from 'node:http'
+import createHttpError from 'http-errors'
 import { IncomingHttpHeaders } from 'undici/types/header'
 
 type NextFunction = (err?: unknown) => void

package/src/util/uris.ts

@@ -1,8 +1,8 @@
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../lexicon/lexicons'
 import {
-  validateMain as validateStrongRef,
   Main as StrongRef,
+  validateMain as validateStrongRef,
 } from '../lexicon/types/com/atproto/repo/strongRef'
 
 /**