From 00fe4e747f9884ab11fe94621f645fc351285964 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 19 Sep 2017 21:40:38 -0700
Subject: use frozen jsonld contexts

---
 Zotlabs/Lib/ActivityStreams.php | 10 +++++-----
 Zotlabs/Lib/LDSignatures.php    |  4 +++-
 boot.php                        |  2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php
index d9735881a..1b9f82ddf 100644
--- a/Zotlabs/Lib/ActivityStreams.php
+++ b/Zotlabs/Lib/ActivityStreams.php
@@ -58,7 +58,7 @@ class ActivityStreams {
 		$this->saved_recips = $arr;
 	}
 
-	function collect_recips($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
+	function collect_recips($base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) {
 		$x = [];
 		$fields = [ 'to','cc','bto','bcc','audience'];
 		foreach($fields as $f) {
@@ -75,7 +75,7 @@ class ActivityStreams {
 		return $x;
 	}
 
-	function expand($arr,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
+	function expand($arr,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) {
 		$ret = [];
 
 		// right now use a hardwired recursion depth of 5
@@ -135,7 +135,7 @@ class ActivityStreams {
 	}
 
 
-	function get_property_obj($property,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
+	function get_property_obj($property,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV ) {
 		$prefix = $this->get_namespace($base,$namespace);
 		if($prefix === null)
 			return null;	
@@ -158,7 +158,7 @@ class ActivityStreams {
 		return null;
 	}
 
-	function get_compound_property($property,$base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
+	function get_compound_property($property,$base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) {
 		$x = $this->get_property_obj($property,$base,$namespace);
 		if($this->is_url($x)) {
 			$x = $this->fetch_property($x); 	
@@ -173,7 +173,7 @@ class ActivityStreams {
 		return false;
 	}
 
-	function get_primary_type($base = '',$namespace = 'https://www.w3.org/ns/activitystreams') {
+	function get_primary_type($base = '',$namespace = ACTIVITYSTREAMS_JSONLD_REV) {
 		if(! $base)
 			$base = $this->data;
 		$x = $this->get_property_obj('type',$base,$namespace);
diff --git a/Zotlabs/Lib/LDSignatures.php b/Zotlabs/Lib/LDSignatures.php
index 77e2ef332..31ffd71f1 100644
--- a/Zotlabs/Lib/LDSignatures.php
+++ b/Zotlabs/Lib/LDSignatures.php
@@ -35,7 +35,9 @@ class LDSignatures {
 		$options['signatureValue'] = base64_encode(rsa_sign($ohash . $dhash,$channel['channel_prvkey']));
 
 		$signed = array_merge([
-			'@context' => [ 'https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1' ],
+			'@context' => [ 
+				ACTIVITYSTREAMS_JSONLD_REV, 
+				'https://w3id.org/security/v1' ],
 			],$options);
 
 		return $signed;
diff --git a/boot.php b/boot.php
index e4738bd34..b6a33b808 100755
--- a/boot.php
+++ b/boot.php
@@ -456,6 +456,8 @@ define ( 'NAMESPACE_STATUSNET',       'http://status.net/schema/api/1/' );
 define ( 'NAMESPACE_ATOM1',           'http://www.w3.org/2005/Atom' );
 define ( 'NAMESPACE_YMEDIA',          'http://search.yahoo.com/mrss/' );
 
+define ( 'ACTIVITYSTREAMS_JSONLD_REV', 'https://www.w3.org/ns/activitystreams-history/v1.8.jsonld' );
+define ( 'ZOT_APSCHEMA_REV', '/apschema/v1.2' );
 /**
  * activity stream defines
  */
-- 
cgit v1.2.3