From e77cd174953533f0ba0d11e581c385d40d7e8897 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 15 May 2018 19:50:29 +0000
Subject: [PATCH] We do the notify stuff now directly in the item class

---
 src/Protocol/DFRN.php     | 25 -------------------------
 src/Protocol/Diaspora.php |  6 ------
 2 files changed, 31 deletions(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index c41481872a..51ec9ade9b 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2719,23 +2719,6 @@ class DFRN
 					Item::distribute($posted_id);
 				}
 
-				$item["id"] = $posted_id;
-
-				$r = q(
-					"SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-					intval($posted_id),
-					intval($importer["importer_uid"])
-				);
-				if (DBM::is_result($r)) {
-					$parent = $r[0]["parent"];
-					$parent_uri = $r[0]["parent-uri"];
-				}
-
-				if ($posted_id && $parent && ($entrytype == DFRN::REPLY_RC)) {
-					logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
-					Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $posted_id);
-				}
-
 				return true;
 			}
 		} else { // $entrytype == DFRN::TOP_LEVEL
@@ -2837,14 +2820,6 @@ class DFRN
 		}
 
 		Item::deleteById($item["id"]);
-
-		if ($entrytype != DFRN::TOP_LEVEL) {
-			// if this is a relayed delete, propagate it to other recipients
-			if ($entrytype == DFRN::REPLY_RC) {
-				logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
-				Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
-			}
-		}
 	}
 
 	/**
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index adb1e8cbfa..bae2eb6a2a 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -2868,12 +2868,6 @@ class Diaspora
 			Item::deleteById($item["id"]);
 
 			logger("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], LOGGER_DEBUG);
-
-			// Now check if the retraction needs to be relayed by us
-			if ($parent["origin"]) {
-				// notify others
-				Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
-			}
 		}
 
 		return true;
-- 
2.39.5