@atproto/pds 0.4.6-next.1 → 0.4.7

package/dist/lexicon/lexicons.d.ts

@@ -2206,6 +2206,11 @@ export declare const schemaDict: {
                                 description: string;
                                 ref: string;
                             };
+                            contact: {
+                                type: string;
+                                description: string;
+                                ref: string;
+                            };
                             did: {
                                 type: string;
                                 format: string;
@@ -2225,6 +2230,14 @@ export declare const schemaDict: {
                     };
                 };
             };
+            contact: {
+                type: string;
+                properties: {
+                    email: {
+                        type: string;
+                    };
+                };
+            };
         };
     };
     ComAtprotoServerGetAccountInviteCodes: {

package/dist/lexicon/types/com/atproto/server/describeServer.d.ts

@@ -9,6 +9,7 @@ export interface OutputSchema {
     phoneVerificationRequired?: boolean;
     availableUserDomains: string[];
     links?: Links;
+    contact?: Contact;
     did: string;
     [k: string]: unknown;
 }
@@ -40,3 +41,9 @@ export interface Links {
 }
 export declare function isLinks(v: unknown): v is Links;
 export declare function validateLinks(v: unknown): ValidationResult;
+export interface Contact {
+    email?: string;
+    [k: string]: unknown;
+}
+export declare function isContact(v: unknown): v is Contact;
+export declare function validateContact(v: unknown): ValidationResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.6-next.1",
+  "version": "0.4.7",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -44,16 +44,16 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "zod": "^3.21.4",
-    "@atproto/aws": "^0.1.8",
-    "@atproto/common": "^0.3.3",
-    "@atproto/identity": "^0.3.2",
-    "@atproto/lexicon": "^0.3.2",
-    "@atproto/syntax": "^0.2.0",
-    "@atproto/repo": "^0.3.8",
-    "@atproto/xrpc": "^0.4.2",
-    "@atproto/api": "^0.11.0-next",
-    "@atproto/xrpc-server": "^0.4.3",
-    "@atproto/crypto": "^0.3.0"
+    "@atproto/api": "^0.11.1",
+    "@atproto/aws": "^0.1.9",
+    "@atproto/common": "^0.3.4",
+    "@atproto/crypto": "^0.3.0",
+    "@atproto/identity": "^0.3.3",
+    "@atproto/lexicon": "^0.3.3",
+    "@atproto/repo": "^0.3.9",
+    "@atproto/syntax": "^0.2.1",
+    "@atproto/xrpc": "^0.4.3",
+    "@atproto/xrpc-server": "^0.4.4"
   },
   "devDependencies": {
     "@atproto/pds-entryway": "npm:@atproto/pds@0.3.0-entryway.3",
@@ -68,10 +68,10 @@
     "axios": "^0.27.2",
     "get-port": "^6.1.2",
     "ws": "^8.12.0",
-    "@atproto/dev-env": "^0.2.37",
-    "@atproto/api": "^0.11.0-next",
-    "@atproto/lex-cli": "^0.3.1",
-    "@atproto/bsky": "^0.0.37"
+    "@atproto/api": "^0.11.1",
+    "@atproto/bsky": "^0.0.39",
+    "@atproto/dev-env": "^0.2.39",
+    "@atproto/lex-cli": "^0.3.2"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/com/atproto/server/describeServer.ts

@@ -7,6 +7,7 @@ export default function (server: Server, ctx: AppContext) {
     const inviteCodeRequired = ctx.cfg.invites.required
     const privacyPolicy = ctx.cfg.service.privacyPolicyUrl
     const termsOfService = ctx.cfg.service.termsOfServiceUrl
+    const contactEmailAddress = ctx.cfg.service.contactEmailAddress
 
     return {
       encoding: 'application/json',
@@ -15,6 +16,9 @@ export default function (server: Server, ctx: AppContext) {
         availableUserDomains,
         inviteCodeRequired,
         links: { privacyPolicy, termsOfService },
+        contact: {
+          email: contactEmailAddress,
+        },
       },
     }
   })

package/src/config/config.ts

@@ -22,6 +22,7 @@ export const envToCfg = (env: ServerEnvironment): ServerConfig => {
     version: env.version, // default?
     privacyPolicyUrl: env.privacyPolicyUrl,
     termsOfServiceUrl: env.termsOfServiceUrl,
+    contactEmailAddress: env.contactEmailAddress,
     acceptingImports: env.acceptingImports ?? true,
     blobUploadLimit: env.blobUploadLimit ?? 5 * 1024 * 1024, // 5mb
     devMode: env.devMode ?? false,
@@ -281,6 +282,7 @@ export type ServiceConfig = {
   termsOfServiceUrl?: string
   acceptingImports: boolean
   blobUploadLimit: number
+  contactEmailAddress?: string
   devMode: boolean
 }
 

package/src/config/env.ts

@@ -9,6 +9,7 @@ export const readEnv = (): ServerEnvironment => {
     version: envStr('PDS_VERSION'),
     privacyPolicyUrl: envStr('PDS_PRIVACY_POLICY_URL'),
     termsOfServiceUrl: envStr('PDS_TERMS_OF_SERVICE_URL'),
+    contactEmailAddress: envStr('PDS_CONTACT_EMAIL_ADDRESS'),
     acceptingImports: envBool('PDS_ACCEPTING_REPO_IMPORTS'),
     blobUploadLimit: envInt('PDS_BLOB_UPLOAD_LIMIT'),
     devMode: envBool('PDS_DEV_MODE'),
@@ -115,6 +116,7 @@ export type ServerEnvironment = {
   version?: string
   privacyPolicyUrl?: string
   termsOfServiceUrl?: string
+  contactEmailAddress?: string
   acceptingImports?: boolean
   blobUploadLimit?: number
   devMode?: boolean

package/src/lexicon/lexicons.ts

@@ -2420,6 +2420,11 @@ export const schemaDict = {
                 description: 'URLs of service policy documents.',
                 ref: 'lex:com.atproto.server.describeServer#links',
               },
+              contact: {
+                type: 'ref',
+                description: 'Contact information',
+                ref: 'lex:com.atproto.server.describeServer#contact',
+              },
               did: {
                 type: 'string',
                 format: 'did',
@@ -2439,6 +2444,14 @@ export const schemaDict = {
           },
         },
       },
+      contact: {
+        type: 'object',
+        properties: {
+          email: {
+            type: 'string',
+          },
+        },
+      },
     },
   },
   ComAtprotoServerGetAccountInviteCodes: {

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

@@ -20,6 +20,7 @@ export interface OutputSchema {
   /** List of domain suffixes that can be used in account handles. */
   availableUserDomains: string[]
   links?: Links
+  contact?: Contact
   did: string
   [k: string]: unknown
 }
@@ -66,3 +67,20 @@ export function isLinks(v: unknown): v is Links {
 export function validateLinks(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.server.describeServer#links', v)
 }
+
+export interface Contact {
+  email?: string
+  [k: string]: unknown
+}
+
+export function isContact(v: unknown): v is Contact {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.server.describeServer#contact'
+  )
+}
+
+export function validateContact(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.server.describeServer#contact', v)
+}

package/tests/account.test.ts

@@ -26,6 +26,7 @@ describe('account', () => {
     network = await TestNetworkNoAppView.create({
       dbPostgresSchema: 'account',
       pds: {
+        contactEmailAddress: 'abuse@example.com',
         termsOfServiceUrl: 'https://example.com/tos',
         privacyPolicyUrl: 'https://example.com/privacy-policy',
       },
@@ -58,6 +59,7 @@ describe('account', () => {
       'https://example.com/privacy-policy',
     )
     expect(res.data.links?.termsOfService).toBe('https://example.com/tos')
+    expect(res.data.contact?.email).toBe('abuse@example.com')
   })
 
   it('fails on invalid handles', async () => {

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

@@ -14,7 +14,6 @@ Object {
             Object {
               "cid": "cids(2)",
               "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
               "src": "user(0)",
               "uri": "record(1)",
               "val": "self-label-a",
@@ -22,7 +21,6 @@ Object {
             Object {
               "cid": "cids(2)",
               "cts": "1970-01-01T00:00:00.000Z",
-              "neg": false,
               "src": "user(0)",
               "uri": "record(1)",
               "val": "self-label-b",
@@ -39,7 +37,6 @@ Object {
           Object {
             "cid": "cids(0)",
             "cts": "1970-01-01T00:00:00.000Z",
-            "neg": false,
             "src": "user(0)",
             "uri": "record(0)",
             "val": "self-label",