@atproto/bsky 0.0.13 → 0.0.15

package/src/api/index.ts

@@ -13,6 +13,7 @@ import getLikes from './app/bsky/feed/getLikes'
 import getListFeed from './app/bsky/feed/getListFeed'
 import getPostThread from './app/bsky/feed/getPostThread'
 import getPosts from './app/bsky/feed/getPosts'
+import searchPosts from './app/bsky/feed/searchPosts'
 import getActorLikes from './app/bsky/feed/getActorLikes'
 import getProfile from './app/bsky/actor/getProfile'
 import getProfiles from './app/bsky/actor/getProfiles'
@@ -52,6 +53,7 @@ import getModerationReport from './com/atproto/admin/getModerationReport'
 import getModerationReports from './com/atproto/admin/getModerationReports'
 import resolveHandle from './com/atproto/identity/resolveHandle'
 import getRecord from './com/atproto/repo/getRecord'
+import fetchLabels from './com/atproto/temp/fetchLabels'
 
 export * as health from './health'
 
@@ -74,6 +76,7 @@ export default function (server: Server, ctx: AppContext) {
   getListFeed(server, ctx)
   getPostThread(server, ctx)
   getPosts(server, ctx)
+  searchPosts(server, ctx)
   getActorLikes(server, ctx)
   getProfile(server, ctx)
   getProfiles(server, ctx)
@@ -114,5 +117,6 @@ export default function (server: Server, ctx: AppContext) {
   getModerationReports(server, ctx)
   resolveHandle(server, ctx)
   getRecord(server, ctx)
+  fetchLabels(server, ctx)
   return server
 }

package/src/config.ts

@@ -23,7 +23,7 @@ export interface ServerConfigValues {
   adminPassword: string
   moderatorPassword?: string
   triagePassword?: string
-  moderationActionReverseUrl?: string
+  moderationPushUrl?: string
 }
 
 export class ServerConfig {
@@ -78,8 +78,8 @@ export class ServerConfig {
     const moderatorPassword = process.env.MODERATOR_PASSWORD || undefined
     const triagePassword = process.env.TRIAGE_PASSWORD || undefined
     const labelerDid = process.env.LABELER_DID || 'did:example:labeler'
-    const moderationActionReverseUrl =
-      overrides?.moderationActionReverseUrl ||
+    const moderationPushUrl =
+      overrides?.moderationPushUrl ||
       process.env.MODERATION_PUSH_URL ||
       undefined
     return new ServerConfig({
@@ -104,7 +104,7 @@ export class ServerConfig {
       adminPassword,
       moderatorPassword,
       triagePassword,
-      moderationActionReverseUrl,
+      moderationPushUrl,
       ...stripUndefineds(overrides ?? {}),
     })
   }
@@ -206,8 +206,8 @@ export class ServerConfig {
     return this.cfg.triagePassword
   }
 
-  get moderationActionReverseUrl() {
-    return this.cfg.moderationActionReverseUrl
+  get moderationPushUrl() {
+    return this.cfg.moderationPushUrl
   }
 }
 

package/src/context.ts

@@ -15,6 +15,7 @@ import { LabelCache } from './label-cache'
 import { NotificationServer } from './notifications'
 
 export class AppContext {
+  public moderationPushAgent: AtpAgent | undefined
   constructor(
     private opts: {
       db: DatabaseCoordinator
@@ -30,7 +31,16 @@ export class AppContext {
       algos: MountedAlgos
       notifServer: NotificationServer
     },
-  ) {}
+  ) {
+    if (opts.cfg.moderationPushUrl) {
+      const url = new URL(opts.cfg.moderationPushUrl)
+      this.moderationPushAgent = new AtpAgent({ service: url.origin })
+      this.moderationPushAgent.api.setHeader(
+        'authorization',
+        auth.buildBasicAuth(url.username, url.password),
+      )
+    }
+  }
 
   get db(): DatabaseCoordinator {
     return this.opts.db
@@ -107,14 +117,6 @@ export class AppContext {
     })
   }
 
-  async pdsAdminAgent(did: string): Promise<AtpAgent> {
-    const data = await this.idResolver.did.resolveAtprotoData(did)
-    const agent = new AtpAgent({ service: data.pds })
-    const jwt = await this.serviceAuthJwt(did)
-    agent.api.setHeader('authorization', `Bearer ${jwt}`)
-    return agent
-  }
-
   get backgroundQueue(): BackgroundQueue {
     return this.opts.backgroundQueue
   }

package/src/db/periodic-moderation-action-reversal.ts

@@ -3,7 +3,6 @@ import { Leader } from './leader'
 import { dbLogger } from '../logger'
 import AppContext from '../context'
 import AtpAgent from '@atproto/api'
-import { buildBasicAuth } from '../auth'
 import { LabelService } from '../services/label'
 import { ModerationActionRow } from '../services/moderation'
 
@@ -18,14 +17,7 @@ export class PeriodicModerationActionReversal {
   pushAgent?: AtpAgent
 
   constructor(private appContext: AppContext) {
-    if (appContext.cfg.moderationActionReverseUrl) {
-      const url = new URL(appContext.cfg.moderationActionReverseUrl)
-      this.pushAgent = new AtpAgent({ service: url.origin })
-      this.pushAgent.api.setHeader(
-        'authorization',
-        buildBasicAuth(url.username, url.password),
-      )
-    }
+    this.pushAgent = appContext.moderationPushAgent
   }
 
   // invert label creation & negations

package/src/lexicon/index.ts

@@ -75,6 +75,7 @@ import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate'
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
+import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels'
 import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
 import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
 import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
@@ -175,6 +176,7 @@ export class AtprotoNS {
   repo: RepoNS
   server: ServerNS
   sync: SyncNS
+  temp: TempNS
 
   constructor(server: Server) {
     this._server = server
@@ -185,6 +187,7 @@ export class AtprotoNS {
     this.repo = new RepoNS(server)
     this.server = new ServerNS(server)
     this.sync = new SyncNS(server)
+    this.temp = new TempNS(server)
   }
 }
 
@@ -970,6 +973,25 @@ export class SyncNS {
   }
 }
 
+export class TempNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  fetchLabels<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoTempFetchLabels.Handler<ExtractAuth<AV>>,
+      ComAtprotoTempFetchLabels.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.temp.fetchLabels' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class AppNS {
   _server: Server
   bsky: BskyNS