Merge remote-tracking branch 'origin' into eric/getSuggestedFollowsBy…

…Actor * origin: Get rate limit ip correctly (#1577) Remove temp.upgradeRepoVersion (#1588) Fix getRepo `since` (#1579) Prevent user pref races (#1576) Feature: block lists (#1531) Enable appview proxy in dev-env full network (#1580) Increase timeline threshold (#1573) @atproto/[email protected] Fixes and updates to the preferences API (#1575) Remove legacy repo sync impl (#1570) Move fuzzy matcher to appview (#1566) @atproto/[email protected] Add personal-details user preference with birth date (#1565) enable granular perms for publish action (#1563) maintain feed order (#1559)
bluesky-social · Sep 12, 2023 · 6af359c · 6af359c
2 parents a32995e + 0533fab
commit 6af359c
Show file tree

Hide file tree

Showing 127 changed files with 5,136 additions and 2,617 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -13,6 +13,9 @@ jobs:
   build:
     name: Build & Publish
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2

diff --git a/.github/workflows/repo.yaml b/.github/workflows/repo.yaml
@@ -3,7 +3,7 @@ name: Test
 on:
   pull_request:
     branches:
-      - main
+      - '*'
 
 concurrency:
   group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'

diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
@@ -94,7 +94,12 @@
       "type": "array",
       "items": {
         "type": "union",
-        "refs": ["#adultContentPref", "#contentLabelPref", "#savedFeedsPref"]
+        "refs": [
+          "#adultContentPref",
+          "#contentLabelPref",
+          "#savedFeedsPref",
+          "#personalDetailsPref"
+        ]
       }
     },
     "adultContentPref": {
@@ -134,6 +139,16 @@
           }
         }
       }
+    },
+    "personalDetailsPref": {
+      "type": "object",
+      "properties": {
+        "birthDate": {
+          "type": "string",
+          "format": "datetime",
+          "description": "The birth date of the owner of the account."
+        }
+      }
     }
   }
 }
diff --git a/lexicons/app/bsky/graph/defs.json b/lexicons/app/bsky/graph/defs.json
@@ -56,7 +56,8 @@
     "listViewerState": {
       "type": "object",
       "properties": {
-        "muted": { "type": "boolean" }
+        "muted": { "type": "boolean" },
+        "blocked": { "type": "string", "format": "at-uri" }
       }
     }
   }

diff --git a/lexicons/app/bsky/graph/getListBlocks.json b/lexicons/app/bsky/graph/getListBlocks.json
@@ -0,0 +1,36 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.getListBlocks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Which lists is the requester's account blocking?",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": { "type": "string" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["lists"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "lists": {
+              "type": "array",
+              "items": { "type": "ref", "ref": "app.bsky.graph.defs#listView" }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/app/bsky/graph/listblock.json b/lexicons/app/bsky/graph/listblock.json
@@ -0,0 +1,19 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.listblock",
+  "defs": {
+    "main": {
+      "type": "record",
+      "description": "A block of an entire list of actors.",
+      "key": "tid",
+      "record": {
+        "type": "object",
+        "required": ["subject", "createdAt"],
+        "properties": {
+          "subject": { "type": "string", "format": "at-uri" },
+          "createdAt": { "type": "string", "format": "datetime" }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/atproto/sync/getRepo.json b/lexicons/com/atproto/sync/getRepo.json
@@ -16,7 +16,6 @@
           },
           "since": {
             "type": "string",
-            "format": "cid",
             "description": "The revision of the repo to catch up from."
           }
         }

diff --git a/lexicons/com/atproto/sync/listBlobs.json b/lexicons/com/atproto/sync/listBlobs.json
@@ -16,7 +16,6 @@
           },
           "since": {
             "type": "string",
-            "format": "cid",
             "description": "Optional revision of the repo to list blobs since"
           },
           "limit": {

diff --git a/lexicons/com/atproto/temp/upgradeRepoVersion.json b/lexicons/com/atproto/temp/upgradeRepoVersion.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "main": "src/index.ts",
   "publishConfig": {
     "main": "dist/index.js",

diff --git a/packages/api/src/bsky-agent.ts b/packages/api/src/bsky-agent.ts
@@ -8,6 +8,15 @@ import {
 } from './client'
 import { BskyPreferences, BskyLabelPreference } from './types'
 
+declare global {
+  interface Array<T> {
+    findLast(
+      predicate: (value: T, index: number, obj: T[]) => unknown,
+      thisArg?: any,
+    ): T
+  }
+}
+
 export class BskyAgent extends AtpAgent {
   get app() {
     return this.api.app
@@ -247,6 +256,7 @@ export class BskyAgent extends AtpAgent {
       },
       adultContentEnabled: false,
       contentLabels: {},
+      birthDate: undefined,
     }
     const res = await this.app.bsky.actor.getPreferences({})
     for (const pref of res.data.preferences) {
@@ -272,6 +282,13 @@ export class BskyAgent extends AtpAgent {
       ) {
         prefs.feeds.saved = pref.saved
         prefs.feeds.pinned = pref.pinned
+      } else if (
+        AppBskyActorDefs.isPersonalDetailsPref(pref) &&
+        AppBskyActorDefs.validatePersonalDetailsPref(pref).success
+      ) {
+        if (pref.birthDate) {
+          prefs.birthDate = new Date(pref.birthDate)
+        }
       }
     }
     return prefs
@@ -314,20 +331,22 @@ export class BskyAgent extends AtpAgent {
 
   async setAdultContentEnabled(v: boolean) {
     await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.find(
+      let adultContentPref = prefs.findLast(
         (pref) =>
           AppBskyActorDefs.isAdultContentPref(pref) &&
           AppBskyActorDefs.validateAdultContentPref(pref).success,
       )
-      if (existing) {
-        existing.enabled = v
+      if (adultContentPref) {
+        adultContentPref.enabled = v
       } else {
-        prefs.push({
+        adultContentPref = {
           $type: 'app.bsky.actor.defs#adultContentPref',
           enabled: v,
-        })
+        }
       }
       return prefs
+        .filter((pref) => !AppBskyActorDefs.isAdultContentPref(pref))
+        .concat([adultContentPref])
     })
   }
 
@@ -338,22 +357,53 @@ export class BskyAgent extends AtpAgent {
     }
 
     await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
-      const existing = prefs.find(
+      let labelPref = prefs.findLast(
         (pref) =>
           AppBskyActorDefs.isContentLabelPref(pref) &&
           AppBskyActorDefs.validateAdultContentPref(pref).success &&
           pref.label === key,
       )
-      if (existing) {
-        existing.visibility = value
+      if (labelPref) {
+        labelPref.visibility = value
       } else {
-        prefs.push({
+        labelPref = {
           $type: 'app.bsky.actor.defs#contentLabelPref',
           label: key,
           visibility: value,
-        })
+        }
+      }
+      return prefs
+        .filter(
+          (pref) =>
+            !AppBskyActorDefs.isContentLabelPref(pref) || pref.label !== key,
+        )
+        .concat([labelPref])
+    })
+  }
+
+  async setPersonalDetails({
+    birthDate,
+  }: {
+    birthDate: string | Date | undefined
+  }) {
+    birthDate = birthDate instanceof Date ? birthDate.toISOString() : birthDate
+    await updatePreferences(this, (prefs: AppBskyActorDefs.Preferences) => {
+      let personalDetailsPref = prefs.findLast(
+        (pref) =>
+          AppBskyActorDefs.isPersonalDetailsPref(pref) &&
+          AppBskyActorDefs.validatePersonalDetailsPref(pref).success,
+      )
+      if (personalDetailsPref) {
+        personalDetailsPref.birthDate = birthDate
+      } else {
+        personalDetailsPref = {
+          $type: 'app.bsky.actor.defs#personalDetailsPref',
+          birthDate,
+        }
       }
       return prefs
+        .filter((pref) => !AppBskyActorDefs.isPersonalDetailsPref(pref))
+        .concat([personalDetailsPref])
     })
   }
 }
@@ -394,7 +444,7 @@ async function updateFeedPreferences(
 ): Promise<{ saved: string[]; pinned: string[] }> {
   let res
   await updatePreferences(agent, (prefs: AppBskyActorDefs.Preferences) => {
-    let feedsPref = prefs.find(
+    let feedsPref = prefs.findLast(
       (pref) =>
         AppBskyActorDefs.isSavedFeedsPref(pref) &&
         AppBskyActorDefs.validateSavedFeedsPref(pref).success,