@atproto/pds 0.4.175 → 0.4.177

package/src/lexicon/types/app/bsky/bookmark/deleteBookmark.ts

@@ -0,0 +1,34 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.bookmark.deleteBookmark'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  uri: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'UnsupportedCollection'
+}
+
+export type HandlerOutput = HandlerError | void

package/src/lexicon/types/app/bsky/bookmark/getBookmarks.ts

@@ -0,0 +1,42 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import type * as AppBskyBookmarkDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.bookmark.getBookmarks'
+
+export type QueryParams = {
+  limit: number
+  cursor?: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  bookmarks: AppBskyBookmarkDefs.BookmarkView[]
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

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

@@ -36,6 +36,7 @@ export interface PostView {
     | $Typed<AppBskyEmbedRecord.View>
     | $Typed<AppBskyEmbedRecordWithMedia.View>
     | { $type: string }
+  bookmarkCount?: number
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -61,6 +62,7 @@ export interface ViewerState {
   $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
+  bookmarked?: boolean
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean

package/src/lexicon/types/com/atproto/moderation/defs.ts

@@ -22,21 +22,66 @@ export type ReasonType =
   | 'com.atproto.moderation.defs#reasonRude'
   | 'com.atproto.moderation.defs#reasonOther'
   | 'com.atproto.moderation.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonViolenceAnimalWelfare'
+  | 'tools.ozone.report.defs#reasonViolenceThreats'
+  | 'tools.ozone.report.defs#reasonViolenceGraphicContent'
+  | 'tools.ozone.report.defs#reasonViolenceSelfHarm'
+  | 'tools.ozone.report.defs#reasonViolenceGlorification'
+  | 'tools.ozone.report.defs#reasonViolenceExtremistContent'
+  | 'tools.ozone.report.defs#reasonViolenceTrafficking'
+  | 'tools.ozone.report.defs#reasonViolenceOther'
+  | 'tools.ozone.report.defs#reasonSexualAbuseContent'
+  | 'tools.ozone.report.defs#reasonSexualNCII'
+  | 'tools.ozone.report.defs#reasonSexualSextortion'
+  | 'tools.ozone.report.defs#reasonSexualDeepfake'
+  | 'tools.ozone.report.defs#reasonSexualAnimal'
+  | 'tools.ozone.report.defs#reasonSexualUnlabeled'
+  | 'tools.ozone.report.defs#reasonSexualOther'
+  | 'tools.ozone.report.defs#reasonChildSafetyCSAM'
+  | 'tools.ozone.report.defs#reasonChildSafetyGroom'
+  | 'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy'
+  | 'tools.ozone.report.defs#reasonChildSafetyEndangerment'
+  | 'tools.ozone.report.defs#reasonChildSafetyHarassment'
+  | 'tools.ozone.report.defs#reasonChildSafetyPromotion'
+  | 'tools.ozone.report.defs#reasonChildSafetyOther'
+  | 'tools.ozone.report.defs#reasonHarassmentTroll'
+  | 'tools.ozone.report.defs#reasonHarassmentTargeted'
+  | 'tools.ozone.report.defs#reasonHarassmentHateSpeech'
+  | 'tools.ozone.report.defs#reasonHarassmentDoxxing'
+  | 'tools.ozone.report.defs#reasonHarassmentOther'
+  | 'tools.ozone.report.defs#reasonMisleadingBot'
+  | 'tools.ozone.report.defs#reasonMisleadingImpersonation'
+  | 'tools.ozone.report.defs#reasonMisleadingSpam'
+  | 'tools.ozone.report.defs#reasonMisleadingScam'
+  | 'tools.ozone.report.defs#reasonMisleadingSyntheticContent'
+  | 'tools.ozone.report.defs#reasonMisleadingMisinformation'
+  | 'tools.ozone.report.defs#reasonMisleadingOther'
+  | 'tools.ozone.report.defs#reasonRuleSiteSecurity'
+  | 'tools.ozone.report.defs#reasonRuleStolenContent'
+  | 'tools.ozone.report.defs#reasonRuleProhibitedSales'
+  | 'tools.ozone.report.defs#reasonRuleBanEvasion'
+  | 'tools.ozone.report.defs#reasonRuleOther'
+  | 'tools.ozone.report.defs#reasonCivicElectoralProcess'
+  | 'tools.ozone.report.defs#reasonCivicDisclosure'
+  | 'tools.ozone.report.defs#reasonCivicInterference'
+  | 'tools.ozone.report.defs#reasonCivicMisinformation'
+  | 'tools.ozone.report.defs#reasonCivicImpersonation'
   | (string & {})
 
-/** Spam: frequent unwanted promotion, replies, mentions */
+/** Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`. */
 export const REASONSPAM = `${id}#reasonSpam`
-/** Direct violation of server rules, laws, terms of service */
+/** Direct violation of server rules, laws, terms of service. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. */
 export const REASONVIOLATION = `${id}#reasonViolation`
-/** Misleading identity, affiliation, or content */
+/** Misleading identity, affiliation, or content. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingOther`. */
 export const REASONMISLEADING = `${id}#reasonMisleading`
-/** Unwanted or mislabeled sexual content */
+/** Unwanted or mislabeled sexual content. Prefer new lexicon definition `tools.ozone.report.defs#reasonSexualUnlabeled`. */
 export const REASONSEXUAL = `${id}#reasonSexual`
-/** Rude, harassing, explicit, or otherwise unwelcoming behavior */
+/** Rude, harassing, explicit, or otherwise unwelcoming behavior. Prefer new lexicon definition `tools.ozone.report.defs#reasonHarassmentOther`. */
 export const REASONRUDE = `${id}#reasonRude`
-/** Other: reports not falling under another report category */
+/** Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. */
 export const REASONOTHER = `${id}#reasonOther`
-/** Appeal: appeal a previously taken moderation action */
+/** Appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
 
 /** Tag describing a type of subject that might be reported. */

package/src/lexicon/types/com/atproto/temp/dereferenceScope.ts

@@ -0,0 +1,42 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.dereferenceScope'
+
+export type QueryParams = {
+  /** The scope reference (starts with 'ref:') */
+  scope: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The full oauth permission scope */
+  scope: string
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'InvalidScopeReference'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/tools/ozone/report/defs.ts

@@ -0,0 +1,154 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.report.defs'
+
+export type ReasonType =
+  | 'tools.ozone.report.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonViolenceAnimalWelfare'
+  | 'tools.ozone.report.defs#reasonViolenceThreats'
+  | 'tools.ozone.report.defs#reasonViolenceGraphicContent'
+  | 'tools.ozone.report.defs#reasonViolenceSelfHarm'
+  | 'tools.ozone.report.defs#reasonViolenceGlorification'
+  | 'tools.ozone.report.defs#reasonViolenceExtremistContent'
+  | 'tools.ozone.report.defs#reasonViolenceTrafficking'
+  | 'tools.ozone.report.defs#reasonViolenceOther'
+  | 'tools.ozone.report.defs#reasonSexualAbuseContent'
+  | 'tools.ozone.report.defs#reasonSexualNCII'
+  | 'tools.ozone.report.defs#reasonSexualSextortion'
+  | 'tools.ozone.report.defs#reasonSexualDeepfake'
+  | 'tools.ozone.report.defs#reasonSexualAnimal'
+  | 'tools.ozone.report.defs#reasonSexualUnlabeled'
+  | 'tools.ozone.report.defs#reasonSexualOther'
+  | 'tools.ozone.report.defs#reasonChildSafetyCSAM'
+  | 'tools.ozone.report.defs#reasonChildSafetyGroom'
+  | 'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy'
+  | 'tools.ozone.report.defs#reasonChildSafetyEndangerment'
+  | 'tools.ozone.report.defs#reasonChildSafetyHarassment'
+  | 'tools.ozone.report.defs#reasonChildSafetyPromotion'
+  | 'tools.ozone.report.defs#reasonChildSafetyOther'
+  | 'tools.ozone.report.defs#reasonHarassmentTroll'
+  | 'tools.ozone.report.defs#reasonHarassmentTargeted'
+  | 'tools.ozone.report.defs#reasonHarassmentHateSpeech'
+  | 'tools.ozone.report.defs#reasonHarassmentDoxxing'
+  | 'tools.ozone.report.defs#reasonHarassmentOther'
+  | 'tools.ozone.report.defs#reasonMisleadingBot'
+  | 'tools.ozone.report.defs#reasonMisleadingImpersonation'
+  | 'tools.ozone.report.defs#reasonMisleadingSpam'
+  | 'tools.ozone.report.defs#reasonMisleadingScam'
+  | 'tools.ozone.report.defs#reasonMisleadingSyntheticContent'
+  | 'tools.ozone.report.defs#reasonMisleadingMisinformation'
+  | 'tools.ozone.report.defs#reasonMisleadingOther'
+  | 'tools.ozone.report.defs#reasonRuleSiteSecurity'
+  | 'tools.ozone.report.defs#reasonRuleStolenContent'
+  | 'tools.ozone.report.defs#reasonRuleProhibitedSales'
+  | 'tools.ozone.report.defs#reasonRuleBanEvasion'
+  | 'tools.ozone.report.defs#reasonRuleOther'
+  | 'tools.ozone.report.defs#reasonCivicElectoralProcess'
+  | 'tools.ozone.report.defs#reasonCivicDisclosure'
+  | 'tools.ozone.report.defs#reasonCivicInterference'
+  | 'tools.ozone.report.defs#reasonCivicMisinformation'
+  | 'tools.ozone.report.defs#reasonCivicImpersonation'
+  | (string & {})
+
+/** Appeal a previously taken moderation action */
+export const REASONAPPEAL = `${id}#reasonAppeal`
+/** Animal welfare violations */
+export const REASONVIOLENCEANIMALWELFARE = `${id}#reasonViolenceAnimalWelfare`
+/** Threats or incitement */
+export const REASONVIOLENCETHREATS = `${id}#reasonViolenceThreats`
+/** Graphic violent content */
+export const REASONVIOLENCEGRAPHICCONTENT = `${id}#reasonViolenceGraphicContent`
+/** Self harm */
+export const REASONVIOLENCESELFHARM = `${id}#reasonViolenceSelfHarm`
+/** Glorification of violence */
+export const REASONVIOLENCEGLORIFICATION = `${id}#reasonViolenceGlorification`
+/** Extremist content. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONVIOLENCEEXTREMISTCONTENT = `${id}#reasonViolenceExtremistContent`
+/** Human trafficking */
+export const REASONVIOLENCETRAFFICKING = `${id}#reasonViolenceTrafficking`
+/** Other violent content */
+export const REASONVIOLENCEOTHER = `${id}#reasonViolenceOther`
+/** Adult sexual abuse content */
+export const REASONSEXUALABUSECONTENT = `${id}#reasonSexualAbuseContent`
+/** Non-consensual intimate imagery */
+export const REASONSEXUALNCII = `${id}#reasonSexualNCII`
+/** Sextortion */
+export const REASONSEXUALSEXTORTION = `${id}#reasonSexualSextortion`
+/** Deepfake adult content */
+export const REASONSEXUALDEEPFAKE = `${id}#reasonSexualDeepfake`
+/** Animal sexual abuse */
+export const REASONSEXUALANIMAL = `${id}#reasonSexualAnimal`
+/** Unlabelled adult content */
+export const REASONSEXUALUNLABELED = `${id}#reasonSexualUnlabeled`
+/** Other sexual violence content */
+export const REASONSEXUALOTHER = `${id}#reasonSexualOther`
+/** Child sexual abuse material (CSAM). These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYCSAM = `${id}#reasonChildSafetyCSAM`
+/** Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYGROOM = `${id}#reasonChildSafetyGroom`
+/** Privacy violation involving a minor */
+export const REASONCHILDSAFETYMINORPRIVACY = `${id}#reasonChildSafetyMinorPrivacy`
+/** Child endangerment. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYENDANGERMENT = `${id}#reasonChildSafetyEndangerment`
+/** Harassment or bullying of minors */
+export const REASONCHILDSAFETYHARASSMENT = `${id}#reasonChildSafetyHarassment`
+/** Promotion of child exploitation. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYPROMOTION = `${id}#reasonChildSafetyPromotion`
+/** Other child safety. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYOTHER = `${id}#reasonChildSafetyOther`
+/** Trolling */
+export const REASONHARASSMENTTROLL = `${id}#reasonHarassmentTroll`
+/** Targeted harassment */
+export const REASONHARASSMENTTARGETED = `${id}#reasonHarassmentTargeted`
+/** Hate speech */
+export const REASONHARASSMENTHATESPEECH = `${id}#reasonHarassmentHateSpeech`
+/** Doxxing */
+export const REASONHARASSMENTDOXXING = `${id}#reasonHarassmentDoxxing`
+/** Other harassing or hateful content */
+export const REASONHARASSMENTOTHER = `${id}#reasonHarassmentOther`
+/** Fake account or bot */
+export const REASONMISLEADINGBOT = `${id}#reasonMisleadingBot`
+/** Impersonation */
+export const REASONMISLEADINGIMPERSONATION = `${id}#reasonMisleadingImpersonation`
+/** Spam */
+export const REASONMISLEADINGSPAM = `${id}#reasonMisleadingSpam`
+/** Scam */
+export const REASONMISLEADINGSCAM = `${id}#reasonMisleadingScam`
+/** Unlabelled gen-AI or synthetic content */
+export const REASONMISLEADINGSYNTHETICCONTENT = `${id}#reasonMisleadingSyntheticContent`
+/** Harmful false claims */
+export const REASONMISLEADINGMISINFORMATION = `${id}#reasonMisleadingMisinformation`
+/** Other misleading content */
+export const REASONMISLEADINGOTHER = `${id}#reasonMisleadingOther`
+/** Hacking or system attacks */
+export const REASONRULESITESECURITY = `${id}#reasonRuleSiteSecurity`
+/** Stolen content */
+export const REASONRULESTOLENCONTENT = `${id}#reasonRuleStolenContent`
+/** Promoting or selling prohibited items or services */
+export const REASONRULEPROHIBITEDSALES = `${id}#reasonRuleProhibitedSales`
+/** Banned user returning */
+export const REASONRULEBANEVASION = `${id}#reasonRuleBanEvasion`
+/** Other */
+export const REASONRULEOTHER = `${id}#reasonRuleOther`
+/** Electoral process violations */
+export const REASONCIVICELECTORALPROCESS = `${id}#reasonCivicElectoralProcess`
+/** Disclosure & transparency violations */
+export const REASONCIVICDISCLOSURE = `${id}#reasonCivicDisclosure`
+/** Voter intimidation or interference */
+export const REASONCIVICINTERFERENCE = `${id}#reasonCivicInterference`
+/** Election misinformation */
+export const REASONCIVICMISINFORMATION = `${id}#reasonCivicMisinformation`
+/** Impersonation of electoral officials/entities */
+export const REASONCIVICIMPERSONATION = `${id}#reasonCivicImpersonation`

package/src/logger.ts

@@ -3,6 +3,7 @@ import { stdSerializers } from 'pino'
 import { pinoHttp } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
+export const blobStoreLogger = subsystemLogger('pds:blob-store')
 export const dbLogger = subsystemLogger('pds:db')
 export const didCacheLogger = subsystemLogger('pds:did-cache')
 export const readStickyLogger = subsystemLogger('pds:read-sticky')

package/src/scripts/rebuild-repo.ts

@@ -35,11 +35,10 @@ export const rebuildRepo = async (
 ) => {
   const memoryStore = new MemoryBlockstore()
   const commit = await ctx.actorStore.transact(did, async (store) => {
-    const [rootDetails, records, existingCids] = await Promise.all([
-      store.repo.storage.getRootDetailed(),
-      store.record.listAll(),
-      store.record.listExistingBlocks(),
-    ])
+    const rootDetails = await store.repo.storage.getRootDetailed()
+    const records = await store.record.listAll()
+    const existingCids = await store.record.listExistingBlocks()
+
     // increment existing rev by 1 ms
     const revTid = TID.fromStr(rootDetails.rev)
     const rev = TID.fromTime(

package/src/scripts/sequencer-recovery/recoverer.ts

@@ -139,11 +139,9 @@ const processCommit = async (ctx: RecovererContext, evt: CommitEvt) => {
     commit.newBlocks = blocks
     commit.cid = evt.commit
     commit.rev = evt.rev
-    await Promise.all([
-      actorTxn.repo.storage.applyCommit(commit),
-      actorTxn.repo.indexWrites(writes, commit.rev),
-      trackBlobs(actorTxn, writes),
-    ])
+    await actorTxn.repo.storage.applyCommit(commit)
+    await actorTxn.repo.indexWrites(writes, commit.rev)
+    await trackBlobs(actorTxn, writes)
   })
 }
 
@@ -165,13 +163,11 @@ const processRepoCreation = async (
     relevantBlocks: new BlockMap(),
     removedCids: new CidSet(),
   }
-  await ctx.actorStore.transact(did, (actorTxn) =>
-    Promise.all([
-      actorTxn.repo.storage.applyCommit(commit, true),
-      actorTxn.repo.indexWrites(writes, commit.rev),
-      actorTxn.repo.blob.processWriteBlobs(commit.rev, writes),
-    ]),
-  )
+  await ctx.actorStore.transact(did, async (actorTxn) => {
+    await actorTxn.repo.storage.applyCommit(commit, true)
+    await actorTxn.repo.indexWrites(writes, commit.rev)
+    await actorTxn.repo.blob.processWriteBlobs(commit.rev, writes)
+  })
   await trackNewAccount(ctx.recoveryDb, did)
 }
 

package/src/sequencer/sequencer.ts

@@ -160,11 +160,11 @@ export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
   }
 
   async sequenceEvt(evt: RepoSeqInsert): Promise<number> {
-    const res = await this.db.executeWithRetry(
-      this.db.db.insertInto('repo_seq').values(evt).returningAll(),
+    const [{ seq }] = await this.db.executeWithRetry(
+      this.db.db.insertInto('repo_seq').values(evt).returning('seq'),
     )
     this.crawlers.notifyOfUpdate()
-    return res[0].seq
+    return seq
   }
 
   async sequenceCommit(

package/tests/proxied/__snapshots__/feedgen.test.ts.snap

@@ -37,6 +37,7 @@ Object {
             "muted": false,
           },
         },
+        "bookmarkCount": 0,
         "cid": "cids(0)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [
@@ -67,6 +68,7 @@ Object {
         "repostCount": 0,
         "uri": "record(0)",
         "viewer": Object {
+          "bookmarked": false,
           "embeddingDisabled": false,
           "threadMuted": false,
         },
@@ -90,6 +92,7 @@ Object {
             "muted": false,
           },
         },
+        "bookmarkCount": 0,
         "cid": "cids(3)",
         "embed": Object {
           "$type": "app.bsky.embed.recordWithMedia#view",
@@ -200,6 +203,7 @@ Object {
         "repostCount": 0,
         "uri": "record(2)",
         "viewer": Object {
+          "bookmarked": false,
           "embeddingDisabled": false,
           "like": "record(8)",
           "threadMuted": false,