merge

README.md

@@ -52,6 +52,7 @@ make build
 make test
 
 # run a local PDS and AppView with fake test accounts and data
+# (this requires a global installation of `jq` and `docker`)
 make run-dev-env
 
 # show all other commands

interop-test-files/crypto/signature-fixtures.json

@@ -42,5 +42,27 @@
     "signatureBase64": "5WpdIuEUUfVUYaozsi8G0B3cWO09cgZbIIwg1t2YKdXYA67MYxYiTMAVfdnkDCMN9S5B3vHosRe07aORmoshoQ",
     "validSignature": false,
     "tags": ["high-s"]
+  },
+  {
+    "comment": "P-256 key and signature, with DER-encoded signature which is invalid in atproto",
+    "messageBase64": "oWVoZWxsb2V3b3JsZA",
+    "algorithm": "ES256",
+    "didDocSuite": "EcdsaSecp256r1VerificationKey2019",
+    "publicKeyDid": "did:key:zDnaeT6hL2RnTdUhAPLij1QBkhYZnmuKyM7puQLW1tkF4Zkt8",
+    "publicKeyMultibase": "ze8N2PPxnu19hmBQ58t5P3E9Yj6CqakJmTVCaKvf9Byq2",
+    "signatureBase64": "MEQCIFxYelWJ9lNcAVt+jK0y/T+DC/X4ohFZ+m8f9SEItkY1AiACX7eXz5sgtaRrz/SdPR8kprnbHMQVde0T2R8yOTBweA",
+    "validSignature": false,
+    "tags": ["der-encoded"]
+  },
+  {
+    "comment": "K-256 key and signature, with DER-encoded signature which is invalid in atproto",
+    "messageBase64": "oWVoZWxsb2V3b3JsZA",
+    "algorithm": "ES256K",
+    "didDocSuite": "EcdsaSecp256k1VerificationKey2019",
+    "publicKeyDid": "did:key:zQ3shnriYMXc8wvkbJqfNWh5GXn2bVAeqTC92YuNbek4npqGF",
+    "publicKeyMultibase": "z22uZXWP8fdHXi4jyx8cCDiBf9qQTsAe6VcycoMQPfcMQX",
+    "signatureBase64": "MEUCIQCWumUqJqOCqInXF7AzhIRg2MhwRz2rWZcOEsOjPmNItgIgXJH7RnqfYY6M0eg33wU0sFYDlprwdOcpRn78Sz5ePgk",
+    "validSignature": false,
+    "tags": ["der-encoded"]
   }
 ]

lexicons/app/bsky/actor/defs.json

@@ -152,7 +152,7 @@
         "birthDate": {
           "type": "string",
           "format": "datetime",
-          "description": "The birth date of the owner of the account."
+          "description": "The birth date of account owner."
         }
       }
     },
@@ -191,7 +191,7 @@
       "properties": {
         "sort": {
           "type": "string",
-          "description": "Sorting mode.",
+          "description": "Sorting mode for threads.",
           "knownValues": ["oldest", "newest", "most-likes", "random"]
         },
         "prioritizeFollowedUsers": {

lexicons/app/bsky/actor/getProfile.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
+      "description": "Get detailed profile view of an actor.",
       "parameters": {
         "type": "params",
         "required": ["actor"],

lexicons/app/bsky/actor/getProfiles.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
+      "description": "Get detailed profile views of multiple actors.",
       "parameters": {
         "type": "params",
         "required": ["actors"],

lexicons/app/bsky/actor/getSuggestions.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Get a list of actors suggested for following. Used in discovery UIs.",
+      "description": "Get a list of suggested actors, used for discovery.",
       "parameters": {
         "type": "params",
         "properties": {

lexicons/app/bsky/actor/profile.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "record",
+      "description": "A declaration of a profile.",
       "key": "literal:self",
       "record": {
         "type": "object",

lexicons/app/bsky/actor/putPreferences.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "procedure",
-      "description": "Sets the private preferences attached to the account.",
+      "description": "Set the private preferences attached to the account.",
       "input": {
         "encoding": "application/json",
         "schema": {

lexicons/app/bsky/actor/searchActors.json

@@ -10,11 +10,11 @@
         "properties": {
           "term": {
             "type": "string",
-            "description": "DEPRECATED: use 'q' instead"
+            "description": "DEPRECATED: use 'q' instead."
           },
           "q": {
             "type": "string",
-            "description": "search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended"
+            "description": "Search query string. Syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
           },
           "limit": {
             "type": "integer",

lexicons/app/bsky/actor/searchActorsTypeahead.json

@@ -4,17 +4,17 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Find actor suggestions for a search term.",
+      "description": "Find actor suggestions for a prefix search term.",
       "parameters": {
         "type": "params",
         "properties": {
           "term": {
             "type": "string",
-            "description": "DEPRECATED: use 'q' instead"
+            "description": "DEPRECATED: use 'q' instead."
           },
           "q": {
             "type": "string",
-            "description": "search query prefix; not a full query string"
+            "description": "Search query prefix; not a full query string."
           },
           "limit": {
             "type": "integer",

lexicons/app/bsky/embed/external.json

@@ -1,7 +1,7 @@
 {
   "lexicon": 1,
   "id": "app.bsky.embed.external",
-  "description": "A representation of some externally linked content, embedded in another form of content",
+  "description": "A representation of some externally linked content, embedded in another form of content.",
   "defs": {
     "main": {
       "type": "object",

lexicons/app/bsky/embed/images.json

@@ -1,7 +1,7 @@
 {
   "lexicon": 1,
   "id": "app.bsky.embed.images",
-  "description": "A set of images embedded in some other form of content",
+  "description": "A set of images embedded in some other form of content.",
   "defs": {
     "main": {
       "type": "object",

lexicons/app/bsky/embed/record.json

@@ -1,7 +1,7 @@
 {
   "lexicon": 1,
   "id": "app.bsky.embed.record",
-  "description": "A representation of a record embedded in another form of content",
+  "description": "A representation of a record embedded in another form of content.",
   "defs": {
     "main": {
       "type": "object",

lexicons/app/bsky/embed/recordWithMedia.json

@@ -1,7 +1,7 @@
 {
   "lexicon": 1,
   "id": "app.bsky.embed.recordWithMedia",
-  "description": "A representation of a record embedded in another form of content, alongside other compatible embeds",
+  "description": "A representation of a record embedded in another form of content, alongside other compatible embeds.",
   "defs": {
     "main": {
       "type": "object",

lexicons/app/bsky/feed/defs.json

@@ -38,7 +38,8 @@
       "type": "object",
       "properties": {
         "repost": { "type": "string", "format": "at-uri" },
-        "like": { "type": "string", "format": "at-uri" }
+        "like": { "type": "string", "format": "at-uri" },
+        "replyDisabled": { "type": "boolean" }
       }
     },
     "feedViewPost": {
@@ -87,8 +88,7 @@
             "type": "union",
             "refs": ["#threadViewPost", "#notFoundPost", "#blockedPost"]
           }
-        },
-        "viewer": { "type": "ref", "ref": "#viewerThreadState" }
+        }
       }
     },
     "notFoundPost": {
@@ -116,12 +116,6 @@
         "viewer": { "type": "ref", "ref": "app.bsky.actor.defs#viewerState" }
       }
     },
-    "viewerThreadState": {
-      "type": "object",
-      "properties": {
-        "canReply": { "type": "boolean" }
-      }
-    },
     "generatorView": {
       "type": "object",
       "required": ["uri", "cid", "did", "creator", "displayName", "indexedAt"],

lexicons/app/bsky/feed/describeFeedGenerator.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Returns information about a given feed generator including TOS & offered feed URIs",
+      "description": "Get information about a feed generator, including policies and offered feed URIs.",
       "output": {
         "encoding": "application/json",
         "schema": {

lexicons/app/bsky/feed/generator.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "record",
-      "description": "A declaration of the existence of a feed generator",
+      "description": "A declaration of the existence of a feed generator.",
       "key": "any",
       "record": {
         "type": "object",

lexicons/app/bsky/feed/getActorFeeds.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Retrieve a list of feeds created by a given actor",
+      "description": "Get a list of feeds created by the actor.",
       "parameters": {
         "type": "params",
         "required": ["actor"],

lexicons/app/bsky/feed/getActorLikes.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A view of the posts liked by an actor.",
+      "description": "Get a list of posts liked by an actor.",
       "parameters": {
         "type": "params",
         "required": ["actor"],

lexicons/app/bsky/feed/getAuthorFeed.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A view of an actor's feed.",
+      "description": "Get a view of an actor's feed.",
       "parameters": {
         "type": "params",
         "required": ["actor"],

lexicons/app/bsky/feed/getFeed.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Compose and hydrate a feed from a user's selected feed generator",
+      "description": "Get a hydrated feed from an actor's selected feed generator.",
       "parameters": {
         "type": "params",
         "required": ["feed"],

lexicons/app/bsky/feed/getFeedGenerator.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Get information about a specific feed offered by a feed generator, such as its online status",
+      "description": "Get information about a feed generator.",
       "parameters": {
         "type": "params",
         "required": ["feed"],

lexicons/app/bsky/feed/getFeedGenerators.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Get information about a list of feed generators",
+      "description": "Get information about a list of feed generators.",
       "parameters": {
         "type": "params",
         "required": ["feeds"],

lexicons/app/bsky/feed/getFeedSkeleton.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A skeleton of a feed provided by a feed generator",
+      "description": "Get a skeleton of a feed provided by a feed generator.",
       "parameters": {
         "type": "params",
         "required": ["feed"],

lexicons/app/bsky/feed/getLikes.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
+      "description": "Get the list of likes.",
       "parameters": {
         "type": "params",
         "required": ["uri"],

lexicons/app/bsky/feed/getListFeed.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A view of a recent posts from actors in a list",
+      "description": "Get a view of a recent posts from actors in a list.",
       "parameters": {
         "type": "params",
         "required": ["list"],

lexicons/app/bsky/feed/getPostThread.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
+      "description": "Get posts in a thread.",
       "parameters": {
         "type": "params",
         "required": ["uri"],

lexicons/app/bsky/feed/getPosts.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A view of an actor's feed.",
+      "description": "Get a view of an actor's feed.",
       "parameters": {
         "type": "params",
         "required": ["uris"],

lexicons/app/bsky/feed/getRepostedBy.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
+      "description": "Get a list of reposts.",
       "parameters": {
         "type": "params",
         "required": ["uri"],

lexicons/app/bsky/feed/getTimeline.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "A view of the user's home timeline.",
+      "description": "Get a view of the actor's home timeline.",
       "parameters": {
         "type": "params",
         "properties": {

lexicons/app/bsky/feed/like.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "record",
+      "description": "A declaration of a like.",
       "key": "tid",
       "record": {
         "type": "object",

lexicons/app/bsky/feed/post.json

@@ -4,6 +4,7 @@
   "defs": {
     "main": {
       "type": "record",
+      "description": "A declaration of a post.",
       "key": "tid",
       "record": {
         "type": "object",

lexicons/app/bsky/feed/repost.json

@@ -3,6 +3,7 @@
   "id": "app.bsky.feed.repost",
   "defs": {
     "main": {
+      "description": "A declaration of a repost.",
       "type": "record",
       "key": "tid",
       "record": {

lexicons/app/bsky/feed/searchPosts.json

@@ -4,14 +4,14 @@
   "defs": {
     "main": {
       "type": "query",
-      "description": "Find posts matching search criteria",
+      "description": "Find posts matching search criteria.",
       "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"
+            "description": "Search query string; syntax, phrase, boolean, and faceting is unspecified, but Lucene query syntax is recommended."
           },
           "limit": {
             "type": "integer",
@@ -21,7 +21,7 @@
           },
           "cursor": {
             "type": "string",
-            "description": "optional pagination mechanism; may not necessarily allow scrolling through entire result set"
+            "description": "Optional pagination mechanism; may not necessarily allow scrolling through entire result set."
           }
         }
       },
@@ -34,7 +34,7 @@
             "cursor": { "type": "string" },
             "hitsTotal": {
               "type": "integer",
-              "description": "count of search hits. optional, may be rounded/truncated, and may not be possible to paginate through all hits"
+              "description": "Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits."
             },
             "posts": {
               "type": "array",

lexicons/app/bsky/graph/block.json

@@ -4,7 +4,7 @@
   "defs": {
     "main": {
       "type": "record",
-      "description": "A block.",
+      "description": "A declaration of a block.",
       "key": "tid",
       "record": {
         "type": "object",