@fedify/vocab 2.4.0-dev.1570 → 2.4.0-dev.1573

package/src/application.yaml

@@ -12,9 +12,13 @@ defaultContext:
 - "https://www.w3.org/ns/did/v1"
 - "https://w3id.org/security/multikey/v1"
 - "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"
+  featuredCollections:
+    "@id": "https://w3id.org/fep/7aa9#featuredCollections"
+    "@type": "@id"
   manuallyApprovesFollowers: "as:manuallyApprovesFollowers"
   movedTo:
     "@id": "as:movedTo"
@@ -196,6 +200,15 @@ properties:
   range:
   - "https://www.w3.org/ns/activitystreams#Collection"
 
+- singularName: featuredCollections
+  functional: true
+  compactName: featuredCollections
+  uri: "https://w3id.org/fep/7aa9#featuredCollections"
+  description: |
+    A collection of {@link FeaturedCollection}s created by this actor.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Collection"
+
 - pluralName: streams
   singularName: stream
   singularAccessor: false

package/src/featureauthorization.yaml

@@ -0,0 +1,33 @@
+$schema: ../../vocab-tools/schema.yaml
+name: FeatureAuthorization
+compactName: FeatureAuthorization
+uri: "https://w3id.org/fep/7aa9#FeatureAuthorization"
+extends: "https://www.w3.org/ns/activitystreams#Object"
+entity: true
+description: |
+  Proves that an actor consented to being included in a
+  {@link FeaturedCollection}.
+
+  See [FEP-7aa9](https://w3id.org/fep/7aa9) for details.
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/data-integrity/v1"
+- "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
+
+properties:
+- singularName: interactingObject
+  functional: true
+  compactName: interactingObject
+  uri: "https://gotosocial.org/ns#interactingObject"
+  description: The featured collection for which the authorization was granted.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Object"
+
+- singularName: interactionTarget
+  functional: true
+  compactName: interactionTarget
+  uri: "https://gotosocial.org/ns#interactionTarget"
+  description: The actor that was authorized to be featured.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Object"

package/src/featuredcollection.yaml

@@ -0,0 +1,41 @@
+$schema: ../../vocab-tools/schema.yaml
+name: FeaturedCollection
+compactName: FeaturedCollection
+uri: "https://w3id.org/fep/7aa9#FeaturedCollection"
+extends: "https://www.w3.org/ns/activitystreams#OrderedCollection"
+entity: true
+description: |
+  A curated collection of recommended actors or other objects.
+
+  See [FEP-7aa9](https://w3id.org/fep/7aa9) for details.
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/data-integrity/v1"
+- "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
+- toot: "http://joinmastodon.org/ns#"
+  sensitive: "as:sensitive"
+  discoverable: "toot:discoverable"
+  Hashtag: "as:Hashtag"
+
+properties:
+- singularName: topic
+  functional: true
+  compactName: topic
+  uri: "https://w3id.org/fep/7aa9#topic"
+  description: |
+    A single {@link Hashtag} object that represents the main topic or category
+    of this featured collection.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Hashtag"
+
+- singularName: discoverable
+  functional: true
+  compactName: discoverable
+  uri: "http://joinmastodon.org/ns#discoverable"
+  description: |
+    When present and set to `false`, signals that this featured collection is
+    not meant to be discovered by search, onboarding, or similar discovery
+    features.
+  range:
+  - "http://www.w3.org/2001/XMLSchema#boolean"

package/src/featureditem.yaml

@@ -0,0 +1,34 @@
+$schema: ../../vocab-tools/schema.yaml
+name: FeaturedItem
+compactName: FeaturedItem
+uri: "https://w3id.org/fep/7aa9#FeaturedItem"
+extends: "https://www.w3.org/ns/activitystreams#Object"
+entity: true
+description: |
+  A single entry in a {@link FeaturedCollection}.
+
+  See [FEP-7aa9](https://w3id.org/fep/7aa9) for details.
+defaultContext:
+- "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/data-integrity/v1"
+- "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
+
+properties:
+- singularName: featuredObject
+  functional: true
+  compactName: featuredObject
+  uri: "https://w3id.org/fep/7aa9#featuredObject"
+  description: The object being featured.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Object"
+
+- singularName: featureAuthorization
+  functional: true
+  compactName: featureAuthorization
+  uri: "https://w3id.org/fep/7aa9#featureAuthorization"
+  description: |
+    The {@link FeatureAuthorization} proving that the featured actor consented
+    to inclusion in the featured collection.
+  range:
+  - "https://w3id.org/fep/7aa9#FeatureAuthorization"

package/src/featurerequest.yaml

@@ -0,0 +1,21 @@
+$schema: ../../vocab-tools/schema.yaml
+name: FeatureRequest
+compactName: FeatureRequest
+uri: "https://w3id.org/fep/7aa9#FeatureRequest"
+extends: "https://www.w3.org/ns/activitystreams#Activity"
+entity: true
+description: |
+  A request for consent before featuring an actor in a
+  {@link FeaturedCollection}.
+
+  The `object` property references the actor to be included, and the
+  `instrument` property references the featured collection.
+
+  See [FEP-7aa9](https://w3id.org/fep/7aa9) for details.
+defaultContext:
+- "https://w3id.org/identity/v1"
+- "https://www.w3.org/ns/activitystreams"
+- "https://w3id.org/security/data-integrity/v1"
+- "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
+properties: []

package/src/group.yaml

@@ -12,9 +12,13 @@ defaultContext:
 - "https://www.w3.org/ns/did/v1"
 - "https://w3id.org/security/multikey/v1"
 - "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"
+  featuredCollections:
+    "@id": "https://w3id.org/fep/7aa9#featuredCollections"
+    "@type": "@id"
   manuallyApprovesFollowers: "as:manuallyApprovesFollowers"
   movedTo:
     "@id": "as:movedTo"
@@ -196,6 +200,15 @@ properties:
   range:
   - "https://www.w3.org/ns/activitystreams#Collection"
 
+- singularName: featuredCollections
+  functional: true
+  compactName: featuredCollections
+  uri: "https://w3id.org/fep/7aa9#featuredCollections"
+  description: |
+    A collection of {@link FeaturedCollection}s created by this actor.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Collection"
+
 - pluralName: streams
   singularName: stream
   singularAccessor: false

package/src/interactionpolicy.yaml

@@ -12,9 +12,24 @@ description: |
 
   See [GoToSocial interaction controls](https://docs.gotosocial.org/en/latest/federation/interaction_controls/)
   for details.
-defaultContext: "https://gotosocial.org/ns"
+defaultContext:
+- "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 
 properties:
+- singularName: canFeature
+  functional: true
+  compactName: canFeature
+  uri: "https://w3id.org/fep/7aa9#canFeature"
+  untyped: true
+  description: |
+    The sub-policy specifying who can feature the actor in a
+    {@link FeaturedCollection}.
+
+    See [FEP-7aa9](https://w3id.org/fep/7aa9) for details.
+  range:
+  - "https://gotosocial.org/ns#InteractionRule"
+
 - singularName: canLike
   functional: true
   compactName: canLike

package/src/lookup.ts

@@ -2,6 +2,8 @@ import type { GetUserAgentOptions } from "@fedify/vocab-runtime";
 import {
   type DocumentLoader,
   getDocumentLoader,
+  haveSameIriOrigin,
+  parseIri,
   type RemoteDocument,
 } from "@fedify/vocab-runtime";
 import { lookupWebFinger } from "@fedify/webfinger";
@@ -312,12 +314,14 @@ async function lookupObjectInternal(
   }
   if (remoteDoc == null) return null;
   let object: Object;
+  let documentUrl: URL;
   try {
+    documentUrl = parseIri(remoteDoc.documentUrl);
     object = await Object.fromJsonLd(remoteDoc.document, {
       documentLoader,
       contextLoader: options.contextLoader,
       tracerProvider: options.tracerProvider,
-      baseUrl: new URL(remoteDoc.documentUrl),
+      baseUrl: documentUrl,
     });
   } catch (error) {
     if (error instanceof TypeError) {
@@ -331,7 +335,7 @@ async function lookupObjectInternal(
   }
   if (
     options.crossOrigin !== "trust" && object.id != null &&
-    object.id.origin !== new URL(remoteDoc.documentUrl).origin
+    !haveSameIriOrigin(object.id, documentUrl)
   ) {
     if (options.crossOrigin === "throw") {
       throw new Error(

package/src/organization.yaml

@@ -12,9 +12,13 @@ defaultContext:
 - "https://www.w3.org/ns/did/v1"
 - "https://w3id.org/security/multikey/v1"
 - "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"
+  featuredCollections:
+    "@id": "https://w3id.org/fep/7aa9#featuredCollections"
+    "@type": "@id"
   manuallyApprovesFollowers: "as:manuallyApprovesFollowers"
   movedTo:
     "@id": "as:movedTo"
@@ -196,6 +200,15 @@ properties:
   range:
   - "https://www.w3.org/ns/activitystreams#Collection"
 
+- singularName: featuredCollections
+  functional: true
+  compactName: featuredCollections
+  uri: "https://w3id.org/fep/7aa9#featuredCollections"
+  description: |
+    A collection of {@link FeaturedCollection}s created by this actor.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Collection"
+
 - pluralName: streams
   singularName: stream
   singularAccessor: false

package/src/person.yaml

@@ -12,9 +12,13 @@ defaultContext:
 - "https://www.w3.org/ns/did/v1"
 - "https://w3id.org/security/multikey/v1"
 - "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"
+  featuredCollections:
+    "@id": "https://w3id.org/fep/7aa9#featuredCollections"
+    "@type": "@id"
   manuallyApprovesFollowers: "as:manuallyApprovesFollowers"
   movedTo:
     "@id": "as:movedTo"
@@ -196,6 +200,15 @@ properties:
   range:
   - "https://www.w3.org/ns/activitystreams#Collection"
 
+- singularName: featuredCollections
+  functional: true
+  compactName: featuredCollections
+  uri: "https://w3id.org/fep/7aa9#featuredCollections"
+  description: |
+    A collection of {@link FeaturedCollection}s created by this actor.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Collection"
+
 - pluralName: streams
   singularName: stream
   singularAccessor: false

package/src/service.yaml

@@ -12,9 +12,13 @@ defaultContext:
 - "https://www.w3.org/ns/did/v1"
 - "https://w3id.org/security/multikey/v1"
 - "https://gotosocial.org/ns"
+- "https://w3id.org/fep/7aa9"
 - alsoKnownAs:
     "@id": "as:alsoKnownAs"
     "@type": "@id"
+  featuredCollections:
+    "@id": "https://w3id.org/fep/7aa9#featuredCollections"
+    "@type": "@id"
   manuallyApprovesFollowers: "as:manuallyApprovesFollowers"
   movedTo:
     "@id": "as:movedTo"
@@ -196,6 +200,15 @@ properties:
   range:
   - "https://www.w3.org/ns/activitystreams#Collection"
 
+- singularName: featuredCollections
+  functional: true
+  compactName: featuredCollections
+  uri: "https://w3id.org/fep/7aa9#featuredCollections"
+  description: |
+    A collection of {@link FeaturedCollection}s created by this actor.
+  range:
+  - "https://www.w3.org/ns/activitystreams#Collection"
+
 - pluralName: streams
   singularName: stream
   singularAccessor: false