From b388a645d34bea5f93462c995fef12c5d5e35eb4 Mon Sep 17 00:00:00 2001
From: Keith Chason <kchason@kchason.com>
Date: Mon, 13 Sep 2021 10:19:40 -0400
Subject: [PATCH 1/2] Establish MessageTypeVocab

---
 uco-vocabulary/vocabulary.ttl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/uco-vocabulary/vocabulary.ttl b/uco-vocabulary/vocabulary.ttl
index 83f6e472..f67eb5f1 100644
--- a/uco-vocabulary/vocabulary.ttl
+++ b/uco-vocabulary/vocabulary.ttl
@@ -601,6 +601,21 @@ vocabulary:MemoryBlockTypeVocab
 	) ;
 	.
 
+vocabulary:MessageTypeVocab
+	a rdfs:Datatype ;
+	rdfs:subClassOf rdfs:Resource ;
+	rdfs:label "Message Type Vocabulary"@en-US ;
+	rdfs:comment "Defines an open-vocabulary of message types that specify which type of message (email, chat, SMS, etc) a Message is."@en ;
+	owl:oneOf (
+		"SMS/MMS"^^vocabulary:MessageTypeVocab
+		"Email"^^vocabulary:MessageTypeVocab
+		"Chat"^^vocabulary:MessageTypeVocab
+		"Phone"^^vocabulary:MessageTypeVocab
+		"Mail"^^vocabulary:MessageTypeVocab
+		"Human"^^vocabulary:MessageTypeVocab
+	) ;
+	.
+
 vocabulary:ObservableObjectRelationshipVocab
 	a rdfs:Datatype ;
 	rdfs:subClassOf rdfs:Resource ;

From 669853621da49b2e7344a74ef02abb674241814a Mon Sep 17 00:00:00 2001
From: Keith Chason <kchason@kchason.com>
Date: Mon, 13 Sep 2021 10:37:46 -0400
Subject: [PATCH 2/2] Map messageType observable to newly created vocab

---
 uco-observable/observable.ttl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/uco-observable/observable.ttl b/uco-observable/observable.ttl
index a34698b8..4da10400 100644
--- a/uco-observable/observable.ttl
+++ b/uco-observable/observable.ttl
@@ -3497,28 +3497,28 @@ observable:MessageFacet
 			sh:path observable:from ;
 		] ,
 		[
-			sh:datatype xsd:dateTime ;
+			sh:datatype xsd:MessageTypeVocab ;
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:path observable:sentTime ;
+			sh:path observable:messageType ;
 		] ,
 		[
-			sh:datatype xsd:string ;
+			sh:datatype xsd:dateTime ;
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:path observable:messageID ;
+			sh:path observable:sentTime ;
 		] ,
 		[
 			sh:datatype xsd:string ;
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:path observable:messageText ;
+			sh:path observable:messageID ;
 		] ,
 		[
 			sh:datatype xsd:string ;
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
-			sh:path observable:messageType ;
+			sh:path observable:messageText ;
 		] ,
 		[
 			sh:datatype xsd:string ;
@@ -10182,8 +10182,8 @@ observable:messageText
 observable:messageType
 	a owl:DatatypeProperty ;
 	rdfs:label "messageType"@en ;
-	rdfs:comment "Message type specifies what sort of message (email, chat, SMS, etc) a Message is."@en ;
-	rdfs:range xsd:string ;
+	rdfs:comment "Message type specifies what sort of message (Email, Chat, SMS/MMS, etc) a Message is."@en ;
+	rdfs:range vocabulary:MessageTypeVocab ;
 	.
 
 observable:messagingAddress