fix rebase conflicts

lexicons/app/bsky/ageassurance/defs.json

@@ -64,6 +64,14 @@
       "description": "The Age Assurance configuration for a specific region.",
       "required": ["countryCode", "minAccessAge", "rules"],
       "properties": {
+        "platforms": {
+          "type": "array",
+          "description": "The platforms this configuration applies to. If omitted, the configuration applies to all platforms.",
+          "items": {
+            "type": "string",
+            "knownValues": ["web", "ios", "android"]
+          }
+        },
         "countryCode": {
           "type": "string",
           "description": "The ISO 3166-1 alpha-2 country code this configuration applies to."

lexicons/app/bsky/graph/getFollowers.json

@@ -21,6 +21,10 @@
           },
           "cursor": {
             "type": "string"
+          },
+          "sort": {
+            "type": "string",
+            "knownValues": ["latest", "top"]
           }
         }
       },

lexicons/app/bsky/graph/getFollows.json

@@ -21,6 +21,10 @@
           },
           "cursor": {
             "type": "string"
+          },
+          "sort": {
+            "type": "string",
+            "knownValues": ["latest", "top"]
           }
         }
       },

lexicons/app/bsky/graph/searchStarterPacksV2.json

@@ -0,0 +1,52 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.searchStarterPacksV2",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Find starter packs matching search criteria. Does not require auth.",
+      "parameters": {
+        "type": "params",
+        "required": ["q"],
+        "properties": {
+          "q": {
+            "type": "string",
+            "description": "Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
+          },
+          "limit": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 100,
+            "default": 25
+          },
+          "cursor": {
+            "type": "string"
+          }
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["starterPacks"],
+          "properties": {
+            "cursor": {
+              "type": "string"
+            },
+            "hitsTotal": {
+              "type": "integer",
+              "description": "Estimated total number of matching hits. May be rounded or truncated."
+            },
+            "starterPacks": {
+              "type": "array",
+              "items": {
+                "type": "ref",
+                "ref": "app.bsky.graph.defs#starterPackView"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

lexicons/app/bsky/notification/listNotifications.json

@@ -111,6 +111,11 @@
         "record": {
           "type": "unknown"
         },
+        "starterPack": {
+          "description": "The starter pack associated with this notification. Present when the notification is for a follow originating from a starter pack.",
+          "type": "ref",
+          "ref": "app.bsky.graph.defs#starterPackViewBasic"
+        },
         "isRead": {
           "type": "boolean"
         },

lexicons/app/bsky/unspecced/defs.json

@@ -67,6 +67,9 @@
         "displayName": {
           "type": "string"
         },
+        "description": {
+          "type": "string"
+        },
         "link": {
           "type": "string"
         },
@@ -110,6 +113,9 @@
         "displayName": {
           "type": "string"
         },
+        "description": {
+          "type": "string"
+        },
         "link": {
           "type": "string"
         },

lexicons/app/bsky/unspecced/getTrends.json

@@ -28,6 +28,10 @@
                 "type": "ref",
                 "ref": "app.bsky.unspecced.defs#trendView"
               }
+            },
+            "recIdStr": {
+              "type": "string",
+              "description": "Snowflake for this recommendation, use when submitting recommendation events."
             }
           }
         }