From 3be79cb592a7f3af11e1c86620e6bfb4737af6e5 Mon Sep 17 00:00:00 2001 From: silverpill Date: Sat, 11 Apr 2026 17:23:08 +0200 Subject: [PATCH] FEP-0837: Update proposal (#816) - Removed om2 from @context. - Updated full example to be unit based. - Added flohmarkt and Fedify to implementation list Reviewed-on: https://codeberg.org/fediverse/fep/pulls/816 Co-authored-by: silverpill Co-committed-by: silverpill --- fep/0837/fep-0837.jsonld | 7 ++++--- fep/0837/fep-0837.md | 42 +++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/fep/0837/fep-0837.jsonld b/fep/0837/fep-0837.jsonld index b636898..d0d1046 100644 --- a/fep/0837/fep-0837.jsonld +++ b/fep/0837/fep-0837.jsonld @@ -1,6 +1,5 @@ { "@context": { - "om2": "http://www.ontology-of-units-of-measure.org/resource/om-2/", "vf": "https://w3id.org/valueflows/ont/vf#", "Agreement": "vf:Agreement", "Commitment": "vf:Commitment", @@ -8,13 +7,15 @@ "Proposal": "vf:Proposal", "action": "vf:action", "availableQuantity": "vf:availableQuantity", - "hasUnit": "om2:hasUnit", - "hasNumericalValue": "om2:hasNumericalValue", + "hasUnit": "vf:hasUnit", + "hasNumericalValue": "vf:hasNumericalValue", "purpose": "vf:purpose", "publishes": "vf:publishes", "reciprocal": "vf:reciprocal", "resourceConformsTo": "vf:resourceConformsTo", "resourceQuantity": "vf:resourceQuantity", + "availableQuantity": "vf:availableQuantity", + "minimumQuantity": "vf:minimumQuantity", "satisfies": "vf:satisfies", "stipulates": "vf:stipulates", "stipulatesReciprocal": "vf:stipulatesReciprocal", diff --git a/fep/0837/fep-0837.md b/fep/0837/fep-0837.md index 7292748..9a0d506 100644 --- a/fep/0837/fep-0837.md +++ b/fep/0837/fep-0837.md @@ -78,7 +78,6 @@ Minimal example: "@context": [ "https://www.w3.org/ns/activitystreams", { - "om2": "http://www.ontology-of-units-of-measure.org/resource/om-2/", "vf": "https://w3id.org/valueflows/ont/vf#", "Proposal": "vf:Proposal", "Intent": "vf:Intent", @@ -88,8 +87,8 @@ Minimal example: "publishes": "vf:publishes", "resourceConformsTo": "vf:resourceConformsTo", "resourceQuantity": "vf:resourceQuantity", - "hasUnit": "om2:hasUnit", - "hasNumericalValue": "om2:hasNumericalValue" + "hasUnit": "vf:hasUnit", + "hasNumericalValue": "vf:hasNumericalValue" } ], "type": "Proposal", @@ -117,7 +116,6 @@ Full example: "@context": [ "https://www.w3.org/ns/activitystreams", { - "om2": "http://www.ontology-of-units-of-measure.org/resource/om-2/", "vf": "https://w3id.org/valueflows/ont/vf#", "Proposal": "vf:Proposal", "Intent": "vf:Intent", @@ -130,16 +128,16 @@ Full example: "resourceQuantity": "vf:resourceQuantity", "availableQuantity": "vf:availableQuantity", "minimumQuantity": "vf:minimumQuantity", - "hasUnit": "om2:hasUnit", - "hasNumericalValue": "om2:hasNumericalValue" + "hasUnit": "vf:hasUnit", + "hasNumericalValue": "vf:hasNumericalValue" } ], "type": "Proposal", "id": "https://market.example/proposals/ddde9d6f-6f3b-4770-a966-3a18ef006930", "purpose": "offer", "attributedTo": "https://market.example/users/alice", - "name": "Offering used bike", - "content": "Blue one-speed bike, 15 years old, some rust", + "name": "Local organic carrots", + "content": "Great quality with all the rain, harvested yesterday.", "published": "2023-06-18T19:22:03.918737Z", "location": { "type": "Place", @@ -150,18 +148,18 @@ Full example: "type": "Intent", "id": "https://market.example/proposals/ddde9d6f-6f3b-4770-a966-3a18ef006930#primary", "action": "transfer", - "resourceConformsTo": "https://www.wikidata.org/wiki/Q11442", + "resourceConformsTo": "https://www.wikidata.org/wiki/Q81", "resourceQuantity": { - "hasUnit": "one", + "hasUnit": "pound", "hasNumericalValue": "1" }, "availableQuantity": { - "hasUnit": "one", - "hasNumericalValue": "1" + "hasUnit": "pound", + "hasNumericalValue": "150" }, "minimumQuantity": { - "hasUnit": "one", - "hasNumericalValue": "1" + "hasUnit": "pound", + "hasNumericalValue": "5" } }, "reciprocal": { @@ -171,10 +169,10 @@ Full example: "resourceConformsTo": "https://www.wikidata.org/wiki/Q4917", "resourceQuantity": { "hasUnit": "currencyAmount", - "hasNumericalValue": "30.00" + "hasNumericalValue": "0.89" } }, - "unitBased": false, + "unitBased": "true", "to": "https://www.w3.org/ns/activitystreams#Public" } ``` @@ -246,7 +244,6 @@ Example of an `Offer(Agreement)` activity: "@context": [ "https://www.w3.org/ns/activitystreams", { - "om2": "http://www.ontology-of-units-of-measure.org/resource/om-2/", "vf": "https://w3id.org/valueflows/ont/vf#", "Agreement": "vf:Agreement", "stipulates": "vf:stipulates", @@ -254,8 +251,8 @@ Example of an `Offer(Agreement)` activity: "Commitment": "vf:Commitment", "satisfies": "vf:satisfies", "resourceQuantity": "vf:resourceQuantity", - "hasUnit": "om2:hasUnit", - "hasNumericalValue": "om2:hasNumericalValue" + "hasUnit": "vf:hasUnit", + "hasNumericalValue": "vf:hasNumericalValue" } ], "type": "Offer", @@ -301,7 +298,6 @@ Example: "@context": [ "https://www.w3.org/ns/activitystreams", { - "om2": "http://www.ontology-of-units-of-measure.org/resource/om-2/", "vf": "https://w3id.org/valueflows/ont/vf#", "Agreement": "vf:Agreement", "stipulates": "vf:stipulates", @@ -309,8 +305,8 @@ Example: "Commitment": "vf:Commitment", "satisfies": "vf:satisfies", "resourceQuantity": "vf:resourceQuantity", - "hasUnit": "om2:hasUnit", - "hasNumericalValue": "om2:hasNumericalValue" + "hasUnit": "vf:hasUnit", + "hasNumericalValue": "vf:hasNumericalValue" } ], "type": "Accept", @@ -398,7 +394,9 @@ Example: ## Implementations +- [flohmarkt]( https://codeberg.org/flohmarkt/flohmarkt/releases/tag/0.18.0) - [Mitra](https://codeberg.org/silverpill/mitra/src/tag/v4.11.0/FEDERATION.md#subscriptions) +- [Fedify](https://github.com/fedify-dev/fedify/pull/579) ## References