Merge branch 'main' into single-sign-on

Author: avdb13

.changeset/hot-panthers-learn.md

@@ -1,4 +1,5 @@
 packages/api/src/client
+packages/lexicon-resolver/src/client
 packages/bsky/src/lexicon
 packages/pds/src/lexicon
 packages/ozone/src/lexicon

.changeset/lazy-meals-doubt.md

@@ -1,4 +1,7 @@
-packages/**/src/lexicon/** linguist-generated
-packages/api/src/client/** linguist-generated
-packages/bsky/src/proto/** linguist-generated
-packages/bsync/src/proto/** linguist-generated
+packages/**/src/lexicon/** linguist-generated=true
+packages/api/src/client/** linguist-generated=true
+packages/lexicon-resolver/src/client/** linguist-generated=true
+packages/bsky/src/proto/** linguist-generated=true
+packages/bsync/src/proto/** linguist-generated=true
+
+packages/oauth/oauth-provider-ui/src/locales/**/messages.po linguist-generated=true

.eslintignore

@@ -0,0 +1,31 @@
+name: Sync to internal repo
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  sync:
+    if: github.repository == 'bluesky-social/atproto'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout public repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Generate GitHub App Token
+        id: app-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.SYNC_INTERNAL_APP_ID }}
+          private-key: ${{ secrets.SYNC_INTERNAL_PK }}
+          repositories: atproto-internal
+      - name: Push to internal repo
+        env:
+          TOKEN: ${{ steps.app-token.outputs.token }}
+        run: |
+          git config user.name "github-actions"
+          git config user.email "[email protected]"
+          git config --unset-all http.https://github.com/.extraheader
+          git remote add internal https://x-access-token:${TOKEN}@github.com/bluesky-social/atproto-internal.git
+          git push internal main --force

.gitattributes

@@ -9,11 +9,11 @@ CHANGELOG.md
 
 # Prettier is used to format the code during codegen
 packages/api/src/client
+packages/lexicon-resolver/src/client
 packages/bsky/src/lexicon
 packages/pds/src/lexicon
 packages/ozone/src/lexicon
 
 # Automatically generated by lingui
 packages/oauth/*/src/locales/*/messages.ts
 packages/oauth/oauth-provider-frontend/src/routeTree.gen.ts
-

.github/workflows/sync-internal.yaml

@@ -20,7 +20,15 @@
             "maximum": 100,
             "default": 50
           },
-          "cursor": { "type": "string" }
+          "cursor": { "type": "string" },
+          "purposes": {
+            "type": "array",
+            "description": "Optional filter by list purpose. If not specified, all supported types are returned.",
+            "items": {
+              "type": "string",
+              "knownValues": ["modlist", "curatelist"]
+            }
+          }
         }
       },
       "output": {

.prettierignore

@@ -0,0 +1,65 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.getListsWithMembership",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Enumerates the lists created by the session user, and includes membership information about `actor` in those lists. Only supports curation and moderation lists (no reference lists, used in starter packs). Requires auth.",
+      "parameters": {
+        "type": "params",
+        "required": ["actor"],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The account (actor) to check for membership."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": { "type": "string" },
+          "purposes": {
+            "type": "array",
+            "description": "Optional filter by list purpose. If not specified, all supported types are returned.",
+            "items": {
+              "type": "string",
+              "knownValues": ["modlist", "curatelist"]
+            }
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["listsWithMembership"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "listsWithMembership": {
+              "type": "array",
+              "items": { "type": "ref", "ref": "#listWithMembership" }
+            }
+          }
+        }
+      }
+    },
+    "listWithMembership": {
+      "description": "A list and an optional list item indicating membership of a target user to that list.",
+      "type": "object",
+      "required": ["list"],
+      "properties": {
+        "list": {
+          "type": "ref",
+          "ref": "app.bsky.graph.defs#listView"
+        },
+        "listItem": {
+          "type": "ref",
+          "ref": "app.bsky.graph.defs#listItemView"
+        }
+      }
+    }
+  }
+}

lexicons/app/bsky/graph/getLists.json

@@ -0,0 +1,57 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.getStarterPacksWithMembership",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Enumerates the starter packs created by the session user, and includes membership information about `actor` in those starter packs. Requires auth.",
+      "parameters": {
+        "type": "params",
+        "required": ["actor"],
+        "properties": {
+          "actor": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "The account (actor) to check for membership."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": { "type": "string" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacksWithMembership"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "starterPacksWithMembership": {
+              "type": "array",
+              "items": { "type": "ref", "ref": "#starterPackWithMembership" }
+            }
+          }
+        }
+      }
+    },
+    "starterPackWithMembership": {
+      "description": "A starter pack and an optional list item indicating membership of a target user to that starter pack.",
+      "type": "object",
+      "required": ["starterPack"],
+      "properties": {
+        "starterPack": {
+          "type": "ref",
+          "ref": "app.bsky.graph.defs#starterPackView"
+        },
+        "listItem": {
+          "type": "ref",
+          "ref": "app.bsky.graph.defs#listItemView"
+        }
+      }
+    }
+  }
+}

lexicons/app/bsky/graph/getListsWithMembership.json

@@ -1,6 +1,6 @@
 {
   "lexicon": 1,
-  "id": "app.bsky.unspecced.checkHandleAvailability",
+  "id": "com.atproto.temp.checkHandleAvailability",
   "defs": {
     "main": {
       "type": "query",