X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=b707c62c556b3f34c6fc1408b3431e8b71a0f69a;hb=79eeb409695716fae8a501a02ef57ed855acb3a8;hp=b5167aa72dc66829d71564f9effd656c0ccc286c;hpb=8293d5ed0af78ae6cc5629bb1f982a7b29794d32;p=friendica.git

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index b5167aa72d..b707c62c55 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -585,7 +585,7 @@ class OStatus
 			return;
 		}
 
-		Item::delete($condition);
+		Item::markForDeletion($condition);
 
 		Logger::log('Deleted item with uri '.$item['uri'].' for user '.$item['uid']);
 	}
@@ -1682,7 +1682,7 @@ class OStatus
 
 		$entry = self::entryHeader($doc, $owner, $item, $toplevel);
 
-		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
+		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => [Item::PUBLIC, Item::UNLISTED],
 			'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
 		$repeated_item = Item::selectFirst([], $condition);
 		if (!DBA::isResult($repeated_item)) {
@@ -1827,7 +1827,7 @@ class OStatus
 	{
 		$item["id"] = $item["parent"] = 0;
 		$item["created"] = $item["edited"] = date("c");
-		$item["private"] = true;
+		$item["private"] = Item::PRIVATE;
 
 		$contact = Probe::uri($item['follow']);
 
@@ -2120,7 +2120,7 @@ class OStatus
 			]);
 		}
 
-		if (!$item["private"] && !$feed_mode) {
+		if (($item['private'] != Item::PRIVATE) && !$feed_mode) {
 			XML::addElement($doc, $entry, "link", "", ["rel" => "ostatus:attention",
 									"href" => "http://activityschema.org/collection/public"]);
 			XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
@@ -2212,8 +2212,8 @@ class OStatus
 		$authorid = Contact::getIdForURL($owner["url"], 0, true);
 
 		$condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
-			AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
-			$owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
+			AND `private` != ? AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
+			$owner["uid"], $check_date, Item::PRIVATE, Protocol::OSTATUS, Protocol::DFRN];
 
 		if ($filter === 'comments') {
 			$condition[0] .= " AND `object-type` = ? ";