-
Notifications
You must be signed in to change notification settings - Fork 2
Edit chat shape to include longchat #47
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bourgeoa
wants to merge
2
commits into
solid:main
Choose a base branch
from
bourgeoa:edit-chat-shape
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+281
−9
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -9,9 +9,11 @@ | |||||||
| @prefix sioc: <http://rdfs.org/sioc/ns#> . | ||||||||
| @prefix solid: <http://www.w3.org/ns/solid/terms#> . | ||||||||
| @prefix terms: <http://purl.org/dc/terms/> . | ||||||||
| @prefix sec: <https://w3id.org/security#> . | ||||||||
| @prefix ui: <http://www.w3.org/ns/ui#> . | ||||||||
| @prefix xsd: <http://www.w3.org/2001/XMLSchema#> . | ||||||||
| @prefix schema: <https://schema.org/> . | ||||||||
| @prefix schema_http: <http://schema.org/> . | ||||||||
| @prefix dct: <http://purl.org/dc/terms/> . | ||||||||
| @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . | ||||||||
| @prefix prov: <http://www.w3.org/ns/prov#> . | ||||||||
|
|
@@ -126,13 +128,6 @@ chat_shape:chatmessageshape_content a sh:PropertyShape ; | |||||||
| sh:description "The textual content of the message." ; | ||||||||
| sh:codeIdentifier "content" . | ||||||||
|
|
||||||||
| chat_shape:chatmessageshape_relatedchatchannel a sh:PropertyShape ; | ||||||||
| sh:path [ sh:inversePath flow:message ] ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:name "Related Chat" ; | ||||||||
| sh:description "The chat channel or conversation to which this message belongs." ; | ||||||||
| sh:codeIdentifier "relatedChatChannel" . | ||||||||
|
|
||||||||
| ##################### Chat Participation Shape | ||||||||
|
|
||||||||
| chat_shape:ChatParticipationShape a sh:NodeShape ; | ||||||||
|
|
@@ -255,14 +250,41 @@ chat_shape:ChatActionShape a sh:NodeShape ; | |||||||
| sh:name "Chat Action Shape" ; | ||||||||
| sh:description "NodeShape defining constraints for actions representing interactions or sentiments in the chat system." ; | ||||||||
| sh:targetClass schema:Action ; | ||||||||
| sh:targetClass schema_http:Action ; | ||||||||
| sh:targetSubjectsOf schema:target ; | ||||||||
| sh:targetSubjectsOf schema_http:target ; | ||||||||
| dct:created "2026-03-12"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/chat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/chat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "ChatAction" ; | ||||||||
| sh:property chat_shape:chatactionshape_type, | ||||||||
| chat_shape:chatactionshape_agent, | ||||||||
| chat_shape:chatactionshape_target | ||||||||
| chat_shape:chatactionshape_agent_http, | ||||||||
| chat_shape:chatactionshape_target, | ||||||||
| chat_shape:chatactionshape_target_http ; | ||||||||
| sh:or ( | ||||||||
| [ sh:property [ | ||||||||
| sh:path schema:agent ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ; | ||||||||
| sh:property [ | ||||||||
| sh:path schema:target ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ] | ||||||||
| [ sh:property [ | ||||||||
| sh:path schema_http:agent ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ; | ||||||||
| sh:property [ | ||||||||
| sh:path schema_http:target ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ] | ||||||||
| ) | ||||||||
| . | ||||||||
|
|
||||||||
| chat_shape:chatactionshape_type a sh:PropertyShape ; | ||||||||
|
|
@@ -277,9 +299,259 @@ chat_shape:chatactionshape_agent a sh:PropertyShape ; | |||||||
| sh:name "Agent" ; | ||||||||
| sh:codeIdentifier "agent" . | ||||||||
|
|
||||||||
| chat_shape:chatactionshape_agent_http a sh:PropertyShape ; | ||||||||
| sh:path schema_http:agent ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Agent (Legacy)" ; | ||||||||
| sh:description "Legacy http://schema.org/ agent predicate accepted for compatibility." ; | ||||||||
| sh:codeIdentifier "agentLegacy" . | ||||||||
|
|
||||||||
| chat_shape:chatactionshape_target a sh:PropertyShape ; | ||||||||
| sh:path schema:target ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Target" ; | ||||||||
| sh:codeIdentifier "target" . | ||||||||
|
|
||||||||
| chat_shape:chatactionshape_target_http a sh:PropertyShape ; | ||||||||
| sh:path schema_http:target ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Target (Legacy)" ; | ||||||||
| sh:description "Legacy http://schema.org/ target predicate accepted for compatibility." ; | ||||||||
| sh:codeIdentifier "targetLegacy" . | ||||||||
|
|
||||||||
| ##################### Long Chat Semantic Variants | ||||||||
|
|
||||||||
| # These additive shapes model the current SolidOS long chat implementation | ||||||||
| # without changing the existing published Chat* shapes above. | ||||||||
|
|
||||||||
| ##################### Long Chat Channel Shape | ||||||||
|
|
||||||||
| chat_shape:LongChatChannelShape a sh:NodeShape ; | ||||||||
| sh:name "Long Chat Channel Shape" ; | ||||||||
| sh:description "SHACL NodeShape for signed, append-only, threaded Solid Long Chat channels." ; | ||||||||
| sh:targetClass mee:LongChat ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/chat-shapes.ttl>, | ||||||||
| <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "LongChatChannel" ; | ||||||||
| sh:property chat_shape:chatchannelshape_type, | ||||||||
| chat_shape:chatchannelshape_author, | ||||||||
| chat_shape:chatchannelshape_title, | ||||||||
| chat_shape:chatchannelshape_createddate, | ||||||||
| chat_shape:chatchannelshape_sharedpreferences, | ||||||||
| chat_shape:chatchannelshape_participation, | ||||||||
| chat_shape:longchatchannelshape_message . | ||||||||
|
|
||||||||
| chat_shape:longchatchannelshape_message a sh:PropertyShape ; | ||||||||
| sh:path flow:message ; | ||||||||
| sh:node chat_shape:LongChatMessageShape ; | ||||||||
| sh:name "Top-Level Long Chat Message" ; | ||||||||
| sh:description "Top-level messages linked directly from the long chat channel." ; | ||||||||
| sh:codeIdentifier "topLevelMessage" . | ||||||||
|
|
||||||||
| ##################### Long Chat Message Shape | ||||||||
|
|
||||||||
| chat_shape:LongChatMessageShape a sh:NodeShape ; | ||||||||
| sh:name "Long Chat Message Shape" ; | ||||||||
| sh:description "SHACL NodeShape for signed long chat messages, including replies, replacements, and deletions. In the current implementation, proofValue signs the core message fields id, created, content, and maker, but does not directly sign replacement, thread, or deletion metadata. Both http://schema.org/ and https://schema.org/ deletion predicates are accepted for compatibility." ; | ||||||||
| sh:targetObjectsOf flow:message ; | ||||||||
| sh:targetObjectsOf sioc:has_member ; | ||||||||
| sh:targetObjectsOf dct:isReplacedBy ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/chat-shapes.ttl>, | ||||||||
| <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "LongChatMessage" ; | ||||||||
| sh:property chat_shape:chatmessageshape_createddate, | ||||||||
| chat_shape:chatmessageshape_author, | ||||||||
| chat_shape:chatmessageshape_content, | ||||||||
| chat_shape:longchatmessageshape_proofvalue, | ||||||||
| chat_shape:longchatmessageshape_replythread, | ||||||||
| chat_shape:longchatmessageshape_replacedby, | ||||||||
| chat_shape:longchatmessageshape_datedeleted, | ||||||||
| chat_shape:longchatmessageshape_datedeleted_http . | ||||||||
| # inverse-path containment constraints are intentionally omitted here because | ||||||||
| # the current shacl-converter object generation only supports NamedNode sh:path values. | ||||||||
|
|
||||||||
| chat_shape:longchatmessageshape_proofvalue a sh:PropertyShape ; | ||||||||
| sh:path sec:proofValue ; | ||||||||
| sh:datatype xsd:string ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Proof Value" ; | ||||||||
| sh:description "Cryptographic signature or proof for the message." ; | ||||||||
| sh:codeIdentifier "proofValue" . | ||||||||
|
|
||||||||
| chat_shape:longchatmessageshape_replythread a sh:PropertyShape ; | ||||||||
| sh:path sioc:has_reply ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:node chat_shape:LongChatThreadShape ; | ||||||||
| sh:name "Reply Thread" ; | ||||||||
| sh:description "Links a thread root message to its thread resource." ; | ||||||||
| sh:codeIdentifier "replyThread" . | ||||||||
|
|
||||||||
| chat_shape:longchatmessageshape_replacedby a sh:PropertyShape ; | ||||||||
| sh:path dct:isReplacedBy ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:node chat_shape:LongChatMessageShape ; | ||||||||
| sh:name "Is Replaced By" ; | ||||||||
| sh:description "Append-only link from an earlier message version to its replacement." ; | ||||||||
| sh:codeIdentifier "isReplacedBy" . | ||||||||
|
|
||||||||
| chat_shape:longchatmessageshape_datedeleted a sh:PropertyShape ; | ||||||||
| sh:path schema:dateDeleted ; | ||||||||
| sh:datatype xsd:dateTime ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Date Deleted" ; | ||||||||
| sh:description "Deletion marker carried by a replacement message representing a deleted message." ; | ||||||||
| sh:codeIdentifier "dateDeleted" . | ||||||||
|
|
||||||||
| chat_shape:longchatmessageshape_datedeleted_http a sh:PropertyShape ; | ||||||||
| sh:path schema_http:dateDeleted ; | ||||||||
| sh:datatype xsd:dateTime ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Date Deleted (Legacy)" ; | ||||||||
| sh:description "Legacy http://schema.org/ deletion marker accepted for compatibility." ; | ||||||||
| sh:codeIdentifier "dateDeletedLegacy" . | ||||||||
|
|
||||||||
| ##################### Long Chat Replacement Shape | ||||||||
|
|
||||||||
| chat_shape:AppendOnlyMessageVersionShape a sh:NodeShape ; | ||||||||
| sh:name "Append-Only Message Version Shape" ; | ||||||||
| sh:description "NodeShape for long chat messages that replace an earlier message version." ; | ||||||||
| sh:targetSubjectsOf dct:isReplacedBy ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "AppendOnlyMessageVersion" ; | ||||||||
| sh:property chat_shape:longchatmessageshape_replacedby . | ||||||||
|
|
||||||||
| ##################### Deleted Long Chat Message Shape | ||||||||
|
|
||||||||
| chat_shape:DeletedLongChatMessageShape a sh:NodeShape ; | ||||||||
| sh:name "Deleted Long Chat Message Shape" ; | ||||||||
| sh:description "NodeShape for replacement messages that mark a long chat message as deleted. Both http://schema.org/ and https://schema.org/ deletion predicates are accepted for compatibility." ; | ||||||||
| sh:targetSubjectsOf schema:dateDeleted ; | ||||||||
| sh:targetSubjectsOf schema_http:dateDeleted ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "DeletedLongChatMessage" ; | ||||||||
| sh:property chat_shape:longchatmessageshape_datedeleted, | ||||||||
| chat_shape:longchatmessageshape_datedeleted_http . | ||||||||
| # previousVersion inverse path is intentionally omitted here because | ||||||||
| # the current shacl-converter object generation only supports NamedNode sh:path values. | ||||||||
|
|
||||||||
| ##################### Long Chat Thread Shape | ||||||||
|
|
||||||||
| chat_shape:LongChatThreadShape a sh:NodeShape ; | ||||||||
| sh:name "Long Chat Thread Shape" ; | ||||||||
| sh:description "NodeShape for thread resources grouping long chat replies." ; | ||||||||
| sh:targetObjectsOf sioc:has_reply ; | ||||||||
| sh:targetSubjectsOf sioc:has_member ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "LongChatThread" ; | ||||||||
| sh:property chat_shape:longchatthreadshape_type, | ||||||||
| chat_shape:longchatthreadshape_member . | ||||||||
|
|
||||||||
| chat_shape:longchatthreadshape_type a sh:PropertyShape ; | ||||||||
| sh:path rdf:type ; | ||||||||
| sh:value sioc:Thread ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| sh:name "Type" ; | ||||||||
| sh:description "Specifies that the node must be of type sioc:Thread." ; | ||||||||
| sh:codeIdentifier "type" . | ||||||||
|
Comment on lines
+465
to
+472
|
||||||||
|
|
||||||||
| chat_shape:longchatthreadshape_member a sh:PropertyShape ; | ||||||||
| sh:path sioc:has_member ; | ||||||||
| sh:node chat_shape:LongChatMessageShape ; | ||||||||
| sh:name "Thread Member" ; | ||||||||
| sh:description "A reply message belonging to the thread." ; | ||||||||
| sh:codeIdentifier "member" . | ||||||||
|
|
||||||||
| ##################### Long Chat Action Shape | ||||||||
|
|
||||||||
| chat_shape:LongChatActionShape a sh:NodeShape ; | ||||||||
| sh:name "Long Chat Action Shape" ; | ||||||||
| sh:description "NodeShape defining constraints for long chat actions such as reactions or other sentiments. Both http://schema.org/ and https://schema.org/ action terms are accepted for compatibility." ; | ||||||||
| sh:targetClass schema:Action ; | ||||||||
| sh:targetClass schema_http:Action ; | ||||||||
| sh:targetSubjectsOf schema:target ; | ||||||||
| sh:targetSubjectsOf schema_http:target ; | ||||||||
| dct:created "2026-04-07"^^xsd:date ; | ||||||||
| vs:term_status "testing" ; | ||||||||
| dc:source <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| prov:wasDerivedFrom <https://github.com/SolidOS/chat-pane/blob/main/shapes/longchat-shapes.ttl> ; | ||||||||
| sh:codeIdentifier "LongChatAction" ; | ||||||||
| sh:property chat_shape:longchatactionshape_type, | ||||||||
| chat_shape:longchatactionshape_agent, | ||||||||
| chat_shape:longchatactionshape_agent_http, | ||||||||
| chat_shape:longchatactionshape_target, | ||||||||
| chat_shape:longchatactionshape_target_http ; | ||||||||
| sh:or ( | ||||||||
| [ sh:property [ | ||||||||
| sh:path schema:agent ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ; | ||||||||
| sh:property [ | ||||||||
| sh:path schema:target ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ] | ||||||||
| [ sh:property [ | ||||||||
| sh:path schema_http:agent ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ; | ||||||||
| sh:property [ | ||||||||
| sh:path schema_http:target ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
| ] ] | ||||||||
| ) . | ||||||||
|
|
||||||||
| chat_shape:longchatactionshape_type a sh:PropertyShape ; | ||||||||
| sh:path rdf:type ; | ||||||||
| sh:minCount 1 ; | ||||||||
| sh:maxCount 1 ; | ||||||||
|
||||||||
| sh:maxCount 1 ; | |
| sh:maxCount 1 ; | |
| sh:in ( schema:Action schema_http:Action ) ; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AppendOnlyMessageVersionShapetargets subjects ofdct:isReplacedBy(i.e., earlier message versions that have been replaced), but the description says these messages “replace an earlier message version.” Consider updating the description to match the targeting semantics to avoid confusion for shape consumers.