bluesky-social · dholms · Mar 6, 2024 · Dec 7, 2023 · Dec 7, 2023 · Dec 7, 2023
diff --git a/.github/workflows/build-and-push-bsky-ghcr.yaml b/.github/workflows/build-and-push-bsky-ghcr.yaml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - main
+      - bav-v2-drop-pg
+      - bav-v2-dataplane-clients
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

diff --git a/.prettierignore b/.prettierignore
@@ -8,3 +8,4 @@ pnpm-lock.yaml
 .pnpm*
 .changeset
 *.d.ts
+packages/bsky/src/data-plane/gen
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
@@ -68,6 +68,10 @@
         "followersCount": { "type": "integer" },
         "followsCount": { "type": "integer" },
         "postsCount": { "type": "integer" },
+        "associated": {
+          "type": "ref",
+          "ref": "#profileAssociated"
+        },
         "indexedAt": { "type": "string", "format": "datetime" },
         "viewer": { "type": "ref", "ref": "#viewerState" },
         "labels": {
@@ -76,6 +80,14 @@
         }
       }
     },
+    "profileAssociated": {
+      "type": "object",
+      "properties": {
+        "lists": { "type": "integer" },
+        "feedgens": { "type": "integer" },
+        "modservice": { "type": "boolean" }
+      }
+    },
     "viewerState": {
       "type": "object",
       "properties": {
@@ -199,6 +211,50 @@
           "description": "Show followed users at the top of all replies."
         }
       }
+    },
+    "modsPref": {
+      "type": "object",
+      "required": ["mods"],
+      "properties": {
+        "mods": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "#modPrefItem"
+          }
+        }
+      }
+    },
+    "modPrefItem": {
+      "type": "object",
+      "required": ["did", "enabled", "labelGroupSettings"],
+      "properties": {
+        "did": {
+          "type": "string",
+          "format": "did"
+        },
+        "enabled": {
+          "type": "boolean"
+        },
+        "labelGroupSettings": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "#labelGroupSetting"
+          }
+        }
+      }
+    },
+    "labelGroupSetting": {
+      "type": "object",
+      "required": ["labelGroup", "visibility"],
+      "properties": {
+        "labelGroup": { "type": "string" },
+        "visibility": {
+          "type": "string",
+          "knownValues": ["show", "warn", "hide"]
+        }
+      }
     }
   }
 }
diff --git a/lexicons/app/bsky/embed/record.json b/lexicons/app/bsky/embed/record.json
@@ -21,7 +21,8 @@
             "#viewNotFound",
             "#viewBlocked",
             "app.bsky.feed.defs#generatorView",
-            "app.bsky.graph.defs#listView"
+            "app.bsky.graph.defs#listView",
+            "app.bsky.moderation.defs#modServiceView"
           ]
         }
       }

diff --git a/lexicons/app/bsky/moderation/defs.json b/lexicons/app/bsky/moderation/defs.json
@@ -0,0 +1,95 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.moderation.defs",
+  "defs": {
+    "modServiceView": {
+      "type": "object",
+      "required": ["uri", "cid", "creator", "indexedAt"],
+      "properties": {
+        "uri": { "type": "string", "format": "at-uri" },
+        "cid": { "type": "string", "format": "cid" },
+        "creator": { "type": "ref", "ref": "app.bsky.actor.defs#profileView" },
+        "description": {
+          "type": "string",
+          "maxGraphemes": 300,
+          "maxLength": 3000
+        },
+        "descriptionFacets": {
+          "type": "array",
+          "items": { "type": "ref", "ref": "app.bsky.richtext.facet" }
+        },
+        "likeCount": { "type": "integer", "minimum": 0 },
+        "viewer": { "type": "ref", "ref": "#modServiceViewerState" },
+        "indexedAt": { "type": "string", "format": "datetime" },
+        "labels": {
+          "type": "array",
+          "items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
+        }
+      }
+    },
+    "modServiceViewDetailed": {
+      "type": "object",
+      "required": ["uri", "cid", "creator", "policies", "indexedAt"],
+      "properties": {
+        "uri": { "type": "string", "format": "at-uri" },
+        "cid": { "type": "string", "format": "cid" },
+        "creator": { "type": "ref", "ref": "app.bsky.actor.defs#profileView" },
+        "description": {
+          "type": "string",
+          "maxGraphemes": 300,
+          "maxLength": 3000
+        },
+        "descriptionFacets": {
+          "type": "array",
+          "items": { "type": "ref", "ref": "app.bsky.richtext.facet" }
+        },
+        "policies": {
+          "type": "ref",
+          "ref": "app.bsky.moderation.defs#modServicePolicies"
+        },
+        "likeCount": { "type": "integer", "minimum": 0 },
+        "viewer": { "type": "ref", "ref": "#modServiceViewerState" },
+        "indexedAt": { "type": "string", "format": "datetime" },
+        "labels": {
+          "type": "array",
+          "items": { "type": "ref", "ref": "com.atproto.label.defs#label" }
+        }
+      }
+    },
+    "modServiceViewerState": {
+      "type": "object",
+      "properties": {
+        "like": { "type": "string", "format": "at-uri" }
+      }
+    },
+    "modServicePolicies": {
+      "type": "object",
+      "required": ["reportReasons", "labelValues"],
+      "properties": {
+        "description": {
+          "type": "string",
+          "maxGraphemes": 10000,
+          "maxLength": 100000
+        },
+        "descriptionFacets": {
+          "type": "array",
+          "items": { "type": "ref", "ref": "app.bsky.richtext.facet" }
+        },
+        "reportReasons": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "com.atproto.moderation.defs#reasonType"
+          }
+        },
+        "labelValues": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "com.atproto.label.defs#labelValue"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/moderation/getService.json b/lexicons/app/bsky/moderation/getService.json
@@ -0,0 +1,24 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.moderation.getService",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get information about a moderation service.",
+      "parameters": {
+        "type": "params",
+        "required": ["did"],
+        "properties": {
+          "did": { "type": "string", "format": "did" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "ref",
+          "ref": "app.bsky.moderation.defs#modServiceViewDetailed"
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/moderation/getServices.json b/lexicons/app/bsky/moderation/getServices.json
@@ -0,0 +1,36 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.moderation.getServices",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get information about a list of moderation services.",
+      "parameters": {
+        "type": "params",
+        "required": ["dids"],
+        "properties": {
+          "dids": {
+            "type": "array",
+            "items": { "type": "string", "format": "did" }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["views"],
+          "properties": {
+            "views": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.moderation.defs#modServiceView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/moderation/service.json b/lexicons/app/bsky/moderation/service.json
@@ -0,0 +1,35 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.moderation.service",
+  "defs": {
+    "main": {
+      "type": "record",
+      "description": "A declaration of the existence of moderation service.",
+      "key": "literal:self",
+      "record": {
+        "type": "object",
+        "required": ["policies", "createdAt"],
+        "properties": {
+          "description": {
+            "type": "string",
+            "maxGraphemes": 300,
+            "maxLength": 3000
+          },
+          "descriptionFacets": {
+            "type": "array",
+            "items": { "type": "ref", "ref": "app.bsky.richtext.facet" }
+          },
+          "policies": {
+            "type": "ref",
+            "ref": "app.bsky.moderation.defs#modServicePolicies"
+          },
+          "labels": {
+            "type": "union",
+            "refs": ["com.atproto.label.defs#selfLabels"]
+          },
+          "createdAt": { "type": "string", "format": "datetime" }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/atproto/label/defs.json b/lexicons/com/atproto/label/defs.json
@@ -61,6 +61,39 @@
           "description": "The short string name of the value or type of this label."
         }
       }
+    },
+    "labelValue": {
+      "type": "string",
+      "knownValues": [
+        "!hide",
+        "!no-promote",
+        "!warn",
+        "!no-unauthenticated",
+        "dmca-violation",
+        "doxxing",
+        "porn",
+        "sexual",
+        "nudity",
+        "nsfl",
+        "corpse",
+        "gore",
+        "torture",
+        "self-harm",
+        "intolerant-race",
+        "intolerant-gender",
+        "intolerant-sexual-orientation",
+        "intolerant-religion",
+        "intolerant",
+        "icon-intolerant",
+        "threat",
+        "spoiler",
+        "spam",
+        "account-security",
+        "net-abuse",
+        "impersonation",
+        "scam",
+        "misleading"
+      ]
     }
   }
 }
diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "@swc/jest": "^0.2.24",
     "@types/jest": "^28.1.4",
     "@types/node": "^18.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/eslint-plugin": "^6.14.0",
+    "@typescript-eslint/parser": "^6.14.0",
     "babel-eslint": "^10.1.0",
     "dotenv": "^16.0.3",
     "esbuild": "^0.14.48",
@@ -48,7 +48,7 @@
     "prettier": "^2.7.1",
     "prettier-config-standard": "^5.0.0",
     "ts-node": "^10.8.2",
-    "typescript": "^4.8.4"
+    "typescript": "^5.3.3"
   },
   "workspaces": {
     "packages": [

diff --git a/packages/bsky/bin/migration-create.ts b/packages/bsky/bin/migration-create.ts
@@ -14,7 +14,15 @@ export async function main() {
     )
   }
   const filename = `${prefix}-${name}`
-  const dir = path.join(__dirname, '..', 'src', 'db', 'migrations')
+  const dir = path.join(
+    __dirname,
+    '..',
+    'src',
+    'data-plane',
+    'server',
+    'db',
+    'migrations',
+  )
 
   await fs.writeFile(path.join(dir, `${filename}.ts`), template, { flag: 'wx' })
   await fs.writeFile(

diff --git a/packages/bsky/buf.gen.yaml b/packages/bsky/buf.gen.yaml
@@ -0,0 +1,13 @@
+version: v1
+plugins:
+  - plugin: es
+    opt:
+      - target=ts
+      - import_extension=.ts
+
+    out: src/data-plane/gen
+  - plugin: connect-es
+    opt:
+      - target=ts
+      - import_extension=.ts
+    out: src/data-plane/gen
diff --git a/packages/bsky/build.js b/packages/bsky/build.js
@@ -5,7 +5,7 @@ const buildShallow =
 
 require('esbuild').build({
   logLevel: 'info',
-  entryPoints: ['src/index.ts', 'src/db/index.ts'],
+  entryPoints: ['src/index.ts'],
   bundle: true,
   sourcemap: true,
   outdir: 'dist',
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ pnpm-lock.yaml @@
     .pnpm*
     .changeset
     *.d.ts
+    packages/bsky/src/data-plane/gen