start containers

5 files changed, 170 insertions, 8 deletions

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 20134b8fe..76e0628bf 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -345,7 +345,7 @@ class Notifier {
 			}
 
 			logger('target_item: ' . print_r($target_item, true), LOGGER_DEBUG);
-			logger('encoded: ' . print_r(self::$encoded_item, true), LOGGER_DEBUG);
+			hz_syslog('encoded: ' . print_r(self::$encoded_item, true), LOGGER_DEBUG);
 
 			// Send comments to the owner to re-deliver to everybody in the conversation
 			// We only do this if the item in question originated on this site. This prevents looping.
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 1ea42acd3..2b9beb3f5 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -8,6 +8,7 @@ use Zotlabs\Access\PermissionRoles;
 use Zotlabs\Access\Permissions;
 use Zotlabs\Daemon\Master;
 use Zotlabs\Web\HTTPSig;
+use Zotlabs\Entity\Item;
 
 require_once('include/event.php');
 require_once('include/html2plain.php');
@@ -570,6 +571,25 @@ class Activity {
 
 		if ($i['mid'] !== $i['parent_mid']) {
 			$ret['inReplyTo'] = ((strpos($i['thr_parent'], 'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
+
+			$cnv = IConfig::Get($i['parent'], 'activitypub', 'context');
+			if (!$cnv) {
+				$cnv = $i['parent_mid'];
+			}
+		}
+
+		if (empty($cnv)) {
+			$cnv = IConfig::Get($i, 'activitypub', 'context');
+			if (!$cnv) {
+				$cnv = $i['parent_mid'];
+			}
+		}
+
+		if (!empty($cnv)) {
+			if (is_string($cnv) && str_starts_with($cnv, z_root())) {
+				$cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv);
+			}
+			$ret['context'] = $cnv;
 		}
 
 		if ($i['mimetype'] === 'text/bbcode') {
@@ -589,6 +609,12 @@ class Activity {
 
 		$t = self::encode_taxonomy($i);
 		if ($t) {
+			foreach($t as $tag) {
+				if (strcasecmp($tag['name'], '#nsfw') === 0 || strcasecmp($tag['name'], '#sensitive') === 0) {
+					$ret['sensitive'] = true;
+				}
+			}
+
 			$ret['tag'] = $t;
 		}
 
@@ -596,7 +622,20 @@ class Activity {
 		if ($a) {
 			$ret['attachment'] = $a;
 		}
-
+/*
+		if ($i['target']) {
+			if (is_string($i['target'])) {
+				$tmp = json_decode($i['target'], true);
+				if ($tmp !== null) {
+					$i['target'] = $tmp;
+				}
+			}
+			$tgt = self::encode_object($i['target']);
+			if ($tgt) {
+				$ret['target'] = $tgt;
+			}
+		}
+*/
 		if (intval($i['item_private']) === 0) {
 			$ret['to'] = [ACTIVITY_PUBLIC_INBOX];
 		}
@@ -938,6 +977,25 @@ class Activity {
 			if (!in_array($ret['type'], ['Create', 'Update', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject'])) {
 				$ret['inReplyTo'] = ((strpos($i['thr_parent'], 'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
 			}
+
+			$cnv = IConfig::Get($i['parent'], 'activitypub', 'context');
+			if (!$cnv) {
+				$cnv = $item['parent_mid'];
+			}
+		}
+
+		if (empty($cnv)) {
+			$cnv = IConfig::Get($i, 'activitypub', 'context');
+			if (!$cnv) {
+				$cnv = $i['parent_mid'];
+			}
+		}
+
+		if (!empty($cnv)) {
+			if (is_string($cnv) && str_starts_with($cnv, z_root())) {
+				$cnv = str_replace(['/item/', '/activity/'], ['/conversation/', '/conversation/'], $cnv);
+			}
+			$ret['context'] = $cnv;
 		}
 
 		$actor = self::encode_person($i['author'], false);
@@ -1009,7 +1067,11 @@ class Activity {
 
 		call_hooks('encode_activity', $hookinfo);
 
+//hz_syslog(print_r($hookinfo['encoded'], true));
+
 		return $hookinfo['encoded'];
+
+
 	}
 
 	// Returns an array of URLS for any mention tags found in the item array $i.
@@ -2867,6 +2929,10 @@ class Activity {
 		// This isn't perfect but the best we can do for now.
 		$item['comment_policy'] = ((isset($act->data['commentPolicy'])) ? $act->data['commentPolicy'] : 'authenticated');
 
+		if (!empty($act->obj['context'])) {
+			IConfig::Set($item, 'activitypub', 'context', $act->obj['context'], 1);
+		}
+
 		IConfig::Set($item, 'activitypub', 'recips', $act->raw_recips);
 
 		if (intval($act->sigok)) {
@@ -3676,5 +3742,70 @@ class Activity {
 		}
 	}
 
+	public static function addToCollection($channel, $object, $target, $sourceItem = null, $deliver = true) {
+		if (!isset($channel['xchan_hash'])) {
+			$channel = channelx_by_hash($channel['channel_hash']);
+		}
+
+		$item = ((new Item())
+			->setUid($channel['channel_id'])
+			->setVerb('Add')
+			->setAuthorXchan($channel['channel_hash'])
+			->setOwnerXchan($channel['channel_hash'])
+			->setObj($object)
+			->setObjType($object['type'])
+			->setParentMid(str_replace('/conversation/','/item/', $target))
+			->setThrParent(str_replace('/conversation/','/item/', $target))
+			->setApproved($object['object']['id'] ?? '')
+			->setReplyto(z_root() . '/channel/' . $channel['channel_address'])
+			->setTgtType('Collection')
+			->setTarget([
+				'id' => str_replace('/item/','/conversation/', $target),
+				'type' => 'Collection',
+				'attributedTo' => z_root() . '/channel/' . $channel['channel_address'],
+			])
+		);
+		if ($sourceItem) {
+			$item->setAllowCid($sourceItem['allow_cid'])
+				->setAllowGid($sourceItem['allow_gid'])
+				->setDenyCid($sourceItem['deny_cid'])
+				->setDenyGid($sourceItem['deny_gid'])
+				->setPrivate($sourceItem['item_private'])
+				->setNocomment($sourceItem['item_nocomment'])
+				->setCommentPolicy($sourceItem['comment_policy'])
+				->setPostopts($sourceItem['postopts']);
+		}
+		$result = post_activity_item($item->toArray(), deliver: $deliver, channel: $channel, observer: $channel, addAndSync: false);
+		logger('addToCollection: ' . print_r($result, true));
+		return $result;
+	}
+
+	public static function removeFromCollection($channel, $object, $target, $deliver = true) {
+		if (!isset($channel['xchan_hash'])) {
+			$channel = channelx_by_hash($channel['channel_hash']);
+		}
+
+		$item = ((new Item())
+			->setUid($channel['channel_id'])
+			->setVerb('Remove')
+			->setAuthorXchan($channel['channel_hash'])
+			->setOwnerXchan($channel['channel_hash'])
+			->setObj($object)
+			->setObjType($object['type'])
+			->setParentMid(str_replace('/conversation/','/item/', $target))
+			->setThrParent(str_replace('/conversation/','/item/', $target))
+			->setReplyto(z_root() . '/channel/' . $channel['channel_address'])
+			->setTgtType('Collection')
+			->setTarget([
+				'id' => str_replace('/item/','/conversation/', $target),
+				'type' => 'Collection',
+				'attributedTo' => z_root() . '/channel/' . $channel['channel_address']
+			])
+		);
+
+		$result = post_activity_item($item->toArray(), deliver: $deliver, channel: $channel, observer: $channel, addAndSync: false);
+		logger('removeFromCollection: ' . print_r($result, true));
+		return $result;
+	}
 
 }
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index bc944c97c..243588d2b 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -1148,6 +1148,7 @@ class Libzot {
 				logger('Activity rejected: ' . print_r($data, true));
 				return;
 			}
+
 			if (is_array($AS->obj)) {
 				$item = Activity::decode_note($AS);
 				if (!$item) {
diff --git a/Zotlabs/Module/Conversation.php b/Zotlabs/Module/Conversation.php
index aa8349f55..c3e6ae5ec 100644
--- a/Zotlabs/Module/Conversation.php
+++ b/Zotlabs/Module/Conversation.php
@@ -16,7 +16,7 @@ class Conversation extends Controller {
 
 	public function init() {
 
-		if (ActivityStreams::is_as_request()) {
+		if (ActivityStreams::is_as_request() || Libzot::is_zot_request()) {
 			$item_id = argv(1);
 
 			if (!$item_id) {
@@ -77,7 +77,7 @@ class Conversation extends Controller {
 					}
 				}
 			}
-			elseif (Config::get('system', 'require_authenticated_fetch', false)) {
+			elseif (Config::Get('system', 'require_authenticated_fetch', false)) {
 				http_status_exit(403, 'Permission denied');
 			}
 
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 5618137a1..c755fadd0 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -1029,18 +1029,44 @@ class Item extends Controller {
 		}
 
 
-		if ($moderated)
+		if ($moderated) {
 			$item_blocked = ITEM_MODERATED;
+		}
 
 
-		if (!strlen($verb))
+		if (!strlen($verb)) {
 			$verb = 'Create';
+		}
 
 		$notify_type = (($parent) ? 'comment-new' : 'wall-new');
 
 		$uuid = $uuid ?? $message_id ?? item_message_id();
 		$mid = $mid ?? z_root() . '/item/' . $uuid;
 
+
+        // Set the conversation target.
+        if (empty($owner_hash)) {
+            $owner_hash = $owner_xchan['xchan_hash'];
+        }
+
+        if ($owner_hash === $channel['channel_hash']) {
+            $attributedTo = z_root() . '/channel/' . $channel['channel_address'];
+
+            $conversation = isset($parent_item) ? $parent_item['mid'] : $mid;
+            $datarray['target'] = [
+                'id' => str_replace('/item/', '/conversation/', $conversation),
+                'type' => 'Collection',
+                'attributedTo' => $attributedTo,
+            ];
+            $datarray['tgt_type'] = 'Collection';
+        }
+        elseif (!empty($parent_item['target'])) {
+            $datarray['target'] = $parent_item['target'];
+            $datarray['tgt_type'] = $parent_item['tgt_type'];
+        }
+
+
+
 		if ($is_poll) {
 			$poll = [
 				'question'         => $body,
@@ -1375,8 +1401,12 @@ class Item extends Controller {
 			$nopush = false;
 		}
 
-		if (!$nopush)
-			Master::Summon(['Notifier', $notify_type, $post_id]);
+        if (!$nopush) {
+            Master::Summon(['Notifier', $notify_type, $post_id]);
+            if (intval($post['approval_id'])) {
+                Master::Summon(['Notifier', $notify_type, $post['approval_id']]);
+            }
+        }
 
 		logger('post_complete');