port to containers item_store() continued

4 files changed, 17 insertions, 12 deletions

diff --git a/include/help.php b/include/help.php
index 12721a30b..5750da1a2 100644
--- a/include/help.php
+++ b/include/help.php
@@ -156,12 +156,12 @@ function store_doc_file($s) {
 	if($r) {
 		$item['id'] = $r[0]['id'];
 		$item['mid'] = $item['parent_mid'] = $r[0]['mid'];
-		$x = item_store_update($item);
+		$x = item_store_update($item, deliver: false, addAndSync: false);
 	}
 	else {
 		$item['uuid'] = item_message_id();
 		$item['mid'] = $item['parent_mid'] = z_root() . '/item/' . $item['uuid'];
-		$x = item_store($item);
+		$x = item_store($item, deliver: false, addAndSync: false);
 	}
 
 	return $x;
diff --git a/include/import.php b/include/import.php
index 479c2c255..77d35a3e7 100644
--- a/include/import.php
+++ b/include/import.php
@@ -825,13 +825,13 @@ function import_items($channel, $items, $sync = false, $relocate = null) {
 				if($item['edited'] >= $r[0]['edited']) {
 					$item['id']  = $r[0]['id'];
 					$item['uid'] = $channel['channel_id'];
-					$item_result = item_store_update($item,$allow_code,$deliver);
+					$item_result = item_store_update($item, $allow_code, $deliver, addAndSync: false);
 				}
 			}
 			else {
 				$item['aid'] = $channel['channel_account_id'];
 				$item['uid'] = $channel['channel_id'];
-				$item_result = item_store($item,$allow_code,$deliver);
+				$item_result = item_store($item, $allow_code, $deliver, addAndSync: false);
 			}
 
 			// preserve conversations you've been involved in from being expired
@@ -1886,7 +1886,7 @@ function import_webpage_element($element, $channel, $type) {
 		$arr['id'] = $i[0]['id'];
 		// don't update if it has the same timestamp as the original
 		if($arr['edited'] > $i[0]['edited'])
-			$x = item_store_update($arr,$execflag);
+			$x = item_store_update($arr, $execflag, deliver: false, addAndSync: false);
 	}
 	else {
 		if(($i) && (intval($i[0]['item_deleted']))) {
@@ -1897,7 +1897,7 @@ function import_webpage_element($element, $channel, $type) {
 			);
 		}
 		else
-			$x = item_store($arr,$execflag);
+			$x = item_store($arr, $execflag, deliver: false, addAndSync: false);
 	}
 
 	if($x && $x['success']) {
diff --git a/include/items.php b/include/items.php
index 8ca4b5ca0..98cff99f9 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3401,7 +3401,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false
 		$approval_id = $post['approval_id'] ?? 0;
 
 		if ($post_id) {
-			Master::Summon([ 'Notifier','tgroup',$post_id ]);
+			Master::Summon(['Notifier', 'tgroup', $post_id]);
             if ($approval_id) {
                 Master::Summon(['Notifier', 'tgroup', $approval_id]);
             }
diff --git a/include/photos.php b/include/photos.php
index 85c97d1fd..511024107 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -541,14 +541,19 @@ function photo_upload($channel, $observer, $args) {
 		// linked item from leaking into the feed when somebody has a channel with read_stream restrictions.
 
 		$arr['public_policy'] = map_scope(PermissionLimits::Get($channel['channel_id'], 'view_stream'), true);
-		if ($arr['public_policy'])
+
+		if ($arr['public_policy']) {
 			$arr['item_private'] = 1;
+		}
 
 		$result  = item_store($arr, false, $deliver);
-		$item_id = $result['item_id'];
 
-		if ($visible && $deliver)
-			Zotlabs\Daemon\Master::Summon(['Notifier', 'wall-new', $item_id]);
+		if ($visible && $deliver) {
+			Master::Summon(['Notifier', 'wall-new', $result['item_id']]);
+			if (!empty($result['approval_id'])) {
+				Master::Summon(['Notifier', 'wall-new', $result['approval_id']]);
+			}
+		}
 	}
 
 	$ret['success']      = true;
@@ -911,7 +916,7 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) {
 		. '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['imgscale'] . '[/zmg]'
 		. '[/zrl]';
 
-	$result  = item_store($arr);
+	$result  = item_store($arr, deliver: false, addAndSync: true);
 	$item_id = $result['item_id'];
 
 	return $item_id;