diff --git a/README.md b/README.md
index 97d9ad0..1782064 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,10 @@ At present, only the duck-typing functions work. To play with them, use
(require '[dog-and-duck.quack.quack :as q])
```
+## Documentation
+
+Full documentation is [here](https://simon-brooke.github.io/dog-and-duck/).
+
## Testing
Prior to testing, you should clone [activitystreams-test-documents](https://github.com/w3c-social/activitystreams-test-documents) into the `resources` directory. You can then test with
diff --git a/doc/Using_ActivityPub.md b/doc/Using_ActivityPub.md
index b306543..821b0fc 100644
--- a/doc/Using_ActivityPub.md
+++ b/doc/Using_ActivityPub.md
@@ -1,112 +1,5 @@
# Using ActivityPub
-```clojure
-user=> (require '[clj-activitypub.core :as activitypub])
-nil
-user=> (require '[clj-activitypub.webfinger :as webfinger])
-nil
-user=> (require '[clojure.walk :refer [keywordize-keys]])
-nil
-user=> (require '[clojure.pprint :refer [pprint]])
-nil
-user=> (def base-domain "mastodon.scot")
-#'user/base-domain
-user=> (def account-handle "@simon_brooke@mastodon.scot")
-#'user/account-handle
-user=> (in-ns 'user)
-#object[clojure.lang.Namespace 0x525575 "user"]
-user=> (activitypub/parse-account account-handle )
-{:domain "mastodon.scot", :username "simon_brooke"}
-user=> (map *1 [:domain :username])
-("mastodon.scot" "simon_brooke")
-user=> (apply webfinger/fetch-user-id *1)
-"https://mastodon.scot/users/simon_brooke"
-user=> (activitypub/fetch-user *1)
-{"followers" "https://mastodon.scot/users/simon_brooke/followers", "inbox" "https://mastodon.scot/users/simon_brooke/inbox", "url" "https://mastodon.scot/@simon_brooke", "@context" ["https://www.w3.org/ns/activitystreams" "https://w3id.org/security/v1" {"identityKey" {"@type" "@id", "@id" "toot:identityKey"}, "EncryptedMessage" "toot:EncryptedMessage", "Ed25519Key" "toot:Ed25519Key", "devices" {"@type" "@id", "@id" "toot:devices"}, "manuallyApprovesFollowers" "as:manuallyApprovesFollowers", "schema" "http://schema.org#", "PropertyValue" "schema:PropertyValue", "Curve25519Key" "toot:Curve25519Key", "claim" {"@type" "@id", "@id" "toot:claim"}, "value" "schema:value", "Hashtag" "as:Hashtag", "movedTo" {"@id" "as:movedTo", "@type" "@id"}, "discoverable" "toot:discoverable", "messageType" "toot:messageType", "messageFranking" "toot:messageFranking", "cipherText" "toot:cipherText", "toot" "http://joinmastodon.org/ns#", "alsoKnownAs" {"@id" "as:alsoKnownAs", "@type" "@id"}, "featured" {"@id" "toot:featured", "@type" "@id"}, "featuredTags" {"@id" "toot:featuredTags", "@type" "@id"}, "Ed25519Signature" "toot:Ed25519Signature", "focalPoint" {"@container" "@list", "@id" "toot:focalPoint"}, "fingerprintKey" {"@type" "@id", "@id" "toot:fingerprintKey"}, "Device" "toot:Device", "publicKeyBase64" "toot:publicKeyBase64", "deviceId" "toot:deviceId", "suspended" "toot:suspended"}], "devices" "https://mastodon.scot/users/simon_brooke/collections/devices", "manuallyApprovesFollowers" false, "image" {"type" "Image", "mediaType" "image/jpeg", "url" "https://media.mastodon.scot/mastodon-scot-public/accounts/headers/109/252/274/874/045/781/original/e1f1823c4361fa27.jpg"}, "endpoints" {"sharedInbox" "https://mastodon.scot/inbox"}, "id" "https://mastodon.scot/users/simon_brooke", "publicKey" {"id" "https://mastodon.scot/users/simon_brooke#main-key", "owner" "https://mastodon.scot/users/simon_brooke", "publicKeyPem" "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2/6GgLJgJlPhhqFm1tUQ\noSLnWxhDwq4HlZIHrBsVjkSvUAnHKqq42Q/hta+fkWB8rmTFpmjLXDj/Fi0uejvT\nBc+KrLwfX/yR8+G87afGCRS3CaumoLJ7zkBIlsFzIKMoIke1D3QuHX95yGGXs+hp\nmyxt/+CXRyZjK7u9NG7SMRUlpwvOlpD12Aei35Nb8NSr03JvY8/WVMIbWrecyI0b\nAlwj6axxHx7J15Yo+aEtKzZ2OFKXf+sh0QF9BEnYcmVKYlR6kiOglLFHKdCBUSYi\ni9Flv00TydqlGvR5fpShBqORiy0M/FVtNXlz2sNBEsGB2meipkjh+cRLzTbYo4KL\nJwIDAQAB\n-----END PUBLIC KEY-----\n"}, "summary" "Anarcho-syndicalist, autistic, crofter, cyclist, depressive, entrepreneur, geek, Zapatista. Politics & environment, especially #LandReform. he/him.
Twitter: @simon_brooke
GitHub: simon-brooke
FetLife: Simon_Brooke
Credo: Life is harsh. What we can do - and what we should do - is strive to make it less harsh for the people around us.
", "attachment" [{"type" "PropertyValue", "name" "Home Page", "value" "https://www.journeyman.cc/~simon/"}], "name" "Simon Brooke", "tag" [{"type" "Hashtag", "href" "https://mastodon.scot/tags/landreform", "name" "#landreform"}], "published" "2022-10-29T00:00:00Z", "preferredUsername" "simon_brooke", "discoverable" true, "alsoKnownAs" ["https://mastodon.social/users/simon_brooke"], "featured" "https://mastodon.scot/users/simon_brooke/collections/featured", "featuredTags" "https://mastodon.scot/users/simon_brooke/collections/tags", "type" "Person", "outbox" "https://mastodon.scot/users/simon_brooke/outbox", "following" "https://mastodon.scot/users/simon_brooke/following", "icon" {"type" "Image", "mediaType" "image/png", "url" "https://media.mastodon.scot/mastodon-scot-public/accounts/avatars/109/252/274/874/045/781/original/172e8f7530627e87.png"}}
-user=> (def sb (keywordize-keys *1))
-#'user/sb
-user=> (:outbox sb)
-"https://mastodon.scot/users/simon_brooke/outbox"
-user=> (require '[clojure.data.json :as json])
-nil
-user=> (slurp (:outbox sb))
-Execution error (IOException) at sun.net.www.protocol.http.HttpURLConnection/getInputStream0 (HttpURLConnection.java:1894).
-Server returned HTTP response code: 403 for URL: https://mastodon.scot/users/simon_brooke/outbox
-user=> (pprint sb)
-{:inbox "https://mastodon.scot/users/simon_brooke/inbox",
- :name "Simon Brooke",
- :@context
- ["https://www.w3.org/ns/activitystreams"
- "https://w3id.org/security/v1"
- {:schema "http://schema.org#",
- :messageType "toot:messageType",
- :messageFranking "toot:messageFranking",
- :identityKey {:@type "@id", :@id "toot:identityKey"},
- :Hashtag "as:Hashtag",
- :deviceId "toot:deviceId",
- :publicKeyBase64 "toot:publicKeyBase64",
- :value "schema:value",
- :Ed25519Key "toot:Ed25519Key",
- :featured {:@id "toot:featured", :@type "@id"},
- :Curve25519Key "toot:Curve25519Key",
- :discoverable "toot:discoverable",
- :focalPoint {:@container "@list", :@id "toot:focalPoint"},
- :suspended "toot:suspended",
- :fingerprintKey {:@type "@id", :@id "toot:fingerprintKey"},
- :Ed25519Signature "toot:Ed25519Signature",
- :cipherText "toot:cipherText",
- :EncryptedMessage "toot:EncryptedMessage",
- :alsoKnownAs {:@id "as:alsoKnownAs", :@type "@id"},
- :featuredTags {:@id "toot:featuredTags", :@type "@id"},
- :devices {:@type "@id", :@id "toot:devices"},
- :toot "http://joinmastodon.org/ns#",
- :movedTo {:@id "as:movedTo", :@type "@id"},
- :Device "toot:Device",
- :PropertyValue "schema:PropertyValue",
- :manuallyApprovesFollowers "as:manuallyApprovesFollowers",
- :claim {:@type "@id", :@id "toot:claim"}}],
- :featured
- "https://mastodon.scot/users/simon_brooke/collections/featured",
- :type "Person",
- :discoverable true,
- :icon
- {:type "Image",
- :mediaType "image/png",
- :url
- "https://media.mastodon.scot/mastodon-scot-public/accounts/avatars/109/252/274/874/045/781/original/172e8f7530627e87.png"},
- :following "https://mastodon.scot/users/simon_brooke/following",
- :summary
- "Anarcho-syndicalist, autistic, crofter, cyclist, depressive, entrepreneur, geek, Zapatista. Politics & environment, especially #LandReform. he/him.
Twitter: @simon_brooke
GitHub: simon-brooke
FetLife: Simon_Brooke
Credo: Life is harsh. What we can do - and what we should do - is strive to make it less harsh for the people around us.
",
- :publicKey
- {:id "https://mastodon.scot/users/simon_brooke#main-key",
- :owner "https://mastodon.scot/users/simon_brooke",
- :publicKeyPem
- "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2/6GgLJgJlPhhqFm1tUQ\noSLnWxhDwq4HlZIHrBsVjkSvUAnHKqq42Q/hta+fkWB8rmTFpmjLXDj/Fi0uejvT\nBc+KrLwfX/yR8+G87afGCRS3CaumoLJ7zkBIlsFzIKMoIke1D3QuHX95yGGXs+hp\nmyxt/+CXRyZjK7u9NG7SMRUlpwvOlpD12Aei35Nb8NSr03JvY8/WVMIbWrecyI0b\nAlwj6axxHx7J15Yo+aEtKzZ2OFKXf+sh0QF9BEnYcmVKYlR6kiOglLFHKdCBUSYi\ni9Flv00TydqlGvR5fpShBqORiy0M/FVtNXlz2sNBEsGB2meipkjh+cRLzTbYo4KL\nJwIDAQAB\n-----END PUBLIC KEY-----\n"},
- :endpoints {:sharedInbox "https://mastodon.scot/inbox"},
- :preferredUsername "simon_brooke",
- :id "https://mastodon.scot/users/simon_brooke",
- :alsoKnownAs ["https://mastodon.social/users/simon_brooke"],
- :outbox "https://mastodon.scot/users/simon_brooke/outbox",
- :url "https://mastodon.scot/@simon_brooke",
- :featuredTags
- "https://mastodon.scot/users/simon_brooke/collections/tags",
- :devices
- "https://mastodon.scot/users/simon_brooke/collections/devices",
- :image
- {:type "Image",
- :mediaType "image/jpeg",
- :url
- "https://media.mastodon.scot/mastodon-scot-public/accounts/headers/109/252/274/874/045/781/original/e1f1823c4361fa27.jpg"},
- :tag
- [{:type "Hashtag",
- :href "https://mastodon.scot/tags/landreform",
- :name "#landreform"}],
- :followers "https://mastodon.scot/users/simon_brooke/followers",
- :published "2022-10-29T00:00:00Z",
- :manuallyApprovesFollowers false,
- :attachment
- [{:type "PropertyValue",
- :name "Home Page",
- :value
- "https://www.journeyman.cc/~simon/"}]}
-```
+## Introduction
+
+I do not know what I am doing; I am learning, and playing. Nothing in this document should be treated as good advice; it simply relates to the current state of my knowledge.
\ No newline at end of file
diff --git a/doc/Validation_Faults.md b/doc/Validation_Faults.md
new file mode 100644
index 0000000..9f6a8f6
--- /dev/null
+++ b/doc/Validation_Faults.md
@@ -0,0 +1,61 @@
+# Validation Faults in ActivityPub documents
+
+## Motivation
+
+This document is intended to provide an extension vocabulary for [ActivityStreams](https://www.w3.org/TR/activitystreams-core/) documents, which provides vocabulary for categorising and describing faults in [ActivityPub](https://www.w3.org/TR/activitypub/) documents.
+
+The motivation is to be able to serialise a validation report on an ActivityPub document as an ActivityStreams document.
+
+## Intepretation
+
+### Conformance
+
+As well as sections marked as non-normative, all authoring guidelines, diagrams, examples, and notes in this specification are non-normative. Everything else in this specification is normative.
+
+The key words MAY, MUST, MUST NOT, SHOULD, and SHOULD NOT are to be interpreted as described in [RFC2119].
+
+### 'the spec'
+
+Where the phrase 'the spec' is used in this document, it refers to a concatenation of the ActivityStreams specification and the ActivityPub specification.
+
+## The `Fault` object type
+
+The `Fault` object type is a novel object type introduced by this document to describe validation faults. Objects with the `Fault` object type MUST have at least the following fields (additional fields are not required but are optional):
+
+1. `:@context` whose value shall be the URL of a document specifying this vocabulary;
+2. `:type` whose value shall be `Fault`;
+3. `:severity` whose value shall be one of `minor`, `should`, `must` or `critical`;
+4. `:fault` whose value shall be a unique token representing the particular fault type;
+5. `:narrative` whose value shall be a natural language description of the fault type.
+
+### The Fields
+
+#### Context
+
+The value of the `@context` field of a fault report object shall be the URL of this
+document, currently `https://simon-brooke.github.io/dog-and-duck/codox/Validation_Faults.html`.
+
+#### Type
+
+The value of the `type` field of a fault report object MUST be `Fault`.
+
+#### Severity
+
+Each fault report object MUST have a `severity` field whose value MUST be one of
+
+ 1. `:minor` things which I consider to be faults, but which
+ don't actually breach the spec;
+ 2. `:should` instances where the spec says something SHOULD
+ be done, which isn't;
+ 3. `:must` instances where the spec says something MUST
+ be done, which isn't;
+ 4. `:critical` instances where I believe the fault means that
+ the object cannot be meaningfully processed.
+
+#### Fault
+
+Unique codes shall be assigned to each fault type, and shall be documented in this section.
+
+It is intended that there should ultimately be a well known site at which the fault codes can be resolved to natural language explanations in as many natural languages as possible of the nature of the particular fault.
+
+
diff --git a/docs/cloverage/clj_activitypub/core.clj.html b/docs/cloverage/clj_activitypub/core.clj.html
index d0e28ea..f00e04b 100644
--- a/docs/cloverage/clj_activitypub/core.clj.html
+++ b/docs/cloverage/clj_activitypub/core.clj.html
@@ -8,442 +8,451 @@
001 (ns clj-activitypub.core
- 002 (:require [clj-activitypub.internal.crypto :as crypto]
+ 002 "copied from [Jahfer's clj-activitypub library](https://github.com/jahfer/clj-activitypub).
- 003 [clj-activitypub.internal.thread-cache :as thread-cache]
+ 003 If and when Jahfer issues a release of that library, this directory will be deleted and a
- 004 [clj-activitypub.internal.http-util :as http]
+ 004 dependency on that library will be added to the project."
- 005 [clj-http.client :as client]
+ 005 (:require [clj-activitypub.internal.crypto :as crypto]
- 006 [clojure.string :as str]))
+ 006 [clj-activitypub.internal.thread-cache :as thread-cache]
+
+
+ 007 [clj-activitypub.internal.http-util :as http]
+
+
+ 008 [clj-http.client :as client]
+
+
+ 009 [clojure.string :as str]))
- 007
+ 010
- 008 (defn config
+ 011 (defn config
- 009 "Creates hash of computed data relevant for most ActivityPub utilities."
+ 012 "Creates hash of computed data relevant for most ActivityPub utilities."
- 010 [{:keys [domain username username-route public-key private-key]
+ 013 [{:keys [domain username username-route public-key private-key]
- 011 :or {username-route "/users/"
+ 014 :or {username-route "/users/"
- 012 public-key nil
+ 015 public-key nil
- 013 private-key nil}}]
+ 016 private-key nil}}]
- 014 (let [base-url (str "https://" domain)]
+ 017 (let [base-url (str "https://" domain)]
- 015 {:domain domain
+ 018 {:domain domain
- 016 :base-url base-url
+ 019 :base-url base-url
- 017 :username username
+ 020 :username username
- 018 :user-id (str base-url username-route username)
+ 021 :user-id (str base-url username-route username)
- 019 :public-key public-key
+ 022 :public-key public-key
- 020 :private-key (when private-key
+ 023 :private-key (when private-key
- 021 (crypto/private-key private-key))}))
+ 024 (crypto/private-key private-key))}))
- 022
+ 025
- 023 (defn parse-account
+ 026 (defn parse-account
- 024 "Given an ActivityPub handle (e.g. @jahfer@mastodon.social), produces
+ 027 "Given an ActivityPub handle (e.g. @jahfer@mastodon.social), produces
- 025 a map containing {:domain ... :username ...}."
+ 028 a map containing {:domain ... :username ...}."
- 026 [handle]
+ 029 [handle]
- 027 (let [[username domain] (filter #(not (str/blank? %))
+ 030 (let [[username domain] (filter #(not (str/blank? %))
- 028 (str/split handle #"@"))]
+ 031 (str/split handle #"@"))]
- 029 {:domain domain :username username}))
+ 032 {:domain domain :username username}))
- 030
+ 033
- 031 (def ^:private user-cache (thread-cache/make))
+ 034 (def ^:private user-cache (thread-cache/make))
- 032 (defn fetch-user
+ 035 (defn fetch-user
- 033 "Fetches the customer account details located at user-id from a remote
+ 036 "Fetches the customer account details located at user-id from a remote
- 034 server. Will return cached results if they exist in memory."
+ 037 server. Will return cached results if they exist in memory."
- 035 [user-id]
+ 038 [user-id]
- 036 ((:get-v user-cache)
+ 039 ((:get-v user-cache)
- 037 user-id
+ 040 user-id
- 038 #(:body
+ 041 #(:body
- 039 (client/get user-id {:as :json-string-keys
+ 042 (client/get user-id {:as :json-string-keys
- 040 :throw-exceptions false
+ 043 :throw-exceptions false
- 041 :ignore-unknown-host? true
+ 044 :ignore-unknown-host? true
- 042 :headers {"Accept" "application/activity+json"}}))))
+ 045 :headers {"Accept" "application/activity+json"}}))))
- 043
+ 046
- 044 (defn actor
+ 047 (defn actor
- 045 "Accepts a config, and returns a map in the form expected by the ActivityPub
+ 048 "Accepts a config, and returns a map in the form expected by the ActivityPub
- 046 spec. See https://www.w3.org/TR/activitypub/#actor-objects for reference."
+ 049 spec. See https://www.w3.org/TR/activitypub/#actor-objects for reference."
- 047 [{:keys [user-id username public-key]}]
+ 050 [{:keys [user-id username public-key]}]
- 048 {"@context" ["https://www.w3.org/ns/activitystreams"
+ 051 {"@context" ["https://www.w3.org/ns/activitystreams"
- 049 "https://w3id.org/security/v1"]
+ 052 "https://w3id.org/security/v1"]
- 050 :id user-id
+ 053 :id user-id
- 051 :type "Person"
+ 054 :type "Person"
- 052 :preferredUsername username
+ 055 :preferredUsername username
- 053 :inbox (str user-id "/inbox")
+ 056 :inbox (str user-id "/inbox")
- 054 :outbox (str user-id "/outbox")
+ 057 :outbox (str user-id "/outbox")
- 055 :publicKey {:id (str user-id "#main-key")
+ 058 :publicKey {:id (str user-id "#main-key")
- 056 :owner user-id
+ 059 :owner user-id
- 057 :publicKeyPem (or public-key "")}})
+ 060 :publicKeyPem (or public-key "")}})
- 058
+ 061
- 059 (def signature-headers ["(request-target)" "host" "date" "digest"])
+ 062 (def signature-headers ["(request-target)" "host" "date" "digest"])
- 060
+ 063
- 061 (defn- str-for-signature [headers]
+ 064 (defn- str-for-signature [headers]
- 062 (let [headers-xf (reduce-kv
+ 065 (let [headers-xf (reduce-kv
- 063 (fn [m k v]
+ 066 (fn [m k v]
- 064 (assoc m (str/lower-case k) v)) {} headers)]
+ 067 (assoc m (str/lower-case k) v)) {} headers)]
- 065 (->> signature-headers
+ 068 (->> signature-headers
- 066 (select-keys headers-xf)
+ 069 (select-keys headers-xf)
- 067 (reduce-kv (fn [coll k v] (conj coll (str k ": " v))) [])
+ 070 (reduce-kv (fn [coll k v] (conj coll (str k ": " v))) [])
- 068 (interpose "\n")
+ 071 (interpose "\n")
- 069 (apply str))))
+ 072 (apply str))))
- 070
+ 073
- 071 (defn gen-signature-header
+ 074 (defn gen-signature-header
- 072 "Generates a HTTP Signature string based on the provided map of headers."
+ 075 "Generates a HTTP Signature string based on the provided map of headers."
- 073 [config headers]
+ 076 [config headers]
- 074 (let [{:keys [user-id private-key]} config
+ 077 (let [{:keys [user-id private-key]} config
- 075 string-to-sign (str-for-signature headers)
+ 078 string-to-sign (str-for-signature headers)
- 076 signature (crypto/base64-encode (crypto/sign string-to-sign private-key))
+ 079 signature (crypto/base64-encode (crypto/sign string-to-sign private-key))
- 077 sig-header-keys {"keyId" user-id
+ 080 sig-header-keys {"keyId" user-id
- 078 "headers" (str/join " " signature-headers)
+ 081 "headers" (str/join " " signature-headers)
- 079 "signature" signature}]
+ 082 "signature" signature}]
- 080 (->> sig-header-keys
+ 083 (->> sig-header-keys
- 081 (reduce-kv (fn [m k v]
+ 084 (reduce-kv (fn [m k v]
- 082 (conj m (str k "=" "\"" v "\""))) [])
+ 085 (conj m (str k "=" "\"" v "\""))) [])
- 083 (interpose ",")
+ 086 (interpose ",")
- 084 (apply str))))
+ 087 (apply str))))
- 085
+ 088
- 086 (defn auth-headers
+ 089 (defn auth-headers
- 087 "Given a config and request map of {:body ... :headers ...}, returns the
+ 090 "Given a config and request map of {:body ... :headers ...}, returns the
- 088 original set of headers with Signature and Digest attributes appended."
+ 091 original set of headers with Signature and Digest attributes appended."
- 089 [config {:keys [body headers]}]
+ 092 [config {:keys [body headers]}]
- 090 (let [digest (http/digest body)
+ 093 (let [digest (http/digest body)
- 091 h (-> headers
+ 094 h (-> headers
- 092 (assoc "Digest" digest)
+ 095 (assoc "Digest" digest)
- 093 (assoc "(request-target)" "post /inbox"))]
+ 096 (assoc "(request-target)" "post /inbox"))]
- 094 (assoc headers
+ 097 (assoc headers
- 095 "Signature" (gen-signature-header config h)
+ 098 "Signature" (gen-signature-header config h)
- 096 "Digest" digest)))
+ 099 "Digest" digest)))
- 097
+ 100
- 098 (defmulti obj
+ 101 (defmulti obj
- 099 "Produces a map representing an ActivityPub object which can be serialized
+ 102 "Produces a map representing an ActivityPub object which can be serialized
- 100 directly to JSON in the form expected by the ActivityStreams 2.0 spec.
+ 103 directly to JSON in the form expected by the ActivityStreams 2.0 spec.
- 101 See https://www.w3.org/TR/activitystreams-vocabulary/ for reference."
+ 104 See https://www.w3.org/TR/activitystreams-vocabulary/ for reference."
- 102 (fn [_config object-data] (:type object-data)))
+ 105 (fn [_config object-data] (:type object-data)))
- 103
+ 106
- 104 (defmethod obj :note
+ 107 (defmethod obj :note
- 105 [{:keys [user-id]}
+ 108 [{:keys [user-id]}
- 106 {:keys [id published inReplyTo content to]
+ 109 {:keys [id published inReplyTo content to]
- 107 :or {published (http/date)
+ 110 :or {published (http/date)
- 108 inReplyTo ""
+ 111 inReplyTo ""
- 109 to "https://www.w3.org/ns/activitystreams#Public"}}]
+ 112 to "https://www.w3.org/ns/activitystreams#Public"}}]
- 110 {"id" (str user-id "/notes/" id)
+ 113 {"id" (str user-id "/notes/" id)
- 111 "type" "Note"
+ 114 "type" "Note"
- 112 "published" published
+ 115 "published" published
- 113 "attributedTo" user-id
+ 116 "attributedTo" user-id
- 114 "inReplyTo" inReplyTo
+ 117 "inReplyTo" inReplyTo
- 115 "content" content
+ 118 "content" content
- 116 "to" to})
+ 119 "to" to})
- 117
+ 120
- 118 (defmulti activity
+ 121 (defmulti activity
- 119 "Produces a map representing an ActivityPub activity which can be serialized
+ 122 "Produces a map representing an ActivityPub activity which can be serialized
- 120 directly to JSON in the form expected by the ActivityStreams 2.0 spec.
+ 123 directly to JSON in the form expected by the ActivityStreams 2.0 spec.
- 121 See https://www.w3.org/TR/activitystreams-vocabulary/ for reference."
+ 124 See https://www.w3.org/TR/activitystreams-vocabulary/ for reference."
- 122 (fn [_config activity-type _data] activity-type))
+ 125 (fn [_config activity-type _data] activity-type))
- 123
+ 126
- 124 (defmethod activity :create [{:keys [user-id]} _ data]
+ 127 (defmethod activity :create [{:keys [user-id]} _ data]
- 125 {"@context" ["https://www.w3.org/ns/activitystreams"
+ 128 {"@context" ["https://www.w3.org/ns/activitystreams"
- 126 "https://w3id.org/security/v1"]
+ 129 "https://w3id.org/security/v1"]
- 127 "type" "Create"
+ 130 "type" "Create"
- 128 "actor" user-id
+ 131 "actor" user-id
- 129 "object" data})
+ 132 "object" data})
- 130
+ 133
- 131 (defmethod activity :delete [{:keys [user-id]} _ data]
+ 134 (defmethod activity :delete [{:keys [user-id]} _ data]
- 132 {"@context" ["https://www.w3.org/ns/activitystreams"
+ 135 {"@context" ["https://www.w3.org/ns/activitystreams"
- 133 "https://w3id.org/security/v1"]
+ 136 "https://w3id.org/security/v1"]
- 134 "type" "Delete"
+ 137 "type" "Delete"
- 135 "actor" user-id
+ 138 "actor" user-id
- 136 "object" data})
+ 139 "object" data})
- 137
+ 140
- 138 (defn with-config
+ 141 (defn with-config
- 139 "Returns curried forms of the #activity and #obj multimethods in the form
+ 142 "Returns curried forms of the #activity and #obj multimethods in the form
- 140 {:activity ... :obj ...}, with the initial parameter set to config."
+ 143 {:activity ... :obj ...}, with the initial parameter set to config."
- 141 [config]
+ 144 [config]
- 142 (let [f (juxt
+ 145 (let [f (juxt
- 143 #(partial activity %)
+ 146 #(partial activity %)
- 144 #(partial obj %))
+ 147 #(partial obj %))
- 145 [activity-fn obj-fn] (f config)]
+ 148 [activity-fn obj-fn] (f config)]
- 146 {:activity activity-fn
+ 149 {:activity activity-fn
- 147 :obj obj-fn}))
+ 150 :obj obj-fn}))