refactor drop_item[s]() for containers

4 files changed, 17 insertions, 7 deletions

diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index d41c464a6..30683404b 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -458,13 +458,14 @@ class Channel_calendar extends Controller {
 							}
 							else {
 								// complex deletion that needs to propagate and be performed in phases
-								drop_item($i[0]['id'], true, DROPITEM_PHASE1);
+								drop_item($i[0]['id'], DROPITEM_PHASE1);
 								$complex = true;
 							}
 
 							$ii = q("select * from item where id = %d",
 								intval($i[0]['id'])
 							);
+
 							if ($ii) {
 								xchan_query($ii);
 								$sync_item = fetch_post_tags($ii);
@@ -473,6 +474,9 @@ class Channel_calendar extends Controller {
 
 							if ($complex) {
 								tag_deliver($i[0]['uid'], $i[0]['id']);
+								if (intval($i[0]['item_wall'])) {
+									Master::Summon(['Notifier', 'drop', $i[0]['id']]);
+								}
 							}
 						}
 					}
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index e67566db9..cb9925c01 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -1494,7 +1494,6 @@ class Item extends Controller {
 						$can_delete = true;
 				}
 
-
 				if (!($can_delete || $local_delete)) {
 					notice(t('Permission denied.') . EOL);
 					return;
@@ -1510,13 +1509,14 @@ class Item extends Controller {
 				}
 				else {
 					// complex deletion that needs to propagate and be performed in phases
-					drop_item($i[0]['id'], true, DROPITEM_PHASE1);
+					drop_item($i[0]['id'], DROPITEM_PHASE1);
 					$complex = true;
 				}
 
 				$r = q("select * from item where id = %d",
 					intval($i[0]['id'])
 				);
+
 				if ($r) {
 					xchan_query($r);
 					$sync_item = fetch_post_tags($r);
@@ -1525,6 +1525,9 @@ class Item extends Controller {
 
 				if ($complex) {
 					tag_deliver($i[0]['uid'], $i[0]['id']);
+					if (intval($i[0]['item_wall']) || $i[0]['mid'] !== $i[0]['parent_mid']) {
+						Master::Summon(['Notifier', 'drop', $dropped_item['id']]);
+					}
 				}
 
 			}
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index eb92645ba..2fb3fab83 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -284,7 +284,7 @@ class Like extends Controller {
 						intval($ch[0]['channel_id'])
 					);
 					if ($r)
-						drop_item($r[0]['id'], false);
+						drop_item($r[0]['id']);
 					if ($interactive) {
 						notice(t('Previous action reversed.') . EOL);
 						return $o;
@@ -387,17 +387,20 @@ class Like extends Controller {
 				// already liked it. Drop that item.
 				require_once('include/items.php');
 				foreach ($r as $rr) {
-					drop_item($rr['id'], false, DROPITEM_PHASE1);
+					drop_item($rr['id'], DROPITEM_PHASE1);
+
 					// set the changed timestamp on the parent so we'll see the update without a page reload
 					q("update item set changed = '%s' where id = %d and uid = %d",
 						dbesc(datetime_convert()),
 						intval($rr['parent']),
 						intval($rr['uid'])
 					);
+
 					// Prior activity was a duplicate of the one we're submitting, just undo it;
 					// don't fall through and create another
-					if (activity_match($rr['verb'], $activity))
+					if (activity_match($rr['verb'], $activity)) {
 						$multi_undo = false;
+					}
 
 					$d = q("select * from item where id = %d",
 						intval($rr['id'])
diff --git a/Zotlabs/Module/Moderate.php b/Zotlabs/Module/Moderate.php
index ed2a1e4f9..2103684ab 100644
--- a/Zotlabs/Module/Moderate.php
+++ b/Zotlabs/Module/Moderate.php
@@ -74,7 +74,7 @@ class Moderate extends \Zotlabs\Web\Controller {
 					// let the sender know we received their comment but we don't permit spam here.
 					// Activity::send_rejection_activity(App::get_channel(), $item['author_xchan'], $item);
 
-					drop_item($post_id,false);
+					drop_item($post_id);
 					notice( t('Item deleted') . EOL);
 				}