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

package/dist-tests/{actor-BTMC-aMT.mjs → actor-DbccxbiS.mjs}

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, N as Service, T as Organization, V as __toESM, a as Application, m as Group, z as __commonJSMin } from "./vocab-XnSGFOqq.mjs";
+import { A as Person, G as __toESM, L as Service, U as __commonJSMin, a as Application, k as Organization, v as Group } from "./vocab-DOHLQ4UQ.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -1206,7 +1206,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.4.0-dev.1570+f1b6aaa3";
+var version = "2.4.0-dev.1571+31e2786b";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { B as __exportAll, E as Person, N as Service, T as Organization, a as Application, m as Group } from "./vocab-XnSGFOqq.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-BTMC-aMT.mjs";
+import { A as Person, L as Service, W as __exportAll, a as Application, k as Organization, v as Group } from "./vocab-DOHLQ4UQ.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-DbccxbiS.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js

package/dist-tests/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/dist-tests/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/dist-tests/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/dist-tests/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/dist-tests/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/dist-tests/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/dist-tests/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/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, S as Object$1, o as Collection, x as Note } from "./vocab-XnSGFOqq.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-BTMC-aMT.mjs";
+import { A as Person, E as Object$1, T as Note, o as Collection } from "./vocab-DOHLQ4UQ.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-DbccxbiS.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -9,7 +9,7 @@ import { deepStrictEqual, equal, ok, rejects } from "node:assert/strict";
 import { lookupWebFinger } from "@fedify/webfinger";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
-import { getDocumentLoader } from "@fedify/vocab-runtime";
+import { getDocumentLoader, haveSameIriOrigin, parseIri } from "@fedify/vocab-runtime";
 import { delay } from "es-toolkit";
 //#region src/handle.ts
 /**
@@ -204,12 +204,14 @@ async function lookupObjectInternal(identifier, options = {}) {
 	}
 	if (remoteDoc == null) return null;
 	let object;
+	let documentUrl;
 	try {
+		documentUrl = parseIri(remoteDoc.documentUrl);
 		object = await Object$1.fromJsonLd(remoteDoc.document, {
 			documentLoader,
 			contextLoader: options.contextLoader,
 			tracerProvider: options.tracerProvider,
-			baseUrl: new URL(remoteDoc.documentUrl)
+			baseUrl: documentUrl
 		});
 	} catch (error) {
 		if (error instanceof TypeError) {
@@ -221,7 +223,7 @@ async function lookupObjectInternal(identifier, options = {}) {
 		}
 		throw error;
 	}
-	if (options.crossOrigin !== "trust" && object.id != null && object.id.origin !== new URL(remoteDoc.documentUrl).origin) {
+	if (options.crossOrigin !== "trust" && object.id != null && !haveSameIriOrigin(object.id, documentUrl)) {
 		if (options.crossOrigin === "throw") throw new Error(`The object's @id (${object.id.href}) has a different origin than the document URL (${remoteDoc.documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to "trust".`);
 		logger.warn("The object's @id ({objectId}) has a different origin than the document URL ({documentUrl}); refusing to return the object.  If you want to bypass this check and are aware of the security implications, set the crossOrigin option to \"trust\".", {
 			...remoteDoc,

package/dist-tests/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/dist-tests/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/dist-tests/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

package/dist-tests/type.test.mjs

@@ -1,6 +1,6 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
-import { E as Person, I as getEntityTypeById, L as isEntityType, y as Link } from "./vocab-XnSGFOqq.mjs";
+import { A as Person, B as getEntityTypeById, C as Link, V as isEntityType } from "./vocab-DOHLQ4UQ.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual } from "node:assert/strict";