From d8c93c0d13133d336e2cc3dbf3c48e0a6350c2d6 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 17 Jul 2017 22:17:40 -0700
Subject: activitypub, cont.

---
 include/feedutils.php | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'include/feedutils.php')

diff --git a/include/feedutils.php b/include/feedutils.php
index 5f2a06029..b31448d81 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1937,22 +1937,34 @@ function asencode_note($i) {
 
 
 function asencode_person($p) {
-	$ret = array();
-	$ret['type'] = 'Person';
-	$ret['id'] = $p['xchan_url'];
-	$ret['name'] = $p['xchan_name'];
-	$ret['image'] = array(
-		'type' => 'Link',
+	$ret = [];
+	$ret['type']  = 'Person';
+	$ret['id']    = $p['xchan_url'];
+	$ret['name']  = $p['xchan_name'];
+	$ret['icon']  = [ $p['xchan_photo_l'] ];
+	$ret['image'] = [
+		'type'      => 'Link',
 		'mediaType' => $p['xchan_photo_mimetype'],
-		'href' => $p['xchan_photo_l'],
-		'height' => 300,
-		'width' => 300
-	);
-	$ret['url'] = array(
-		'type' => 'Link',
+		'href'      => $p['xchan_photo_l'],
+		'height'    => 300,
+		'width'     => 300
+	];
+	$ret['url'] = [
+		'type'      => 'Link',
 		'mediaType' => 'text/html',
-		'href' => $p['xchan_url']
-	);
+		'href'      => $p['xchan_url']
+	];
+
+	if(array_key_exists('channel_id',$p)) {
+		$ret['inbox'] = z_root() . '/inbox/' . $p['channel_address'];
+		$ret['outbox'] = z_root() . '/outbox/' . $p['channel_address'];
+	}
+	else {
+		$collections = get_xconfig($p['xchan_hash'],'activitystreams','collections',[]);
+		if($collections) {
+			$ret = array_merge($ret,$collections);
+		}
+	}
 
 	return $ret;
 }
-- 
cgit v1.2.3