From 5f39e0d123af2e4aba1d6fa70a867db1d8467673 Mon Sep 17 00:00:00 2001 From: mrkvon Date: Wed, 21 May 2025 12:24:08 +0200 Subject: [PATCH] Fix inconsistencies in namespaces flow: => wf: wf:message => meeting:message meeeting: => meeting: XML: => xsd: (ic:|ical:) => cal: Also store updated drawio diagram in uncompressed format --- diagrams/SolidChatShapes.drawio | 236 +++++++++++++++++++++++++++++++- diagrams/SolidChatShapes.svg | 2 +- examples/chat-20.ttl | 4 +- examples/chat-25.ttl | 4 +- index.html | 16 +-- shapes/chat-shapes.ttl | 13 +- 6 files changed, 255 insertions(+), 20 deletions(-) diff --git a/diagrams/SolidChatShapes.drawio b/diagrams/SolidChatShapes.drawio index 5563a26..4be86f6 100644 --- a/diagrams/SolidChatShapes.drawio +++ b/diagrams/SolidChatShapes.drawio @@ -1 +1,235 @@ -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 \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/diagrams/SolidChatShapes.svg b/diagrams/SolidChatShapes.svg index ce96354..55d151b 100644 --- a/diagrams/SolidChatShapes.svg +++ b/diagrams/SolidChatShapes.svg @@ -1,3 +1,3 @@ -
sioc:has_member
sioc:h...
sioc:has_member
sioc:h...
sioc:has_reply
sioc:h...
a re-edited message
a re-edited message
sioc:has_reply
sioc:h...
sioc:has_reply
sioc:h...
sioc:Thread
sioc:Thread
sioc:has_member
sioc:h...
replies in...
replies in...
a ...
a ...
... thread.
... thread.
rdf:type
rdf:ty...
Long Chat
Long Chat
html
html
text
text
sioc:content
sioc:content
sender
sen...
foaf:maker
foaf:maker
sioc:richContent
sioc:richContent
wf:message
wf:message
date time
date time
dct:created
dct:created
date time
date time
ffffff
ffffff
dct:modified
dct:modified
The original message
The original message
date time
date time
schema:dateDeleted
schema...
dct:isReplacedBy
dct:is...
an edited message
an edited message
dct:isReplacedBy
dct:is...
schema:target
schema...
schema:
Like
schema:...
schema:agent
schema:age...
dct:created
dct:cr...
date time
date time
rdf:type
rdf:ty...
emoji
emoji
sioc:content
sioc:contentText is not SVG - cannot display \ No newline at end of file +
sioc:has_member
sioc:h...
sioc:has_member
sioc:h...
sioc:has_reply
sioc:h...
a re-edited message
a re-edited message
sioc:has_reply
sioc:h...
sioc:has_reply
sioc:h...
sioc:Thread
sioc:Thread
sioc:has_member
sioc:h...
replies in...
replies in...
a ...
a ...
... thread.
... thread.
rdf:type
rdf:ty...
Long Chat
Long Chat
html
html
text
text
sioc:content
sioc:content
sender
sen...
foaf:maker
foaf:maker
sioc:richContent
sioc:richContent
meeting:message
meeting:message
date time
date time
dct:created
dct:created
date time
date time
ffffff
ffffff
dct:modified
dct:modified
The original message
The original message
date time
date time
schema:dateDeleted
schema...
dct:isReplacedBy
dct:is...
an edited message
an edited message
dct:isReplacedBy
dct:is...
schema:target
schema...
schema:
Like
schema:...
schema:agent
schema:age...
dct:created
dct:cr...
date time
date time
rdf:type
rdf:ty...
emoji
emoji
sioc:content
sioc:contentText is not SVG - cannot display diff --git a/examples/chat-20.ttl b/examples/chat-20.ttl index 9100de3..c8a9fef 100644 --- a/examples/chat-20.ttl +++ b/examples/chat-20.ttl @@ -1,8 +1,8 @@ @prefix : <#>. @prefix dct: . @prefix foaf: . +@prefix meeting: . @prefix sioc: . -@prefix wf: . @prefix xsd: . @prefix ch: <../25/chat.ttl#>. @prefix n2: <../../../../../Person/timbl-54d26c98db8155e6700f7312%3Agitter.im/index.ttl#>. @@ -64,7 +64,7 @@ B a reply to A"""; ch:DI0tRhwu8HMb_SXqeZi1JYZUq9qFdaFawQn7c63h5vE sioc:has_reply :GVu4AdmzBFnQvuLRvX0e8wc6oNOPdV0ki_qcJjDdbzk. n3:this - wf:message + meeting:message :2Bw5IeK9IeHnVNtzkOgAovUFix49JaociYdTO6G-F3w, :8a4hxwxSNaNTb5bv6oTCswcBNW7zvXc8inaoBWBM9Ro, :bqp11ZmhhAGmwXLt8evvjyoI4Z8vs08agOqcdA0fy6A, diff --git a/examples/chat-25.ttl b/examples/chat-25.ttl index 2e92738..00b5a00 100644 --- a/examples/chat-25.ttl +++ b/examples/chat-25.ttl @@ -1,9 +1,9 @@ @prefix : <#>. @prefix dct: . @prefix foaf: . +@prefix meeting: . @prefix schema: . @prefix sioc: . -@prefix wf: . @prefix xsd: . @prefix ch: <../20/chat.ttl#>. @prefix n4: <../../../index.ttl#>. @@ -80,7 +80,7 @@ Reply D to A1 edited"""; sioc:id ; foaf:maker ind:this. n4:this - wf:message + meeting:message :47vi3j5ixcwDTMYevX6VepZoq_DKhLlNaf4SR4mJmqQ, :bNGquK6W8jCsnw1OPgjHl6GcHSvidMR9rD8nH1MjePs, :DI0tRhwu8HMb_SXqeZi1JYZUq9qFdaFawQn7c63h5vE, diff --git a/index.html b/index.html index 8800fbd..72f939d 100644 --- a/index.html +++ b/index.html @@ -1143,7 +1143,7 @@

Chat Message

:MessageShape a sh:NodeShape; sh:targetClass schema:Message; - sh:targetObjectsOf meeeting:message; # No can be other things + sh:targetObjectsOf meeting:message; # No can be other things sh:closed false ; # different message systems may have all kinds of metadata sh:property [ @@ -1260,7 +1260,7 @@

Threads and Replies

sioc:id ; foaf:maker ind:this. -n4:this wf:message +n4:this meeting:message :HxuJZPg18me8iX8sB18Nb2Oo9ObJwMLS7GRoJUfDV_Y, :YclVtjeT3mfFu-bD-XKbsKpRsaPaEW_7JCQVBEOCWvY. @@ -1419,7 +1419,7 @@

Deleted and Modified Messages

schema:dateDeleted "2023-08-24T13:27:57Z"^^xsd:dateTime; foaf:maker c22:me. -n6:this wf:message :Msg1692883560076 . +n6:this meeting:message :Msg1692883560076 . @@ -1535,21 +1535,21 @@

Preferences

:this a meeting:LongChat; dct:author c1:me; - dct:created "2018-07-06T21:36:04Z"^^XML:dateTime; + dct:created "2018-07-06T21:36:04Z"^^xsd:dateTime; dct:title "Our Chat channel"; wf:participation :id1530912972126, :id1538415256782, :id1538415459106 . :id1530912972126 - ic:dtstart "2018-07-06T21:36:12Z"^^XML:dateTime; - flow:participant c1:me; + cal:dtstart "2018-07-06T21:36:12Z"^^xsd:dateTime; + wf:participant c1:me; solid:expandImagesInline true; ui:backgroundColor "#c1d0c8". :id1538415256782 - ic:dtstart "2018-07-07T11:16:12Z"^^XML:dateTime; - flow:participant c2:me; + cal:dtstart "2018-07-07T11:16:12Z"^^xsd:dateTime; + wf:participant c2:me; solid:expandImagesInline false; ui:backgroundColor "#ffccdd". diff --git a/shapes/chat-shapes.ttl b/shapes/chat-shapes.ttl index 92db244..118af44 100644 --- a/shapes/chat-shapes.ttl +++ b/shapes/chat-shapes.ttl @@ -10,6 +10,7 @@ # Domain ontologies +@prefix cal: . @prefix dc: . @prefix dct: . @prefix foaf: . @@ -26,7 +27,7 @@ :LongChatShape a sh:NodeShape ; sh:targetClass meeting:LongChat ; - sh: targetSubjectsOf meeeting:message; + sh: targetSubjectsOf meeting:message; sh:closed false ; sh:ignoredProperties (); sh:property [ @@ -45,7 +46,7 @@ sh:property [ [ sh:path ui:sharedPreferences ; sh:count 1 ], - [ sh:path flow:participation ; + [ sh:path wf:participation ; sh:minCount 0 ] , [ sh:path dc:author ; @@ -56,7 +57,7 @@ sh:property [ :MessageShape a sh:NodeShape; sh:targetClass schema:Message; - sh: targetObjectsOf meeeting:message; # No can be other things + sh: targetObjectsOf meeting:message; # No can be other things sh:closed false ; # different message systems may have all kinds of metadata @@ -179,16 +180,16 @@ sh:property [ ################ Participation objects :ParticpationShape a sh:NodeShape; - sh:targetObjectsOf flow:participation; + sh:targetObjectsOf wf:participation; sh:property [ - sh:path ical:dtstart; + sh:path cal:dtstart; sh:datatype xsd:dateTime; sh:count 1; ]; sh:property [ - sh:path flow:participant; + sh:path wf:participant; sh:count 1; ];