Merge branch 'main' into evanp-patch-2

Author: evanp

.github/workflows/fep-explainer.yml

@@ -0,0 +1,23 @@
+name: Add comment to explain Needs FEP label
+on:
+  issues:
+    types:
+      - labeled
+
+jobs:
+  add-comment:
+    if: github.event.label.name == 'needs-fep'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - name: Add comment
+        run: gh issue comment "$NUMBER" --body "$BODY"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          BODY: >
+            This issue has been labelled as potentially needing a FEP, and contributors are welcome to [submit a FEP](https://codeberg.org/fediverse/fep/src/branch/main#submitting-a-fep) on the topic.
+
+            Note that issues may be closed without the FEP being created; that does not mean that the FEP is no longer needed.

ERRATA.md

@@ -79,6 +79,74 @@ This document includes errata for the [Activity Streams](https://www.w3.org/TR/a
 
   - Unlike `latitude` and `longitude`, the domain of the `altitude` term is the `Object` type. The `altitude` term should be included in the list of properties of an `Object`. Because `altitude` is primarily documented as a property of a `Place`, publishers should not include `altitude` on objects that are not of type `Place`, and consumers should accept objects with this property that aren't of type `Place`.
 
+  - Example 60, for the `Tombstone` type, is missing the `@context` property. The correct example should be:
+
+    ```json
+    {
+      "@context": "https://www.w3.org/ns/activitystreams",
+      "type": "OrderedCollection",
+      "totalItems": 3,
+      "name": "Vacation photos 2016",
+      "orderedItems": [
+        {
+          "type": "Image",
+          "id": "http://image.example/1"
+        },
+        {
+          "type": "Tombstone",
+          "formerType": "Image",
+          "id": "http://image.example/2",
+          "deleted": "2016-03-17T00:00:00Z"
+        },
+        {
+          "type": "Image",
+          "id": "http://image.example/3"
+        }
+      ]
+    }
+    ```
+
   - The domain of the `attributedTo` property is both `Link` and `Object`. `attributedTo` should be included in the list of properties of a `Link`.
 
   - The description of the `audience` property should read "Identifies one or more entities that represent the total population of entities for which the object can be considered to be relevant."
+
+  - Example 157 is not valid JSON because the `content` property extends over multiple lines. The correct example is:
+
+    ```json
+    {
+      "@context": "https://www.w3.org/ns/activitystreams",
+      "name": "A thank-you note",
+      "type": "Note",
+      "content": "Thank you <a href='http://sally.example.org'>@sally</a> for all your hard work! <a href='http://example.org/tags/givingthanks'>#givingthanks</a>",
+      "to": {
+        "name": "Sally",
+        "type": "Person",
+        "id": "http://sally.example.org"
+      },
+      "tag": {
+        "id": "http://example.org/tags/givingthanks",
+        "name": "#givingthanks"
+      }
+    }
+    ```
+ 
+  - Example 102 is missing a `type` property on the `Link` value of the `url` property. For clarity, the example should read:
+
+  ```json
+  {
+  "@context": "https://www.w3.org/ns/activitystreams",
+  "type": "Video",
+  "name": "Cool New Movie",
+  "duration": "PT2H30M",
+  "preview": {
+    "type": "Video",
+    "name": "Trailer",
+    "duration": "PT1M",
+    "url": {
+      "type": "Link",
+      "href": "http://example.org/trailer.mkv",
+      "mediaType": "video/mkv"
+    }
+  }
+}
+```

README.md

@@ -83,6 +83,8 @@ Extensions are documented on the [Extensions registry](https://www.w3.org/wiki/A
 
 The [Fediverse Enhancement Proposals](https://codeberg.org/fediverse/fep) process is a lightweight collaboration process for creating and documenting Activity Streams 2.0 extensions (and other changes to the Fediverse). It's a good place to start if you're considering a backwards-compatible change.
 
+There are many ideas for backwards-compatible changes to ActivityPub that have not yet been written up as a FEP or other document. These are marked [Needs FEP](https://github.com/w3c/activitystreams/issues?q=is%3Aissue+label%3A%22needs-fep%22) in the ActivityPub GitHub issue repository, and contributors are welcome to [submit a FEP](https://codeberg.org/fediverse/fep/src/branch/main#submitting-a-fep) on the topic. Note that issues may be closed without the FEP being created; that does not mean that the FEP is no longer needed.
+
 Extensions that become popular can be integrated into the AS2 vocabulary document, making them practically part of the spec. The [Extensions Policy](https://swicg.github.io/extensions-policy/) describes how to propose extensions for inclusion in AS2.
 
 Future versions of the AS2 specification(s) may include popular extensions as part of the core specs; see below.

vocabulary/activitystreams2.owl

@@ -1,13 +1,13 @@
-@prefix : <http://www.w3.org/ns/activitystreams#> .
-@prefix as: <http://www.w3.org/ns/activitystreams#> .
+@prefix : <https://www.w3.org/ns/activitystreams#> .
+@prefix as: <https://www.w3.org/ns/activitystreams#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@base <http://www.w3.org/ns/activitystreams> .
+@base <https://www.w3.org/ns/activitystreams> .
 
-<http://www.w3.org/ns/activitystreams#> a owl:Ontology ;
+<https://www.w3.org/ns/activitystreams#> a owl:Ontology ;
   rdfs:comment "Extended Activity Streams 2.0 Vocabulary"@en ;
   rdfs:label "Activity Streams 2.0"@en ;
   owl:imports <http://www.w3.org/ns/prov#> .

vocabulary/index.html

@@ -2751,6 +2751,7 @@ <h2>Object and Link Types</h2>
             <td rowspan="4">
 <div id="ex184b-jsonld" style="display: block;">
 <pre class="example highlight json">{
+  "@context": "https://www.w3.org/ns/activitystreams",
   "type": "OrderedCollection",
   "totalItems": 3,
   "name": "Vacation photos 2016",
@@ -6017,7 +6018,7 @@ <h3>Representing Relationships Between Entities</h3>
     "subject": "http://sally.example.org",
     "relationship": "http://purl.org/vocab/relationship/friendOf",
     "object": "http://matt.example.org",
-    "startTime": "2015-04-21T12:34:56"
+    "startTime": "2015-04-21T12:34:56Z"
   }
 }</pre>
    </div>
@@ -6515,9 +6516,7 @@ <h2>Mentions, Tags and Other Common Social Microsyntaxes</h2>
   "@context": "https://www.w3.org/ns/activitystreams",
   "name": "A thank-you note",
   "type": "Note",
-  "content": "Thank you &lt;a href='http://sally.example.org'&gt;@sally&lt;/a&gt;
-      for all your hard work!
-      &lt;a href='http://example.org/tags/givingthanks'&gt;#givingthanks&lt;/a&gt;",
+  "content": "Thank you &lt;a href='http://sally.example.org'&gt;@sally&lt;/agt for all your hard work! &lt;a href='http://example.org/tags/givingthanks'&gt;#givingthanks&lt;/a&gt;",
   "to": {
     "name": "Sally",
     "type": "Person",