@atproto/bsky 0.0.11 → 0.0.12

package/src/lexicon/types/com/atproto/server/reserveSigningKey.ts

@@ -0,0 +1,44 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth } from '@atproto/xrpc-server'
+
+export interface QueryParams {}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** Public signing key in the form of a did:key. */
+  signingKey: string
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/com/atproto/sync/listRepos.ts

@@ -49,6 +49,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 export interface Repo {
   did: string
   head: string
+  rev: string
   [k: string]: unknown
 }
 

package/src/logger.ts

@@ -12,4 +12,12 @@ export const httpLogger: ReturnType<typeof subsystemLogger> =
 
 export const loggerMiddleware = pinoHttp({
   logger: httpLogger,
+  serializers: {
+    err: (err) => {
+      return {
+        code: err?.code,
+        message: err?.message,
+      }
+    },
+  },
 })

package/src/services/actor/index.ts

@@ -66,7 +66,13 @@ export class ActorService {
           qb = qb.orWhere('actor.did', 'in', dids)
         }
         if (handles.length) {
-          qb = qb.orWhere('actor.handle', 'in', handles)
+          qb = qb.orWhere(
+            'actor.handle',
+            'in',
+            handles.length === 1
+              ? [handles[0], handles[0]] // a silly (but worthwhile) optimization to avoid usage of actor_handle_tgrm_idx
+              : handles,
+          )
         }
         return qb
       })

package/src/services/actor/types.ts

@@ -16,6 +16,7 @@ export type ActorInfo = {
     mutedByList?: ListViewBasic
     blockedBy?: boolean
     blocking?: string
+    blockingByList?: ListViewBasic
     following?: string
     followedBy?: string
   }

package/src/services/actor/views.ts

@@ -137,10 +137,13 @@ export class ActorViews {
       ),
     ])
     const listUris = mapDefined(profiles, ({ did }) => {
-      const list = viewer && bam.muteList([viewer, did])
-      if (!list) return
-      return list
-    })
+      const muteList = viewer && bam.muteList([viewer, did])
+      const blockList = viewer && bam.blockList([viewer, did])
+      const lists: string[] = []
+      if (muteList) lists.push(muteList)
+      if (blockList) lists.push(blockList)
+      return lists
+    }).flat()
     const lists = await this.services.graph.getListViews(listUris, viewer)
     return { profilesDetailed: toMapByDid(profiles), labels, bam, lists }
   }
@@ -168,6 +171,11 @@ export class ActorViews {
         mutedByListUri && lists[mutedByListUri]
           ? this.services.graph.formatListViewBasic(lists[mutedByListUri])
           : undefined
+      const blockingByListUri = viewer && bam.blockList([viewer, did])
+      const blockingByList =
+        blockingByListUri && lists[blockingByListUri]
+          ? this.services.graph.formatListViewBasic(lists[blockingByListUri])
+          : undefined
       const actorLabels = labels[did] ?? []
       const selfLabels = getSelfLabels({
         uri: prof.profileUri,
@@ -194,6 +202,7 @@ export class ActorViews {
               mutedByList,
               blockedBy: !!bam.blockedBy([viewer, did]),
               blocking: bam.blocking([viewer, did]) ?? undefined,
+              blockingByList,
               following:
                 prof?.viewerFollowing && !bam.block([viewer, did])
                   ? prof.viewerFollowing
@@ -265,10 +274,13 @@ export class ActorViews {
       ),
     ])
     const listUris = mapDefined(profiles, ({ did }) => {
-      const list = viewer && bam.muteList([viewer, did])
-      if (!list) return
-      return list
-    })
+      const muteList = viewer && bam.muteList([viewer, did])
+      const blockList = viewer && bam.blockList([viewer, did])
+      const lists: string[] = []
+      if (muteList) lists.push(muteList)
+      if (blockList) lists.push(blockList)
+      return lists
+    }).flat()
     const lists = await this.services.graph.getListViews(listUris, viewer)
     return { profiles: toMapByDid(profiles), labels, bam, lists }
   }
@@ -298,6 +310,11 @@ export class ActorViews {
         mutedByListUri && lists[mutedByListUri]
           ? this.services.graph.formatListViewBasic(lists[mutedByListUri])
           : undefined
+      const blockingByListUri = viewer && bam.blockList([viewer, did])
+      const blockingByList =
+        blockingByListUri && lists[blockingByListUri]
+          ? this.services.graph.formatListViewBasic(lists[blockingByListUri])
+          : undefined
       const actorLabels = labels[did] ?? []
       const selfLabels = getSelfLabels({
         uri: prof.profileUri,
@@ -320,6 +337,7 @@ export class ActorViews {
               mutedByList,
               blockedBy: !!bam.blockedBy([viewer, did]),
               blocking: bam.blocking([viewer, did]) ?? undefined,
+              blockingByList,
               following:
                 prof?.viewerFollowing && !bam.block([viewer, did])
                   ? prof.viewerFollowing

package/src/services/graph/index.ts

@@ -267,28 +267,44 @@ export type RelationshipPair = [didA: string, didB: string]
 export class BlockAndMuteState {
   hasIdx = new Map<string, Set<string>>() // did -> did
   blockIdx = new Map<string, Map<string, string>>() // did -> did -> block uri
+  blockListIdx = new Map<string, Map<string, string>>() // did -> did -> list uri
   muteIdx = new Map<string, Set<string>>() // did -> did
   muteListIdx = new Map<string, Map<string, string>>() // did -> did -> list uri
   constructor(items: BlockAndMuteInfo[] = []) {
     items.forEach((item) => this.add(item))
   }
   add(item: BlockAndMuteInfo) {
-    const blocking = item.blocking || item.blockingViaList // block or list uri
-    if (blocking) {
+    if (item.source === item.target) {
+      return // we do not respect self-blocks or self-mutes
+    }
+    if (item.blocking) {
       const map = this.blockIdx.get(item.source) ?? new Map()
-      map.set(item.target, blocking)
+      map.set(item.target, item.blocking)
       if (!this.blockIdx.has(item.source)) {
         this.blockIdx.set(item.source, map)
       }
     }
-    const blockedBy = item.blockedBy || item.blockedByViaList // block or list uri
-    if (blockedBy) {
+    if (item.blockingViaList) {
+      const map = this.blockListIdx.get(item.source) ?? new Map()
+      map.set(item.target, item.blockingViaList)
+      if (!this.blockListIdx.has(item.source)) {
+        this.blockListIdx.set(item.source, map)
+      }
+    }
+    if (item.blockedBy) {
       const map = this.blockIdx.get(item.target) ?? new Map()
-      map.set(item.source, blockedBy)
+      map.set(item.source, item.blockedBy)
       if (!this.blockIdx.has(item.target)) {
         this.blockIdx.set(item.target, map)
       }
     }
+    if (item.blockedByViaList) {
+      const map = this.blockListIdx.get(item.target) ?? new Map()
+      map.set(item.source, item.blockedByViaList)
+      if (!this.blockListIdx.has(item.target)) {
+        this.blockListIdx.set(item.target, map)
+      }
+    }
     if (item.muting) {
       const set = this.muteIdx.get(item.source) ?? new Set()
       set.add(item.target)
@@ -314,7 +330,7 @@ export class BlockAndMuteState {
   }
   // block or list uri
   blocking(pair: RelationshipPair): string | null {
-    return this.blockIdx.get(pair[0])?.get(pair[1]) ?? null
+    return this.blockIdx.get(pair[0])?.get(pair[1]) ?? this.blockList(pair)
   }
   // block or list uri
   blockedBy(pair: RelationshipPair): string | null {
@@ -324,6 +340,9 @@ export class BlockAndMuteState {
     return !!this.muteIdx.get(pair[0])?.has(pair[1]) || !!this.muteList(pair)
   }
   // list uri
+  blockList(pair: RelationshipPair): string | null {
+    return this.blockListIdx.get(pair[0])?.get(pair[1]) ?? null
+  }
   muteList(pair: RelationshipPair): string | null {
     return this.muteListIdx.get(pair[0])?.get(pair[1]) ?? null
   }

package/src/services/indexing/index.ts

@@ -144,24 +144,22 @@ export class IndexingService {
     const handle: string | null =
       did === handleToDid ? atpData.handle.toLowerCase() : null
 
-    if (actor && actor.handle !== handle) {
-      const actorWithHandle =
-        handle !== null
-          ? await this.db.db
-              .selectFrom('actor')
-              .where('handle', '=', handle)
-              .selectAll()
-              .executeTakeFirst()
-          : null
+    const actorWithHandle =
+      handle !== null
+        ? await this.db.db
+            .selectFrom('actor')
+            .where('handle', '=', handle)
+            .selectAll()
+            .executeTakeFirst()
+        : null
 
-      // handle contention
-      if (handle && actorWithHandle && did !== actorWithHandle.did) {
-        await this.db.db
-          .updateTable('actor')
-          .where('actor.did', '=', actorWithHandle.did)
-          .set({ handle: null })
-          .execute()
-      }
+    // handle contention
+    if (handle && actorWithHandle && did !== actorWithHandle.did) {
+      await this.db.db
+        .updateTable('actor')
+        .where('actor.did', '=', actorWithHandle.did)
+        .set({ handle: null })
+        .execute()
     }
 
     const actorInfo = { handle, indexedAt: timestamp }

package/src/services/moderation/index.ts

@@ -7,7 +7,12 @@ import { ModerationAction, ModerationReport } from '../../db/tables/moderation'
 import { ModerationViews } from './views'
 import { ImageUriBuilder } from '../../image/uri'
 import { ImageInvalidator } from '../../image/invalidator'
-import { TAKEDOWN } from '../../lexicon/types/com/atproto/admin/defs'
+import {
+  RepoRef,
+  RepoBlobRef,
+  TAKEDOWN,
+} from '../../lexicon/types/com/atproto/admin/defs'
+import { Main as StrongRef } from '../../lexicon/types/com/atproto/repo/strongRef'
 import { addHoursToDate } from '../../util/date'
 
 export class ModerationService {
@@ -355,7 +360,10 @@ export class ModerationService {
     createdBy,
     createdAt,
     reason,
-  }: ReversibleModerationAction) {
+  }: ReversibleModerationAction): Promise<{
+    result: ModerationActionRow
+    restored?: TakedownSubjects
+  }> {
     this.db.assertTransaction()
     const result = await this.logReverseAction({
       id,
@@ -364,6 +372,8 @@ export class ModerationService {
       reason,
     })
 
+    let restored: TakedownSubjects | undefined
+
     if (
       result.action === TAKEDOWN &&
       result.subjectType === 'com.atproto.admin.defs#repoRef' &&
@@ -372,6 +382,15 @@ export class ModerationService {
       await this.reverseTakedownRepo({
         did: result.subjectDid,
       })
+      restored = {
+        did: result.subjectDid,
+        subjects: [
+          {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: result.subjectDid,
+          },
+        ],
+      }
     }
 
     if (
@@ -379,12 +398,35 @@ export class ModerationService {
       result.subjectType === 'com.atproto.repo.strongRef' &&
       result.subjectUri
     ) {
+      const uri = new AtUri(result.subjectUri)
       await this.reverseTakedownRecord({
-        uri: new AtUri(result.subjectUri),
+        uri,
       })
+      const did = uri.hostname
+      const actionBlobs = await this.db.db
+        .selectFrom('moderation_action_subject_blob')
+        .where('actionId', '=', id)
+        .select('cid')
+        .execute()
+      restored = {
+        did,
+        subjects: [
+          {
+            $type: 'com.atproto.repo.strongRef',
+            uri: result.subjectUri,
+            cid: result.subjectCid ?? '',
+          },
+          ...actionBlobs.map((row) => ({
+            $type: 'com.atproto.admin.defs#repoBlobRef',
+            did,
+            cid: row.cid,
+            recordUri: result.subjectUri,
+          })),
+        ],
+      }
     }
 
-    return result
+    return { result, restored }
   }
 
   async logReverseAction(
@@ -410,13 +452,27 @@ export class ModerationService {
     return result
   }
 
-  async takedownRepo(info: { takedownId: number; did: string }) {
+  async takedownRepo(info: {
+    takedownId: number
+    did: string
+  }): Promise<TakedownSubjects> {
+    const { takedownId, did } = info
     await this.db.db
       .updateTable('actor')
-      .set({ takedownId: info.takedownId })
-      .where('did', '=', info.did)
+      .set({ takedownId })
+      .where('did', '=', did)
       .where('takedownId', 'is', null)
       .executeTakeFirst()
+
+    return {
+      did,
+      subjects: [
+        {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did,
+        },
+      ],
+    }
   }
 
   async reverseTakedownRepo(info: { did: string }) {
@@ -430,26 +486,45 @@ export class ModerationService {
   async takedownRecord(info: {
     takedownId: number
     uri: AtUri
+    cid: CID
     blobCids?: CID[]
-  }) {
+  }): Promise<TakedownSubjects> {
+    const { takedownId, uri, cid, blobCids } = info
+    const did = uri.hostname
     this.db.assertTransaction()
     await this.db.db
       .updateTable('record')
-      .set({ takedownId: info.takedownId })
-      .where('uri', '=', info.uri.toString())
+      .set({ takedownId })
+      .where('uri', '=', uri.toString())
       .where('takedownId', 'is', null)
       .executeTakeFirst()
-    if (info.blobCids) {
+    if (blobCids) {
       await Promise.all(
-        info.blobCids.map(async (cid) => {
+        blobCids.map(async (cid) => {
           const paths = ImageUriBuilder.presets.map((id) => {
-            const uri = this.imgUriBuilder.getPresetUri(id, info.uri.host, cid)
-            return uri.replace(this.imgUriBuilder.endpoint, '')
+            const imgUri = this.imgUriBuilder.getPresetUri(id, uri.host, cid)
+            return imgUri.replace(this.imgUriBuilder.endpoint, '')
           })
           await this.imgInvalidator.invalidate(cid.toString(), paths)
         }),
       )
     }
+    return {
+      did,
+      subjects: [
+        {
+          $type: 'com.atproto.repo.strongRef',
+          uri: uri.toString(),
+          cid: cid.toString(),
+        },
+        ...(blobCids || []).map((cid) => ({
+          $type: 'com.atproto.admin.defs#repoBlobRef',
+          did,
+          cid: cid.toString(),
+          recordUri: uri.toString(),
+        })),
+      ],
+    }
   }
 
   async reverseTakedownRecord(info: { uri: AtUri }) {
@@ -563,6 +638,11 @@ export class ModerationService {
   }
 }
 
+export type TakedownSubjects = {
+  did: string
+  subjects: (RepoRef | RepoBlobRef | StrongRef)[]
+}
+
 export type ModerationActionRow = Selectable<ModerationAction>
 export type ReversibleModerationAction = Pick<
   ModerationActionRow,

package/src/services/moderation/views.ts

@@ -211,6 +211,7 @@ export class ModerationViews {
         .selectFrom('moderation_report')
         .where('subjectType', '=', 'com.atproto.repo.strongRef')
         .where('subjectUri', '=', result.uri)
+        .leftJoin('actor', 'actor.did', 'moderation_report.subjectDid')
         .orderBy('id', 'desc')
         .selectAll()
         .execute(),

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -419,12 +419,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+              "alt": "tests/sample-img/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
             },
             Object {
-              "alt": "tests/image/fixtures/key-alt.jpg",
+              "alt": "tests/sample-img/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(6)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(6)@jpeg",
             },
@@ -475,7 +475,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                "alt": "tests/sample-img/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -486,7 +486,7 @@ Array [
                 },
               },
               Object {
-                "alt": "tests/image/fixtures/key-alt.jpg",
+                "alt": "tests/sample-img/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -679,12 +679,12 @@ Array [
                 "$type": "app.bsky.embed.images#view",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
                     "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
                   },
                   Object {
-                    "alt": "tests/image/fixtures/key-alt.jpg",
+                    "alt": "tests/sample-img/key-alt.jpg",
                     "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(6)@jpeg",
                     "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(6)@jpeg",
                   },
@@ -735,7 +735,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -746,7 +746,7 @@ Array [
                     },
                   },
                   Object {
-                    "alt": "tests/image/fixtures/key-alt.jpg",
+                    "alt": "tests/sample-img/key-alt.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -906,12 +906,12 @@ Array [
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+              "alt": "tests/sample-img/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(4)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(4)@jpeg",
             },
             Object {
-              "alt": "tests/image/fixtures/key-alt.jpg",
+              "alt": "tests/sample-img/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(5)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(5)/cids(5)@jpeg",
             },
@@ -962,7 +962,7 @@ Array [
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                "alt": "tests/sample-img/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -973,7 +973,7 @@ Array [
                 },
               },
               Object {
-                "alt": "tests/image/fixtures/key-alt.jpg",
+                "alt": "tests/sample-img/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",

package/tests/__snapshots__/indexing.test.ts.snap

@@ -101,7 +101,7 @@ Array [
               "$type": "app.bsky.embed.images#view",
               "images": Array [
                 Object {
-                  "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                  "alt": "tests/sample-img/key-landscape-small.jpg",
                   "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(2)/cids(5)@jpeg",
                   "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(2)/cids(5)@jpeg",
                 },
@@ -134,7 +134,7 @@ Array [
                 "$type": "app.bsky.embed.images",
                 "images": Array [
                   Object {
-                    "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                    "alt": "tests/sample-img/key-landscape-small.jpg",
                     "image": Object {
                       "$type": "blob",
                       "mimeType": "image/jpeg",
@@ -245,7 +245,7 @@ Array [
                           "$type": "app.bsky.embed.images",
                           "images": Array [
                             Object {
-                              "alt": "tests/image/fixtures/key-landscape-small.jpg",
+                              "alt": "tests/sample-img/key-landscape-small.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",
@@ -256,7 +256,7 @@ Array [
                               },
                             },
                             Object {
-                              "alt": "tests/image/fixtures/key-alt.jpg",
+                              "alt": "tests/sample-img/key-alt.jpg",
                               "image": Object {
                                 "$type": "blob",
                                 "mimeType": "image/jpeg",