Merge remote-tracking branch 'origin/main' into dm-schemas

* origin/main: (23 commits) Feed context & sendInteractions impl (#2402) Pass through topics headers (#2447) Version packages (#2446) ✨ Allow muting reporter (#2390) Version packages (#2443) Add `savedFeedsPrefV2` and new methods (#2427) fix(ozone): properly import "lande" ES module (from CJS) (#2441) Appview: remove replies to blocked posts from feeds (#2430) PDS: handle S3 upload timeout more gracefully (#2429) Appview: maintain language info when going out to a suggestions service (#2424) Appview: ensure hydration context tracks viewer did and not full service ref (#2423) ✨ Detect language from record content if lang property is not set (#2301) Version packages (#2422) Add email auth factor tools to API (#2419) Version packages (#2417) Lexicons: email auth factor (#2416) Suggestions skeleton impl (#2403) getSuggestionsSkeleton lexicon (#2399) Version packages (#2401) Appview: support new post search params, viewer context in search (#2409) ...
bluesky-social · Apr 29, 2024 · 4449c35 · 4449c35
2 parents 6036e37 + e306304
commit 4449c35
Show file tree

Hide file tree

Showing 126 changed files with 4,086 additions and 156 deletions.
diff --git a/.changeset/chilly-terms-add.md b/.changeset/chilly-terms-add.md
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
@@ -122,6 +122,7 @@
           "#adultContentPref",
           "#contentLabelPref",
           "#savedFeedsPref",
+          "#savedFeedsPrefV2",
           "#personalDetailsPref",
           "#feedViewPref",
           "#threadViewPref",
@@ -154,6 +155,38 @@
         }
       }
     },
+    "savedFeed": {
+      "type": "object",
+      "required": ["id", "type", "value", "pinned"],
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "knownValues": ["feed", "list", "timeline"]
+        },
+        "value": {
+          "type": "string"
+        },
+        "pinned": {
+          "type": "boolean"
+        }
+      }
+    },
+    "savedFeedsPrefV2": {
+      "type": "object",
+      "required": ["items"],
+      "properties": {
+        "items": {
+          "type": "array",
+          "items": {
+            "type": "ref",
+            "ref": "app.bsky.actor.defs#savedFeed"
+          }
+        }
+      }
+    },
     "savedFeedsPref": {
       "type": "object",
       "required": ["pinned", "saved"],

diff --git a/lexicons/app/bsky/actor/searchActorsTypeahead.json b/lexicons/app/bsky/actor/searchActorsTypeahead.json
@@ -16,11 +16,6 @@
             "type": "string",
             "description": "Search query prefix; not a full query string."
           },
-          "viewer": {
-            "type": "string",
-            "format": "did",
-            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking."
-          },
           "limit": {
             "type": "integer",
             "minimum": 1,

diff --git a/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json b/lexicons/app/bsky/unspecced/getSuggestionsSkeleton.json
@@ -0,0 +1,44 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getSuggestionsSkeleton",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Get a skeleton of suggested actors. Intended to be called and then hydrated through app.bsky.actor.getSuggestions",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "viewer": {
+            "type": "string",
+            "format": "did",
+            "description": "DID of the account making the request (not included for public/unauthenticated queries). Used to boost followed accounts in ranking."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 50
+          },
+          "cursor": { "type": "string" }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["actors"],
+          "properties": {
+            "cursor": { "type": "string" },
+            "actors": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.unspecced.defs#skeletonSearchActor"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/lexicons/com/atproto/server/createSession.json b/lexicons/com/atproto/server/createSession.json
@@ -15,7 +15,8 @@
               "type": "string",
               "description": "Handle or other identifier supported by the server for the authenticating user."
             },
-            "password": { "type": "string" }
+            "password": { "type": "string" },
+            "authFactorToken": { "type": "string" }
           }
         }
       },
@@ -31,11 +32,15 @@
             "did": { "type": "string", "format": "did" },
             "didDoc": { "type": "unknown" },
             "email": { "type": "string" },
-            "emailConfirmed": { "type": "boolean" }
+            "emailConfirmed": { "type": "boolean" },
+            "emailAuthFactor": { "type": "boolean" }
           }
         }
       },
-      "errors": [{ "name": "AccountTakedown" }]
+      "errors": [
+        { "name": "AccountTakedown" },
+        { "name": "AuthFactorTokenRequired" }
+      ]
     }
   }
 }
diff --git a/lexicons/com/atproto/server/getSession.json b/lexicons/com/atproto/server/getSession.json
@@ -15,6 +15,7 @@
             "did": { "type": "string", "format": "did" },
             "email": { "type": "string" },
             "emailConfirmed": { "type": "boolean" },
+            "emailAuthFactor": { "type": "boolean" },
             "didDoc": { "type": "unknown" }
           }
         }

diff --git a/lexicons/com/atproto/server/updateEmail.json b/lexicons/com/atproto/server/updateEmail.json
@@ -12,6 +12,7 @@
           "required": ["email"],
           "properties": {
             "email": { "type": "string" },
+            "emailAuthFactor": { "type": "boolean" },
             "token": {
               "type": "string",
               "description": "Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed."

diff --git a/lexicons/tools/ozone/moderation/defs.json b/lexicons/tools/ozone/moderation/defs.json
@@ -25,6 +25,9 @@
             "#modEventAcknowledge",
             "#modEventEscalate",
             "#modEventMute",
+            "#modEventUnmute",
+            "#modEventMuteReporter",
+            "#modEventUnmuteReporter",
             "#modEventEmail",
             "#modEventResolveAppeal",
             "#modEventDivert"
@@ -67,6 +70,9 @@
             "#modEventAcknowledge",
             "#modEventEscalate",
             "#modEventMute",
+            "#modEventUnmute",
+            "#modEventMuteReporter",
+            "#modEventUnmuteReporter",
             "#modEventEmail",
             "#modEventResolveAppeal",
             "#modEventDivert"
@@ -128,6 +134,10 @@
           "type": "string",
           "format": "datetime"
         },
+        "muteReportingUntil": {
+          "type": "string",
+          "format": "datetime"
+        },
         "lastReviewedBy": {
           "type": "string",
           "format": "did"
@@ -242,6 +252,10 @@
         "comment": {
           "type": "string"
         },
+        "isReporterMuted": {
+          "type": "boolean",
+          "description": "Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject."
+        },
         "reportType": {
           "type": "ref",
           "ref": "com.atproto.moderation.defs#reasonType"
@@ -300,6 +314,28 @@
         }
       }
     },
+    "modEventMuteReporter": {
+      "type": "object",
+      "description": "Mute incoming reports from an account",
+      "required": ["durationInHours"],
+      "properties": {
+        "comment": { "type": "string" },
+        "durationInHours": {
+          "type": "integer",
+          "description": "Indicates how long the account should remain muted."
+        }
+      }
+    },
+    "modEventUnmuteReporter": {
+      "type": "object",
+      "description": "Unmute incoming reports from an account",
+      "properties": {
+        "comment": {
+          "type": "string",
+          "description": "Describe reasoning behind the reversal."
+        }
+      }
+    },
     "modEventEmail": {
       "type": "object",
       "description": "Keep a log of outgoing email to a user",

diff --git a/lexicons/tools/ozone/moderation/emitEvent.json b/lexicons/tools/ozone/moderation/emitEvent.json
@@ -21,6 +21,9 @@
                 "tools.ozone.moderation.defs#modEventLabel",
                 "tools.ozone.moderation.defs#modEventReport",
                 "tools.ozone.moderation.defs#modEventMute",
+                "tools.ozone.moderation.defs#modEventUnmute",
+                "tools.ozone.moderation.defs#modEventMuteReporter",
+                "tools.ozone.moderation.defs#modEventUnmuteReporter",
                 "tools.ozone.moderation.defs#modEventReverseTakedown",
                 "tools.ozone.moderation.defs#modEventUnmute",
                 "tools.ozone.moderation.defs#modEventEmail",

diff --git a/lexicons/tools/ozone/moderation/queryStatuses.json b/lexicons/tools/ozone/moderation/queryStatuses.json
@@ -37,6 +37,10 @@
             "type": "boolean",
             "description": "By default, we don't include muted subjects in the results. Set this to true to include them."
           },
+          "onlyMuted": {
+            "type": "boolean",
+            "description": "When set to true, only muted subjects and reporters will be returned."
+          },
           "reviewState": {
             "type": "string",
             "description": "Specify when fetching subjects in a certain state"

diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md
@@ -1,5 +1,39 @@
 # @atproto/api
 
+## 0.12.7
+
+### Patch Changes
+
+- [#2390](https://github.com/bluesky-social/atproto/pull/2390) [`58551bbe0`](https://github.com/bluesky-social/atproto/commit/58551bbe0595462c44fc3b6ab5b83e520f141933) Thanks [@foysalit](https://github.com/foysalit)! - Allow muting reports from accounts via `#modEventMuteReporter` event
+
+## 0.12.6
+
+### Patch Changes
+
+- [#2427](https://github.com/bluesky-social/atproto/pull/2427) [`b9b7c5821`](https://github.com/bluesky-social/atproto/commit/b9b7c582199d57d2fe0af8af5c8c411ed34f5b9d) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Introduces V2 of saved feeds preferences. V2 and v1 prefs are incompatible. v1
+  methods and preference objects are retained for backwards compatability, but are
+  considered deprecated. Developers should immediately migrate to v2 interfaces.
+
+## 0.12.5
+
+### Patch Changes
+
+- [#2419](https://github.com/bluesky-social/atproto/pull/2419) [`3424a1770`](https://github.com/bluesky-social/atproto/commit/3424a17703891f5678ec76ef97e696afb3288b22) Thanks [@pfrazee](https://github.com/pfrazee)! - Add authFactorToken to session objects
+
+## 0.12.4
+
+### Patch Changes
+
+- [#2416](https://github.com/bluesky-social/atproto/pull/2416) [`93a4a4df9`](https://github.com/bluesky-social/atproto/commit/93a4a4df9ce38f89a5d05e300d247b85fb007e05) Thanks [@devinivy](https://github.com/devinivy)! - Support for email auth factor lexicons
+
+## 0.12.3
+
+### Patch Changes
+
+- [#2383](https://github.com/bluesky-social/atproto/pull/2383) [`0edef0ec0`](https://github.com/bluesky-social/atproto/commit/0edef0ec01403fd6097a4d2875b68313f2f1261f) Thanks [@dholms](https://github.com/dholms)! - Added feed generator interaction lexicons
+
+- [#2409](https://github.com/bluesky-social/atproto/pull/2409) [`c6d758b8b`](https://github.com/bluesky-social/atproto/commit/c6d758b8b63f4ef50b2ab9afc62164e92a53e7f0) Thanks [@devinivy](https://github.com/devinivy)! - Support for upcoming post search params
+
 ## 0.12.2
 
 ### Patch Changes

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.12.2",
+  "version": "0.12.7",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [

diff --git a/packages/api/src/agent.ts b/packages/api/src/agent.ts
@@ -148,6 +148,7 @@ export class AtpAgent {
         did: res.data.did,
         email: opts.email,
         emailConfirmed: false,
+        emailAuthFactor: false,
       }
       this._updateApiEndpoint(res.data.didDoc)
       return res
@@ -173,6 +174,7 @@ export class AtpAgent {
       const res = await this.api.com.atproto.server.createSession({
         identifier: opts.identifier,
         password: opts.password,
+        authFactorToken: opts.authFactorToken,
       })
       this.session = {
         accessJwt: res.data.accessJwt,
@@ -181,6 +183,7 @@ export class AtpAgent {
         did: res.data.did,
         email: res.data.email,
         emailConfirmed: res.data.emailConfirmed,
+        emailAuthFactor: res.data.emailAuthFactor,
       }
       this._updateApiEndpoint(res.data.didDoc)
       return res
@@ -215,6 +218,7 @@ export class AtpAgent {
       this.session.email = res.data.email
       this.session.handle = res.data.handle
       this.session.emailConfirmed = res.data.emailConfirmed
+      this.session.emailAuthFactor = res.data.emailAuthFactor
       this._updateApiEndpoint(res.data.didDoc)
       this._persistSession?.('update', this.session)
       return res