@atproto/bsky 0.0.112 → 0.0.114

package/src/views/index.ts

@@ -1,13 +1,17 @@
-import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { mapDefined } from '@atproto/common'
-import { ImageUriBuilder } from '../image/uri'
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
+import { ProfileViewerState } from '../hydration/actor'
+import { FeedItem, Post, Repost } from '../hydration/feed'
 import { HydrationState } from '../hydration/hydrator'
+import { Label } from '../hydration/label'
+import { RecordInfo } from '../hydration/util'
+import { ImageUriBuilder } from '../image/uri'
 import { ids } from '../lexicon/lexicons'
 import {
-  ProfileViewDetailed,
   ProfileView,
   ProfileViewBasic,
-  ViewerState as ProfileViewerState,
+  ProfileViewDetailed,
+  ViewerState as ProfileViewer,
 } from '../lexicon/types/app/bsky/actor/defs'
 import {
   BlockedPost,
@@ -15,14 +19,15 @@ import {
   GeneratorView,
   NotFoundPost,
   PostView,
-  ReasonRepost,
   ReasonPin,
+  ReasonRepost,
   ReplyRef,
   ThreadViewPost,
   ThreadgateView,
   isPostView,
 } from '../lexicon/types/app/bsky/feed/defs'
 import { isRecord as isPostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import {
   ListView,
   ListViewBasic,
@@ -30,19 +35,23 @@ import {
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
 import {
-  parseThreadGate,
-  cidFromBlobJson,
-  VideoUriBuilder,
-  parsePostgate,
-} from './util'
-import { uriToDid as creatorFromUri, safePinnedPost } from '../util/uris'
-import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
+  LabelerView,
+  LabelerViewDetailed,
+} from '../lexicon/types/app/bsky/labeler/defs'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
+import { Notification } from '../proto/bsky_pb'
+import {
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
+  safePinnedPost,
+  uriToDid,
+  uriToDid as creatorFromUri,
+} from '../util/uris'
 import {
   Embed,
   EmbedBlocked,
-  EmbedNotFound,
   EmbedDetached,
+  EmbedNotFound,
   EmbedView,
   ExternalEmbed,
   ExternalEmbedView,
@@ -64,15 +73,12 @@ import {
   isRecordWithMedia,
   isVideoEmbed,
 } from './types'
-import { Label } from '../hydration/label'
-import { FeedItem, Post, Repost } from '../hydration/feed'
-import { RecordInfo } from '../hydration/util'
 import {
-  LabelerView,
-  LabelerViewDetailed,
-} from '../lexicon/types/app/bsky/labeler/defs'
-import { Notification } from '../proto/bsky_pb'
-import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
+  VideoUriBuilder,
+  cidFromBlobJson,
+  parsePostgate,
+  parseThreadGate,
+} from './util'
 
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
@@ -101,9 +107,10 @@ export class Views {
   }
 
   actorIsTakendown(did: string, state: HydrationState): boolean {
-    if (state.actors?.get(did)?.takedownRef) return true
-    if (state.actors?.get(did)?.upstreamStatus === 'takendown') return true
-    if (state.actors?.get(did)?.upstreamStatus === 'suspended') return true
+    const actor = state.actors?.get(did)
+    if (actor?.takedownRef) return true
+    if (actor?.upstreamStatus === 'takendown') return true
+    if (actor?.upstreamStatus === 'suspended') return true
     if (state.labels?.get(did)?.isTakendown) return true
     return false
   }
@@ -111,18 +118,45 @@ export class Views {
   viewerBlockExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return (
-      !!actor.blockedBy ||
-      !!actor.blocking ||
-      !!actor.blockedByList ||
-      !!actor.blockingByList
+    return !!(
+      actor.blockedBy ||
+      actor.blocking ||
+      this.blockedByList(actor, state) ||
+      this.blockingByList(actor, state)
     )
   }
 
   viewerMuteExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false
-    return actor.muted || !!actor.mutedByList
+    return !!(actor.muted || this.mutedByList(actor, state))
+  }
+
+  blockingByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockingByList && this.recordActive(viewer.blockingByList, state)
+    )
+  }
+
+  blockedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return (
+      viewer.blockedByList && this.recordActive(viewer.blockedByList, state)
+    )
+  }
+
+  mutedByList(viewer: ProfileViewerState, state: HydrationState) {
+    return viewer.mutedByList && this.recordActive(viewer.mutedByList, state)
+  }
+
+  recordActive(uri: string, state: HydrationState) {
+    const did = uriToDid(uri)
+    const actor = state.actors?.get(did)
+    if (!actor || this.actorIsTakendown(did, state)) {
+      // actor may not be present when takedowns are eagerly applied during hydration.
+      // so it's important to _try_ to hydrate the actor for records checked this way.
+      return
+    }
+    return uri
   }
 
   viewerSeesNeedsReview(did: string, state: HydrationState): boolean {
@@ -276,24 +310,22 @@ export class Views {
     }
   }
 
-  profileViewer(
-    did: string,
-    state: HydrationState,
-  ): ProfileViewerState | undefined {
+  profileViewer(did: string, state: HydrationState): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByList = this.blockedByList(viewer, state)
+    const blockedByUri = viewer.blockedBy || blockedByList
+    const blockingByList = this.blockingByList(viewer, state)
+    const blockingUri = viewer.blocking || blockingByList
     const block = !!blockedByUri || !!blockingUri
+    const mutedByList = this.mutedByList(viewer, state)
     return {
-      muted: viewer.muted || !!viewer.mutedByList,
-      mutedByList: viewer.mutedByList
-        ? this.listBasic(viewer.mutedByList, state)
-        : undefined,
+      muted: !!(viewer.muted || mutedByList),
+      mutedByList: mutedByList ? this.listBasic(mutedByList, state) : undefined,
       blockedBy: !!blockedByUri,
       blocking: blockingUri,
-      blockingByList: viewer.blockingByList
-        ? this.listBasic(viewer.blockingByList, state)
+      blockingByList: blockingByList
+        ? this.listBasic(blockingByList, state)
         : undefined,
       following: viewer.following && !block ? viewer.following : undefined,
       followedBy: viewer.followedBy && !block ? viewer.followedBy : undefined,
@@ -323,11 +355,11 @@ export class Views {
   blockedProfileViewer(
     did: string,
     state: HydrationState,
-  ): ProfileViewerState | undefined {
+  ): ProfileViewer | undefined {
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return
-    const blockedByUri = viewer.blockedBy || viewer.blockedByList
-    const blockingUri = viewer.blocking || viewer.blockingByList
+    const blockedByUri = viewer.blockedBy || this.blockedByList(viewer, state)
+    const blockingUri = viewer.blocking || this.blockingByList(viewer, state)
     return {
       blockedBy: !!blockedByUri,
       blocking: blockingUri,

package/src/views/types.ts

@@ -1,15 +1,11 @@
-import {
-  Main as ImagesEmbed,
-  View as ImagesEmbedView,
-} from '../lexicon/types/app/bsky/embed/images'
-import {
-  Main as VideoEmbed,
-  View as VideoEmbedView,
-} from '../lexicon/types/app/bsky/embed/video'
 import {
   Main as ExternalEmbed,
   View as ExternalEmbedView,
 } from '../lexicon/types/app/bsky/embed/external'
+import {
+  Main as ImagesEmbed,
+  View as ImagesEmbedView,
+} from '../lexicon/types/app/bsky/embed/images'
 import {
   Main as RecordEmbed,
   View as RecordEmbedView,
@@ -19,6 +15,10 @@ import {
   Main as RecordWithMedia,
   View as RecordWithMediaView,
 } from '../lexicon/types/app/bsky/embed/recordWithMedia'
+import {
+  Main as VideoEmbed,
+  View as VideoEmbedView,
+} from '../lexicon/types/app/bsky/embed/video'
 import {
   BlockedPost,
   GeneratorView,
@@ -47,8 +47,8 @@ export type {
   Main as RecordEmbed,
   View as RecordEmbedView,
   ViewBlocked as EmbedBlocked,
-  ViewNotFound as EmbedNotFound,
   ViewDetached as EmbedDetached,
+  ViewNotFound as EmbedNotFound,
   ViewRecord as PostEmbedView,
 } from '../lexicon/types/app/bsky/embed/record'
 export { isMain as isRecordEmbed } from '../lexicon/types/app/bsky/embed/record'

package/src/views/util.ts

@@ -1,16 +1,16 @@
 import * as util from 'node:util'
 import { BlobRef } from '@atproto/lexicon'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import {
+  Record as PostgateRecord,
+  isDisableRule as isPostgateDisableRule,
+} from '../lexicon/types/app/bsky/feed/postgate'
 import {
   Record as GateRecord,
   isFollowingRule,
   isListRule,
   isMentionRule,
 } from '../lexicon/types/app/bsky/feed/threadgate'
-import {
-  Record as PostgateRecord,
-  isDisableRule as isPostgateDisableRule,
-} from '../lexicon/types/app/bsky/feed/postgate'
 import { isMention } from '../lexicon/types/app/bsky/richtext/facet'
 
 export const parseThreadGate = (

package/tests/_util.ts

@@ -1,11 +1,10 @@
+import { Server } from 'node:http'
+import { AddressInfo } from 'node:net'
+import { type Express } from 'express'
+import { CID } from 'multiformats/cid'
 import { AppBskyFeedGetPostThread } from '@atproto/api'
 import { lexToJson } from '@atproto/lexicon'
 import { AtUri } from '@atproto/syntax'
-import { type Express } from 'express'
-import { CID } from 'multiformats/cid'
-import { Server } from 'node:http'
-
-import { AddressInfo } from 'node:net'
 import { isViewRecord } from '../src/lexicon/types/app/bsky/embed/record'
 import {
   FeedViewPost,

package/tests/admin/admin-auth.test.ts

@@ -1,9 +1,9 @@
-import { SeedClient, usersSeed, TestNetwork } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
+import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
-import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
 import { ids } from '../../src/lexicon/lexicons'
+import { RepoRef } from '../../src/lexicon/types/com/atproto/admin/defs'
 
 describe('admin auth', () => {
   let network: TestNetwork

package/tests/admin/moderation.test.ts

@@ -1,5 +1,5 @@
-import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { ImageRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   RepoBlobRef,
   RepoRef,

package/tests/auth.test.ts

@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
+import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import { ids } from '../src/lexicon/lexicons'
 
 describe('auth', () => {

package/tests/blob-resolver.test.ts

@@ -1,8 +1,8 @@
+import { CID } from 'multiformats/cid'
+import { request } from 'undici'
 import { cidForCbor, verifyCidForBytes } from '@atproto/common'
 import { randomBytes } from '@atproto/crypto'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import { CID } from 'multiformats/cid'
-import { request } from 'undici'
 
 describe('blob resolver', () => {
   let network: TestNetwork

package/tests/data-plane/duplicate-records.test.ts

@@ -1,7 +1,7 @@
-import { AtUri } from '@atproto/syntax'
-import { cidForCbor, TID } from '@atproto/common'
-import { WriteOpAction } from '@atproto/repo'
+import { TID, cidForCbor } from '@atproto/common'
 import { TestNetwork } from '@atproto/dev-env'
+import { WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../src/lexicon/lexicons'
 
 type Database = TestNetwork['bsky']['db']

package/tests/data-plane/handle-invalidation.test.ts

@@ -1,6 +1,6 @@
-import { DAY } from '@atproto/common'
-import { TestNetwork, SeedClient, usersSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { DAY } from '@atproto/common'
+import { SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('handle invalidation', () => {

package/tests/data-plane/indexing.test.ts

@@ -1,21 +1,21 @@
 import { sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { cidForCbor, TID } from '@atproto/common'
-import { repoPrepare } from '@atproto/pds'
-import { WriteOpAction } from '@atproto/repo'
-import { AtUri } from '@atproto/syntax'
 import {
   AppBskyActorProfile,
-  AppBskyFeedPost,
   AppBskyFeedLike,
+  AppBskyFeedPost,
   AppBskyFeedRepost,
   AppBskyGraphFollow,
   AtpAgent,
 } from '@atproto/api'
-import { TestNetwork, SeedClient, usersSeed, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
-import { ids } from '../../src/lexicon/lexicons'
+import { TID, cidForCbor } from '@atproto/common'
+import { SeedClient, TestNetwork, basicSeed, usersSeed } from '@atproto/dev-env'
+import { repoPrepare } from '@atproto/pds'
+import { WriteOpAction } from '@atproto/repo'
+import { AtUri } from '@atproto/syntax'
 import { Database } from '../../src/data-plane/server/db'
+import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('indexing', () => {
   let network: TestNetwork

package/tests/data-plane/subscription.test.ts

@@ -1,9 +1,9 @@
 import { AtpAgent } from '@atproto/api'
 import { cborDecode, cborEncode } from '@atproto/common'
-import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { PreparedWrite, sequencer } from '@atproto/pds'
 import { CommitData } from '@atproto/repo'
+import { DatabaseSchemaType } from '../../src/data-plane/server/db/database-schema'
 import { ids } from '../../src/lexicon/lexicons'
 import { forSnapshot } from '../_util'
 

package/tests/data-plane/thread-mutes.test.ts

@@ -1,5 +1,5 @@
-import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, usersSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('thread mutes', () => {

package/tests/entryway-auth.test.ts

@@ -1,12 +1,12 @@
+import assert from 'node:assert'
 import * as nodeCrypto from 'node:crypto'
+import * as jose from 'jose'
 import KeyEncoder from 'key-encoder'
 import * as ui8 from 'uint8arrays'
-import * as jose from 'jose'
-import * as crypto from '@atproto/crypto'
-import { AtpAgent, AtUri } from '@atproto/api'
-import { basicSeed, SeedClient, TestNetwork } from '@atproto/dev-env'
-import assert from 'node:assert'
+import { AtUri, AtpAgent } from '@atproto/api'
 import { MINUTE } from '@atproto/common'
+import * as crypto from '@atproto/crypto'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 const keyEncoder = new KeyEncoder('secp256k1')
 

package/tests/feed-generation.test.ts

@@ -1,21 +1,21 @@
-import assert from 'assert'
-import { XRPCError } from '@atproto/xrpc'
-import { AuthRequiredError } from '@atproto/xrpc-server'
-import { TID } from '@atproto/common'
+import assert from 'node:assert'
 import { AtUri, AtpAgent } from '@atproto/api'
+import { TID } from '@atproto/common'
 import {
-  TestNetwork,
-  TestFeedGen,
-  SeedClient,
   RecordRef,
+  SeedClient,
+  TestFeedGen,
+  TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
-import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
+import { XRPCError } from '@atproto/xrpc'
+import { AuthRequiredError } from '@atproto/xrpc-server'
 import { ids } from '../src/lexicon/lexicons'
 import {
   FeedViewPost,
   SkeletonFeedPost,
 } from '../src/lexicon/types/app/bsky/feed/defs'
+import { Handler as SkeletonHandler } from '../src/lexicon/types/app/bsky/feed/getFeedSkeleton'
 import { forSnapshot, paginateAll } from './_util'
 
 describe('feed generation', () => {

package/tests/hydration/util.test.ts

@@ -1,7 +1,7 @@
 import {
   HydrationMap,
-  mergeMaps,
   mergeManyMaps,
+  mergeMaps,
   mergeNestedMaps,
 } from '../../src/hydration/util'
 

package/tests/image/server.test.ts

@@ -1,7 +1,7 @@
+import { Readable } from 'node:stream'
+import { CID } from 'multiformats/cid'
 import { cidForCbor } from '@atproto/common'
 import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import { CID } from 'multiformats/cid'
-import { Readable } from 'node:stream'
 import { getInfo } from '../../src/image/sharp'
 import { ImageUriBuilder } from '../../src/image/uri'
 

package/tests/image/uri.test.ts

@@ -1,6 +1,6 @@
-import { cidForCbor } from '@atproto/common'
 import { CID } from 'multiformats/cid'
-import { ImageUriBuilder, BadPathError } from '../../src/image/uri'
+import { cidForCbor } from '@atproto/common'
+import { BadPathError, ImageUriBuilder } from '../../src/image/uri'
 
 describe('image uri builder', () => {
   let uriBuilder: ImageUriBuilder

package/tests/label-hydration.test.ts

@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
   let network: TestNetwork
@@ -73,8 +73,11 @@ describe('label hydration', () => {
     expect(res.data.labels?.find((l) => l.src === labelerDid)?.val).toEqual(
       'misleading',
     )
-    const labelerHeaderDids = res.headers['atproto-content-labelers'].split(',')
-    expect(labelerHeaderDids.sort()).toEqual(
+    const labelerHeaderDids = res.headers['atproto-content-labelers']
+      ?.split(',')
+      .sort()
+
+    expect(labelerHeaderDids).toEqual(
       [alice, `${bob};redact`, labelerDid].sort(),
     )
   })

package/tests/postgates.test.ts

@@ -1,8 +1,7 @@
-import { TestNetwork, SeedClient, RecordRef } from '@atproto/dev-env'
 import AtpAgent, { AppBskyEmbedRecord } from '@atproto/api'
-
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
 import { ids } from '../src/lexicon/lexicons'
-import { postgatesSeed, Users } from './seed/postgates'
+import { Users, postgatesSeed } from './seed/postgates'
 
 describe('postgates', () => {
   let network: TestNetwork

package/tests/query-labels.test.ts

@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 
 describe('label hydration', () => {
   let network: TestNetwork

package/tests/seed/feed-hidden-replies.ts

@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   id: string

package/tests/seed/known-followers.ts

@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   email: string

package/tests/seed/postgates.ts

@@ -1,4 +1,4 @@
-import { TestNetwork, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, TestNetworkNoAppView } from '@atproto/dev-env'
 
 export type User = {
   id: string

package/tests/server.test.ts

@@ -1,9 +1,9 @@
-import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import express from 'express'
 import { once } from 'node:events'
 import { AddressInfo } from 'node:net'
 import { finished } from 'node:stream/promises'
+import express from 'express'
 import { request } from 'undici'
+import { TestNetwork, basicSeed } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
 import { startServer } from './_util'
 

package/tests/views/account-deactivation.test.ts

@@ -1,5 +1,5 @@
 import { AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky account deactivation', () => {

package/tests/views/actor-likes.test.ts

@@ -1,5 +1,5 @@
 import { AtUri, AtpAgent } from '@atproto/api'
-import { TestNetwork, SeedClient, basicSeed } from '@atproto/dev-env'
+import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
 
 describe('bsky actor likes feed views', () => {

package/tests/views/actor-search.test.ts

@@ -1,8 +1,8 @@
 import { AtpAgent } from '@atproto/api'
 import { wait } from '@atproto/common'
-import { TestNetwork, SeedClient, usersBulkSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { SeedClient, TestNetwork, usersBulkSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot, paginateAll, stripViewer } from '../_util'
 
 // @NOTE skipped to help with CI failures
 // The search code is not used in production & we should switch it out for tests on the search proxy interface

package/tests/views/author-feed.test.ts

@@ -1,19 +1,19 @@
-import { AtpAgent, AppBskyActorProfile, AppBskyFeedDefs } from '@atproto/api'
-import { TestNetwork, SeedClient, authorFeedSeed } from '@atproto/dev-env'
+import { AppBskyActorProfile, AppBskyFeedDefs, AtpAgent } from '@atproto/api'
+import { SeedClient, TestNetwork, authorFeedSeed } from '@atproto/dev-env'
+import { ids } from '../../src/lexicon/lexicons'
+import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
+import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
+import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
+import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
+import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
+import { uriToDid } from '../../src/util/uris'
+import { VideoEmbed } from '../../src/views/types'
 import {
   forSnapshot,
   paginateAll,
   stripViewer,
   stripViewerFromPost,
 } from '../_util'
-import { ReplyRef, isRecord } from '../../src/lexicon/types/app/bsky/feed/post'
-import { isView as isEmbedRecordWithMedia } from '../../src/lexicon/types/app/bsky/embed/recordWithMedia'
-import { isView as isImageEmbed } from '../../src/lexicon/types/app/bsky/embed/images'
-import { isView as isVideoEmbed } from '../../src/lexicon/types/app/bsky/embed/video'
-import { isPostView } from '../../src/lexicon/types/app/bsky/feed/defs'
-import { uriToDid } from '../../src/util/uris'
-import { ids } from '../../src/lexicon/lexicons'
-import { VideoEmbed } from '../../src/views/types'
 
 describe('pds author feed views', () => {
   let network: TestNetwork
@@ -487,7 +487,7 @@ describe('pds author feed views', () => {
       await sc.post(alice, 'not pinned post')
       const post = await createAndPinPost()
       await sc.post(alice, 'not pinned post')
-
+      await network.processAll()
       const { data } = await agent.api.app.bsky.feed.getAuthorFeed(
         { actor: sc.accounts[alice].handle, includePins: true },
         {

package/tests/views/block-lists.test.ts

@@ -1,7 +1,7 @@
-import { AtpAgent, AtUri } from '@atproto/api'
-import { TestNetwork, SeedClient, RecordRef, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { AtUri, AtpAgent } from '@atproto/api'
+import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import { ids } from '../../src/lexicon/lexicons'
+import { forSnapshot } from '../_util'
 
 describe('pds views with blocking from block lists', () => {
   let network: TestNetwork