@atproto/pds 0.4.22 → 0.4.24

package/src/lexicon/lexicons.ts

@@ -8306,24 +8306,24 @@ export const schemaDict = {
     defs: {
       messageRef: {
         type: 'object',
-        required: ['did', 'messageId'],
+        required: ['did', 'messageId', 'convoId'],
         properties: {
           did: {
             type: 'string',
             format: 'did',
           },
+          convoId: {
+            type: 'string',
+          },
           messageId: {
             type: 'string',
           },
         },
       },
-      message: {
+      messageInput: {
         type: 'object',
         required: ['text'],
         properties: {
-          id: {
-            type: 'string',
-          },
           text: {
             type: 'string',
             maxLength: 10000,
@@ -8825,7 +8825,7 @@ export const schemaDict = {
               },
               message: {
                 type: 'ref',
-                ref: 'lex:chat.bsky.convo.defs#message',
+                ref: 'lex:chat.bsky.convo.defs#messageInput',
               },
             },
           },
@@ -8854,6 +8854,7 @@ export const schemaDict = {
             properties: {
               items: {
                 type: 'array',
+                maxLength: 100,
                 items: {
                   type: 'ref',
                   ref: 'lex:chat.bsky.convo.sendMessageBatch#batchItem',
@@ -8888,7 +8889,7 @@ export const schemaDict = {
           },
           message: {
             type: 'ref',
-            ref: 'lex:chat.bsky.convo.defs#message',
+            ref: 'lex:chat.bsky.convo.defs#messageInput',
           },
         },
       },
@@ -9038,6 +9039,11 @@ export const schemaDict = {
           type: 'params',
           required: ['messageId'],
           properties: {
+            convoId: {
+              type: 'string',
+              description:
+                'Conversation that the message is from. NOTE: this field will eventually be required.',
+            },
             messageId: {
               type: 'string',
             },
@@ -9340,6 +9346,7 @@ export const schemaDict = {
             refs: [
               'lex:com.atproto.admin.defs#repoRef',
               'lex:com.atproto.repo.strongRef',
+              'lex:chat.bsky.convo.defs#messageRef',
             ],
           },
           subjectBlobCids: {

package/src/lexicon/types/chat/bsky/convo/defs.ts

@@ -11,6 +11,7 @@ import * as ChatBskyActorDefs from '../actor/defs'
 
 export interface MessageRef {
   did: string
+  convoId: string
   messageId: string
   [k: string]: unknown
 }
@@ -27,8 +28,7 @@ export function validateMessageRef(v: unknown): ValidationResult {
   return lexicons.validate('chat.bsky.convo.defs#messageRef', v)
 }
 
-export interface Message {
-  id?: string
+export interface MessageInput {
   text: string
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
@@ -36,16 +36,16 @@ export interface Message {
   [k: string]: unknown
 }
 
-export function isMessage(v: unknown): v is Message {
+export function isMessageInput(v: unknown): v is MessageInput {
   return (
     isObj(v) &&
     hasProp(v, '$type') &&
-    v.$type === 'chat.bsky.convo.defs#message'
+    v.$type === 'chat.bsky.convo.defs#messageInput'
   )
 }
 
-export function validateMessage(v: unknown): ValidationResult {
-  return lexicons.validate('chat.bsky.convo.defs#message', v)
+export function validateMessageInput(v: unknown): ValidationResult {
+  return lexicons.validate('chat.bsky.convo.defs#messageInput', v)
 }
 
 export interface MessageView {

package/src/lexicon/types/chat/bsky/convo/sendMessage.ts

@@ -13,7 +13,7 @@ export interface QueryParams {}
 
 export interface InputSchema {
   convoId: string
-  message: ChatBskyConvoDefs.Message
+  message: ChatBskyConvoDefs.MessageInput
   [k: string]: unknown
 }
 

package/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts

@@ -51,7 +51,7 @@ export type Handler<HA extends HandlerAuth = never> = (
 
 export interface BatchItem {
   convoId: string
-  message: ChatBskyConvoDefs.Message
+  message: ChatBskyConvoDefs.MessageInput
   [k: string]: unknown
 }
 

package/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts

@@ -10,6 +10,8 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 import * as ChatBskyConvoDefs from '../convo/defs'
 
 export interface QueryParams {
+  /** Conversation that the message is from. NOTE: this field will eventually be required. */
+  convoId?: string
   messageId: string
   before: number
   after: number

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

@@ -7,6 +7,7 @@ import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
 import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
@@ -32,6 +33,7 @@ export interface ModEventView {
   subject:
     | ComAtprotoAdminDefs.RepoRef
     | ComAtprotoRepoStrongRef.Main
+    | ChatBskyConvoDefs.MessageRef
     | { $type: string; [k: string]: unknown }
   subjectBlobCids: string[]
   createdBy: string

package/src/pipethrough.ts

@@ -3,7 +3,7 @@ import * as ui8 from 'uint8arrays'
 import net from 'node:net'
 import stream from 'node:stream'
 import webStream from 'node:stream/web'
-import { jsonToLex } from '@atproto/lexicon'
+import { LexValue, jsonToLex, stringifyLex } from '@atproto/lexicon'
 import {
   CatchallHandler,
   HandlerPipeThrough,
@@ -45,6 +45,22 @@ export const pipethrough = async (
   return parseProxyRes(res)
 }
 
+export const pipethroughProcedure = async (
+  ctx: AppContext,
+  req: express.Request,
+  requester: string | null,
+  body?: LexValue,
+): Promise<HandlerPipeThrough> => {
+  const { url, aud } = await formatUrlAndAud(ctx, req)
+  const headers = await formatHeaders(ctx, req, aud, requester)
+  const encodedBody = body
+    ? new TextEncoder().encode(stringifyLex(body))
+    : undefined
+  const reqInit = formatReqInit(req, headers, encodedBody)
+  const res = await makeRequest(url, reqInit)
+  return parseProxyRes(res)
+}
+
 // Request setup/formatting
 // -------------------
 

package/tests/crud.test.ts

@@ -517,6 +517,36 @@ describe('crud operations', () => {
         description: 'Dog lover',
       })
     })
+
+    // @TODO remove after migrating legacy blobs
+    it('updates a legacy blob ref when updating profile', async () => {
+      const { repo } = bobAgent.api.com.atproto
+      const file = await fs.readFile(
+        '../dev-env/src/seed/img/key-portrait-small.jpg',
+      )
+      const uploadedRes = await repo.uploadBlob(file, {
+        encoding: 'image/jpeg',
+      })
+
+      await repo.putRecord({
+        ...profilePath,
+        repo: bob.did,
+        record: {
+          displayName: 'Robert',
+          avatar: BlobRef.fromJsonRef({
+            mimeType: uploadedRes.data.blob.mimeType,
+            cid: uploadedRes.data.blob.ref.toString(),
+          }),
+        },
+      })
+
+      const got = await repo.getRecord({
+        ...profilePath,
+        repo: bob.did,
+      })
+      const gotAvatar = got.data.value['avatar'] as BlobRef
+      expect(gotAvatar.original).toEqual(uploadedRes.data.blob.original)
+    })
   })
 
   // Validation

package/tests/server.test.ts

@@ -64,7 +64,7 @@ describe('server', () => {
       await axios.post(
         `${network.pds.url}/xrpc/com.atproto.repo.createRecord`,
         {
-          data: 'x'.repeat(100 * 1024), // 100kb
+          data: 'x'.repeat(150 * 1024), // 150kb
         },
         { headers: sc.getHeaders(alice) },
       )