fix mod subthread for zot6

2 files changed, 51 insertions, 66 deletions

diff --git a/Zotlabs/Module/Subthread.php b/Zotlabs/Module/Subthread.php
index 30e57197d..a796d85cb 100644
--- a/Zotlabs/Module/Subthread.php
+++ b/Zotlabs/Module/Subthread.php
@@ -1,6 +1,9 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Lib\Activity;
+
+
 require_once('include/security.php');
 require_once('include/bbcode.php');
 require_once('include/items.php');
@@ -10,22 +13,22 @@ require_once('include/items.php');
 class Subthread extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
+
 		if(! local_channel()) {
 			return;
 		}
-	
+
 		$sys = get_sys_channel();
 		$channel = \App::get_channel();
 
 		$item_id = ((argc() > 2) ? notags(trim(argv(2))) : 0);
-	
+
 		if(argv(1) === 'sub')
 			$activity = ACTIVITY_FOLLOW;
 		elseif(argv(1) === 'unsub')
 			$activity = ACTIVITY_UNFOLLOW;
-	
-	
+
+
 		$i = q("select * from item where id = %d and uid = %d",
 			intval($item_id),
 			intval(local_channel())
@@ -42,7 +45,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 				$item_id = (($i) ? $i[0]['id'] : 0);
 			}
 		}
-		
+
 		if(! $i) {
 			return;
 		}
@@ -56,37 +59,37 @@ class Subthread extends \Zotlabs\Web\Controller {
 				dbesc($r[0]['parent'])
 			);
 		}
-	
+
 		if((! $item_id) || (! $r)) {
 			logger('subthread: no item ' . $item_id);
 			return;
 		}
-	
+
 		$item = $r[0];
-	
+
 		$owner_uid = $item['uid'];
 		$observer = \App::get_observer();
 		$ob_hash = (($observer) ? $observer['xchan_hash'] : '');
-	
+
 		if(! perm_is_allowed($owner_uid,$ob_hash,'post_comments'))
 			return;
-	
+
 		$sys = get_sys_channel();
-	
+
 		$owner_uid = $item['uid'];
 		$owner_aid = $item['aid'];
-	
+
 		// if this is a "discover" item, (item['uid'] is the sys channel),
 		// fallback to the item comment policy, which should've been
 		// respected when generating the conversation thread.
 		// Even if the activity is rejected by the item owner, it should still get attached
-		// to the local discover conversation on this site. 
-	
+		// to the local discover conversation on this site.
+
 		if(($owner_uid != $sys['channel_id']) && (! perm_is_allowed($owner_uid,$observer['xchan_hash'],'post_comments'))) {
 				notice( t('Permission denied') . EOL);
 				killme();
 		}
-	
+
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($item['owner_xchan'])
 		);
@@ -94,7 +97,7 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$thread_owner = $r[0];
 		else
 			killme();
-	
+
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($item['author_xchan'])
 		);
@@ -102,50 +105,32 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$item_author = $r[0];
 		else
 			killme();
-	
-	
-	
-	
+
+
+
+
 		$uuid = item_message_id();
 		$mid = z_root() . '/item/' . $uuid;
 
 		$post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status'));
-	
+
 		$links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink']));
-		$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
-	
+		$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
+
 		$body = $item['body'];
-	
-		$obj = json_encode(array(
-			'type'    => $objtype,
-			'id'      => $item['mid'],
-			'parent'  => (($item['thr_parent']) ? $item['thr_parent'] : $item['parent_mid']),
-			'link'    => $links,
-			'title'   => $item['title'],
-			'content' => $item['body'],
-			'created' => $item['created'],
-			'edited'  => $item['edited'],
-			'author'  => array(
-				'name'     => $item_author['xchan_name'],
-				'address'  => $item_author['xchan_addr'],
-				'guid'     => $item_author['xchan_guid'],
-				'guid_sig' => $item_author['xchan_guid_sig'],
-				'link'     => array(
-					array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']),
-					array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])),
-				),
-		));
-	
+
+		$obj = Activity::fetch_item( [ 'id' => $item['mid'] ] );
+
 		if(! intval($item['item_thread_top']))
-			$post_type = 'comment';		
-	
+			$post_type = 'comment';
+
 		if($activity === ACTIVITY_FOLLOW)
 			$bodyverb = t('%1$s is following %2$s\'s %3$s');
 		if($activity === ACTIVITY_UNFOLLOW)
 			$bodyverb = t('%1$s stopped following %2$s\'s %3$s');
-	
+
 		$arr = array();
-	
+
 		$arr['uuid']          = $uuid;
 		$arr['mid']           = $mid;
 		$arr['aid']           = $owner_aid;
@@ -161,35 +146,35 @@ class Subthread extends \Zotlabs\Web\Controller {
 			$arr['item_wall'] = 1;
 		else
 			$arr['item_wall'] = 0;
-	
+
 		$ulink = '[zrl=' . $item_author['xchan_url'] . ']' . $item_author['xchan_name'] . '[/zrl]';
 		$alink = '[zrl=' . $observer['xchan_url'] . ']' . $observer['xchan_name'] . '[/zrl]';
 		$plink = '[zrl=' . z_root() . '/display/' . gen_link_id($item['mid']) . ']' . $post_type . '[/zrl]';
-		
+
 		$arr['body']          =  sprintf( $bodyverb, $alink, $ulink, $plink );
-	
+
 		$arr['verb']          = $activity;
 		$arr['obj_type']      = $objtype;
-		$arr['obj']           = $obj;
-	
+		$arr['obj']           = json_encode($obj);
+
 		$arr['allow_cid']     = $item['allow_cid'];
 		$arr['allow_gid']     = $item['allow_gid'];
 		$arr['deny_cid']      = $item['deny_cid'];
 		$arr['deny_gid']      = $item['deny_gid'];
-	
-		$post = item_store($arr);	
+
+		$post = item_store($arr);
 		$post_id = $post['item_id'];
-	
+
 		$arr['id'] = $post_id;
-	
+
 		call_hooks('post_local_end', $arr);
-	
+
 		killme();
-	
-	
+
+
 	}
-	
-	
-	
-	
+
+
+
+
 }
diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 2566924aa..6f29daec5 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -19,7 +19,7 @@ class Zotfeed extends Controller {
 				killme();
 			}
 
-			$channel = ((argv(1)) ? channelx_by_nick(argv(1)) : get_sys_channel());
+			$channel = channelx_by_nick(argv(1));
 			if (!$channel) {
 				killme();
 			}