From fd81a4bdc4f1c80d9dd73358452f50bc6422afef Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 12 Feb 2018 21:43:04 -0800
Subject: initial share refactor

---
 Zotlabs/Module/Item.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index db2d64d70..73730bc99 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -39,6 +39,7 @@ class Item extends \Zotlabs\Web\Controller {
 		$uid = local_channel();
 		$channel = null;
 		$observer = null;
+		$datarray = [];
 	
 	
 		/**
@@ -619,6 +620,21 @@ class Item extends \Zotlabs\Web\Controller {
 					$i++;
 				}
 			}
+
+
+			if(preg_match_all('/(\[share=(.*?)\](.*?)\[\/share\])/',$body,$match)) {
+				// process share by id				
+
+				$verb = ACTIVITY_SHARE;
+				$i = 0;
+				foreach($match[2] as $mtch) {
+//					$obj = get_share_activity($mtch);
+					$datarray['obj'] = $obj['obj'];
+					$datarray['obj_type'] = $obj['obj']['type'];
+					$body = str_replace($match[1][$i],$obj['body'],$body);
+					$i++;
+				}
+			}
 	
 		}
 	
@@ -720,7 +736,6 @@ class Item extends \Zotlabs\Web\Controller {
 		if(!$thr_parent)
 			$thr_parent = $mid;
 	
-		$datarray = array();
 
 		$item_thread_top = ((! $parent) ? 1 : 0);
 	
-- 
cgit v1.2.3


From 6ca3442ba381a3c5b98cd04f4f9e87e48c55b072 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Feb 2018 12:13:37 -0800
Subject: defperms: bad query

---
 Zotlabs/Module/Defperms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Defperms.php b/Zotlabs/Module/Defperms.php
index 422333a50..97d9cfd1d 100644
--- a/Zotlabs/Module/Defperms.php
+++ b/Zotlabs/Module/Defperms.php
@@ -22,7 +22,7 @@ class Defperms extends \Zotlabs\Web\Controller {
 	
 		$r = q("SELECT abook.*, xchan.*
 			FROM abook left join xchan on abook_xchan = xchan_hash
-			WHERE abook_self = 1 and abook_id = %d LIMIT 1",
+			WHERE abook_self = 1 and abook_channel = %d LIMIT 1",
 			intval(local_channel())
 		);
 		if($r) {
-- 
cgit v1.2.3


From 64809dd2777ae0064addaff765450cf3f05c3bc4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 13 Feb 2018 20:07:57 -0800
Subject: turn shares into activities - make certain to pull addons or JSON-LD
 will chuck a wobbly

---
 Zotlabs/Module/Item.php  | 8 ++++----
 Zotlabs/Module/Share.php | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Module')

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 73730bc99..3f857030b 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -628,10 +628,10 @@ class Item extends \Zotlabs\Web\Controller {
 				$verb = ACTIVITY_SHARE;
 				$i = 0;
 				foreach($match[2] as $mtch) {
-//					$obj = get_share_activity($mtch);
-					$datarray['obj'] = $obj['obj'];
-					$datarray['obj_type'] = $obj['obj']['type'];
-					$body = str_replace($match[1][$i],$obj['body'],$body);
+					$reshare = new \Zotlabs\Lib\Share($mtch);
+					$datarray['obj'] = $reshare->obj();
+					$datarray['obj_type'] = $datarray['obj']['type'];
+					$body = str_replace($match[1][$i],$reshare->bbcode(),$body);
 					$i++;
 				}
 			}
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 5c4811c59..7f4d8b1eb 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -14,6 +14,10 @@ class Share extends \Zotlabs\Web\Controller {
 		if(! $post_id)
 			killme();
 	
+
+		echo '[share=' . $post_id . '][/share]';
+		killme();
+
 		if(! (local_channel() || remote_channel()))
 			killme();
 	
-- 
cgit v1.2.3