port to containers item_store() continued

2 files changed, 59 insertions, 51 deletions

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index cb9925c01..83b7bea1e 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -1271,6 +1271,7 @@ class Item extends Controller {
 				$this->add_listeners($datarray);
 			}
 
+			/* sync this is done in item_store_update()
 			if (!$parent) {
 				$r = q("select * from item where id = %d",
 					intval($post_id)
@@ -1281,9 +1282,14 @@ class Item extends Controller {
 					Libsync::build_sync_packet($profile_uid, ['item' => [encode_item($sync_item[0], true)]]);
 				}
 			}
-			if (!$nopush)
-				Master::Summon(['Notifier', 'edit_post', $post_id]);
+			*/
 
+			if (!$nopush) {
+				Master::Summon(['Notifier', 'edit_post', $post_id]);
+				if (intval($x['approval_id'])) {
+					Master::Summon(['Notifier', 'edit_post', $x['approval_id']]);
+				}
+			}
 
 			if ($api_source)
 				return ($x);
@@ -1387,6 +1393,7 @@ class Item extends Controller {
 			killme();
 		}
 
+		/* sync this is done in item_store_update()
 		if ($parent || $datarray['item_private'] == 1) {
 			$r = q("select * from item where id = %d",
 				intval($post_id)
@@ -1397,6 +1404,7 @@ class Item extends Controller {
 				Libsync::build_sync_packet($profile_uid, ['item' => [encode_item($sync_item[0], true)]]);
 			}
 		}
+		*/
 
 		$datarray['id']    = $post_id;
 		$datarray['llink'] = z_root() . '/display/' . $datarray['uuid'];
diff --git a/Zotlabs/Module/Tagrm.php b/Zotlabs/Module/Tagrm.php
index a6dc21798..34eaf85b2 100644
--- a/Zotlabs/Module/Tagrm.php
+++ b/Zotlabs/Module/Tagrm.php
@@ -7,141 +7,141 @@ require_once('include/bbcode.php');
 class Tagrm extends \Zotlabs\Web\Controller {
 
 	function post() {
-	
+
 		if(! local_channel())
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
-	
+
+
 		if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 		$tag =  ((x($_POST,'tag'))  ? trim($_POST['tag'])       : '');
 		$item = ((x($_POST,'item')) ? intval($_POST['item'])    : 0 );
-	
+
 		$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
 			intval($item),
 			intval(local_channel())
 		);
-	
+
 		if(! $r)
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 		$r = fetch_post_tags($r,true);
-	
+
 		$item = $r[0];
 		$new_tags = array();
-	
+
 		if($item['term']) {
 			for($x = 0; $x < count($item['term']); $x ++) {
 				if($item['term'][$x]['term'] !== hex2bin($tag))
 					$new_tags[] = $item['term'][$x];
 			}
 		}
-	
+
 		if($new_tags)
 			$item['term'] = $new_tags;
 		else
 			unset($item['term']);
-	
-		item_store_update($item);
-	
+
+		item_store_update($item, deliver: false, addAndSync: false);
+
 		info( t('Tag removed') . EOL );
 		goaway(z_root() . '/' . $_SESSION['photo_return']);
-		
+
 		// NOTREACHED
-	
+
 	}
-	
-	
-	
+
+
+
 	function get() {
-	
+
 		if(! local_channel()) {
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
 			// NOTREACHED
 		}
-	
+
 		// remove tag on the fly if item and tag are provided
 		if((argc() == 4) && (argv(1) === 'drop') && intval(argv(2))) {
-	
+
 			$item = intval(argv(2));
 			$tag = argv(3);
-	
+
 			$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
 				intval($item),
 				intval(local_channel())
 			);
-	
+
 			if(! $r)
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 			$r = fetch_post_tags($r,true);
-	
+
 			$item = $r[0];
-	
+
 			$new_tags = array();
-	
+
 			if($item['term']) {
 				for($x = 0; $x < count($item['term']); $x ++) {
 					if($item['term'][$x]['term'] !== hex2bin($tag))
 						$new_tags[] = $item['term'][$x];
 				}
 			}
-	
+
 			if($new_tags)
 				$item['term'] = $new_tags;
 			else
 				unset($item['term']);
-	
-			item_store_update($item);
-	
+
+			item_store_update($item, deliver: false, addAndSync: false);
+
 			info( t('Tag removed') . EOL );
 			goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 		}
-	
+
 		//if we got only the item print a list of tags to select
 		if((argc() == 3) && (argv(1) === 'drop') && intval(argv(2))) {
-	
+
 			$o = '';
-	
+
 			$item = intval(argv(2));
-	
+
 			$r = q("SELECT * FROM item WHERE id = %d AND uid = %d LIMIT 1",
 				intval($item),
 				intval(local_channel())
 			);
-	
+
 			if(! $r)
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 			$r = fetch_post_tags($r,true);
-	
+
 			if(! count($r[0]['term']))
 				goaway(z_root() . '/' . $_SESSION['photo_return']);
-	
+
 			$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
-	
+
 			$o .= '<p id="tag-remove-desc">' . t('Select a tag to remove: ') . '</p>';
-	
+
 			$o .= '<form id="tagrm" action="tagrm" method="post" >';
 			$o .= '<input type="hidden" name="item" value="' . $item . '" />';
 			$o .= '<ul>';
-	
-	
+
+
 			foreach($r[0]['term'] as $x) {
 				$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x['term']) . '" >' . bbcode($x['term']) . '</input></li>';
 			}
-	
+
 			$o .= '</ul>';
 			$o .= '<input id="tagrm-submit" type="submit" name="submit" value="' . t('Remove') .'" />';
 			$o .= '<input id="tagrm-cancel" type="submit" name="submit" value="' . t('Cancel') .'" />';
 			$o .= '</form>';
-	
+
 			return $o;
-	
+
 		}
-		
+
 	}
-	
+
 }