X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=97c96f6748b73f8ec6a16f3460216d398bfc29f6;hb=238c079d112be7ce16aab4e1b975bebefee4980a;hp=d0c56a819b07d5236a76ff7697a3f77ec4e9cce0;hpb=8770a2089eebe04aeb5d4034edd070cf72c9d3f3;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index d0c56a819b..97c96f6748 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -44,6 +44,7 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
 use Text_LanguageDetect;
+use Friendica\Repository\PermissionSet as RepPermissionSet;
 
 class Item
 {
@@ -93,7 +94,8 @@ class Item
 	const CONTENT_FIELDLIST = ['language'];
 
 	// All fields in the item table
-	const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+	const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
+			'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
 			'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
 			'created', 'edited', 'commented', 'received', 'changed', 'verb',
 			'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
@@ -113,6 +115,10 @@ class Item
 		Activity::FOLLOW,
 		Activity::ANNOUNCE];
 
+	const PUBLIC = 0;
+	const PRIVATE = 1;
+	const UNLISTED = 2;
+
 	private static $legacy_mode = null;
 
 	public static function isLegacyMode()
@@ -172,7 +178,7 @@ class Item
 		}
 
 		$pinned = [];
-		while ($useritem = self::fetch($useritems)) {
+		while ($useritem = DBA::fetch($useritems)) {
 			$pinned[] = $useritem['iid'];
 		}
 		DBA::close($useritems);
@@ -322,8 +328,19 @@ class Item
 			}
 		}
 
-		if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) {
-			$row['signed_text'] = $row['interaction'];
+		if ($row['internal-psid'] == RepPermissionSet::PUBLIC) {
+			if (array_key_exists('allow_cid', $row)) {
+				$row['allow_cid'] = '';
+			}
+			if (array_key_exists('allow_gid', $row)) {
+				$row['allow_gid'] = '';
+			}
+			if (array_key_exists('deny_cid', $row)) {
+				$row['deny_cid'] = '';
+			}
+			if (array_key_exists('deny_gid', $row)) {
+				$row['deny_gid'] = '';
+			}
 		}
 
 		if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
@@ -334,8 +351,8 @@ class Item
 		unset($row['internal-activity']);
 		unset($row['internal-network']);
 		unset($row['internal-iid']);
+		unset($row['internal-psid']);
 		unset($row['internal-iaid']);
-		unset($row['internal-icid']);
 		unset($row['internal-user-ignored']);
 		unset($row['interaction']);
 
@@ -652,15 +669,15 @@ class Item
 	{
 		$fields = [];
 
-		$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+		$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent',
+			'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id',
 			'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
 			'created', 'edited', 'commented', 'received', 'changed', 'psid',
 			'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
 			'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
 			'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
 			'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
-			'network' => 'internal-network', 'icid' => 'internal-icid',
-			'iaid' => 'internal-iaid'];
+			'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
 
 		if ($usermode) {
 			$fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
@@ -695,9 +712,7 @@ class Item
 			'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
 			'ignore' => 'event-ignore', 'id' => 'event-id'];
 
-		$fields['sign'] = ['signed_text', 'signature', 'signer'];
-
-		$fields['diaspora-interaction'] = ['interaction'];
+		$fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text'];
 
 		return $fields;
 	}
@@ -782,10 +797,6 @@ class Item
 			$joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
 		}
 
-		if (strpos($sql_commands, "`sign`.") !== false) {
-			$joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
-		}
-
 		if (strpos($sql_commands, "`diaspora-interaction`.") !== false) {
 			$joins .= " LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`";
 		}
@@ -825,13 +836,10 @@ class Item
 	 *
 	 * @return string The field list
 	 */
-	private static function constructSelectFields($fields, $selected)
+	private static function constructSelectFields(array $fields, array $selected)
 	{
 		if (!empty($selected)) {
-			$selected[] = 'internal-iid';
-			$selected[] = 'internal-iaid';
-			$selected[] = 'internal-icid';
-			$selected[] = 'internal-network';
+			$selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']);
 		}
 
 		if (in_array('verb', $selected)) {
@@ -842,10 +850,6 @@ class Item
 			$selected[] = 'internal-user-ignored';
 		}
 
-		if (in_array('signed_text', $selected)) {
-			$selected[] = 'interaction';
-		}
-
 		$legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
 
 		$selection = [];
@@ -1062,11 +1066,11 @@ class Item
 	 * @param integer $priority  Priority for the notification
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function delete($condition, $priority = PRIORITY_HIGH)
+	public static function markForDeletion($condition, $priority = PRIORITY_HIGH)
 	{
 		$items = self::select(['id'], $condition);
 		while ($item = self::fetch($items)) {
-			self::deleteById($item['id'], $priority);
+			self::markForDeletionById($item['id'], $priority);
 		}
 		DBA::close($items);
 	}
@@ -1093,7 +1097,7 @@ class Item
 				// Delete notifications
 				DBA::delete('notify', ['iid' => $item['id'], 'uid' => $uid]);
 			} elseif ($item['uid'] == $uid) {
-				self::deleteById($item['id'], PRIORITY_HIGH);
+				self::markForDeletionById($item['id'], PRIORITY_HIGH);
 			} else {
 				Logger::log('Wrong ownership. Not deleting item ' . $item['id']);
 			}
@@ -1102,17 +1106,17 @@ class Item
 	}
 
 	/**
-	 * Delete an item and notify others about it - if it was ours
+	 * Mark an item for deletion, delete related data and notify others about it - if it was ours
 	 *
-	 * @param integer $item_id  Item ID that should be delete
+	 * @param integer $item_id
 	 * @param integer $priority Priority for the notification
 	 *
 	 * @return boolean success
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function deleteById($item_id, $priority = PRIORITY_HIGH)
+	public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH)
 	{
-		Logger::notice('Delete item by id', ['id' => $item_id, 'callstack' => System::callstack()]);
+		Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]);
 		// locate item to be deleted
 		$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
 			'deleted', 'file', 'resource-id', 'event-id', 'attach',
@@ -1120,12 +1124,12 @@ class Item
 			'icid', 'iaid', 'psid'];
 		$item = self::selectFirst($fields, ['id' => $item_id]);
 		if (!DBA::isResult($item)) {
-			Logger::log('Item with ID ' . $item_id . " hasn't been found.", Logger::DEBUG);
+			Logger::info('Item not found.', ['id' => $item_id]);
 			return false;
 		}
 
 		if ($item['deleted']) {
-			Logger::log('Item with ID ' . $item_id . ' has already been deleted.', Logger::DEBUG);
+			Logger::info('Item has already been marked for deletion.', ['id' => $item_id]);
 			return false;
 		}
 
@@ -1195,7 +1199,7 @@ class Item
 		self::deleteThread($item['id'], $item['parent-uri']);
 
 		if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
-			self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
+			self::markForDeletion(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
 		}
 
 		ItemDeliveryData::delete($item['id']);
@@ -1215,14 +1219,13 @@ class Item
 
 		// If it's the parent of a comment thread, kill all the kids
 		if ($item['id'] == $item['parent']) {
-			self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
+			self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority);
 		}
 
 		// Is it our comment and/or our thread?
 		if ($item['origin'] || $parent['origin']) {
-
 			// When we delete the original post we will delete all existing copies on the server as well
-			self::delete(['uri' => $item['uri'], 'deleted' => false], $priority);
+			self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority);
 
 			// send the notification upstream/downstream
 			Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id']));
@@ -1235,7 +1238,7 @@ class Item
 			}
 		}
 
-		Logger::log('Item with ID ' . $item_id . " has been deleted.", Logger::DEBUG);
+		Logger::info('Item has been marked for deletion.', ['id' => $item_id]);
 
 		return true;
 	}
@@ -1246,8 +1249,8 @@ class Item
 			return;
 		}
 
-		$xo = XML::parseString($item["object"], false);
-		$xt = XML::parseString($item["target"], false);
+		$xo = XML::parseString($item["object"]);
+		$xt = XML::parseString($item["target"]);
 
 		if ($xt->type != Activity\ObjectType::NOTE) {
 			return;
@@ -1408,7 +1411,7 @@ class Item
 		}
 
 		$item['guid'] = self::guid($item, $notify);
-		$item['uri'] = Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid'])));
+		$item['uri'] = substr(Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))), 0, 255);
 
 		// Store URI data
 		$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
@@ -1525,7 +1528,7 @@ class Item
 		$item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
 		$item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
 		$item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
-		$item['title']         = trim($item['title'] ?? '');
+		$item['title']         = substr(trim($item['title'] ?? ''), 0, 255);
 		$item['location']      = trim($item['location'] ?? '');
 		$item['coord']         = trim($item['coord'] ?? '');
 		$item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
@@ -1537,12 +1540,12 @@ class Item
 		$item['object']        = trim($item['object'] ?? '');
 		$item['target-type']   = trim($item['target-type'] ?? '');
 		$item['target']        = trim($item['target'] ?? '');
-		$item['plink']         = trim($item['plink'] ?? '');
+		$item['plink']         = substr(trim($item['plink'] ?? ''), 0, 255);
 		$item['allow_cid']     = trim($item['allow_cid'] ?? '');
 		$item['allow_gid']     = trim($item['allow_gid'] ?? '');
 		$item['deny_cid']      = trim($item['deny_cid'] ?? '');
 		$item['deny_gid']      = trim($item['deny_gid'] ?? '');
-		$item['private']       = intval($item['private'] ?? 0);
+		$item['private']       = intval($item['private'] ?? self::PUBLIC);
 		$item['body']          = trim($item['body'] ?? '');
 		$item['tag']           = trim($item['tag'] ?? '');
 		$item['attach']        = trim($item['attach'] ?? '');
@@ -1692,7 +1695,7 @@ class Item
 
 			$fields = ['uri', 'parent-uri', 'id', 'deleted',
 				'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-				'wall', 'private', 'forum_mode', 'origin'];
+				'wall', 'private', 'forum_mode', 'origin', 'author-id'];
 			$condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
 			$params = ['order' => ['id' => false]];
 			$parent = self::selectFirst($fields, $condition, $params);
@@ -1738,8 +1741,8 @@ class Item
 				 * The original author commented, but as this is a comment, the permissions
 				 * weren't fixed up so it will still show the comment as private unless we fix it here.
 				 */
-				if ((intval($parent['forum_mode']) == 1) && $parent['private']) {
-					$item['private'] = 0;
+				if ((intval($parent['forum_mode']) == 1) && ($parent['private'] != self::PUBLIC)) {
+					$item['private'] = self::PUBLIC;
 				}
 
 				// If its a post that originated here then tag the thread as "mention"
@@ -1747,6 +1750,11 @@ class Item
 					DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
 					Logger::log('tagged thread ' . $parent_id . ' as mention for user ' . $item['uid'], Logger::DEBUG);
 				}
+
+				// Update the contact relations
+				if ($item['author-id'] != $parent['author-id']) {
+					DBA::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true);
+				}
 			} else {
 				/*
 				 * Allow one to see reply tweets from status.net even when
@@ -1809,7 +1817,7 @@ class Item
 
 		// ACL settings
 		if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) {
-			$private = 1;
+			$private = self::PRIVATE;
 		} else {
 			$private = $item['private'];
 		}
@@ -1935,9 +1943,9 @@ class Item
 
 		if ($entries > 1) {
 			// There are duplicates. We delete our just created entry.
-			Logger::notice('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid']]);
+			Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]);
 
-			// Yes, we could do a rollback here - but we are having many users with MyISAM.
+			// Yes, we could do a rollback here - but we possibly are still having users with MyISAM.
 			DBA::delete('item', ['id' => $current_post]);
 			DBA::commit();
 			return 0;
@@ -1980,10 +1988,6 @@ class Item
 
 			if (!empty($dsprsig->signed_text) && empty($dsprsig->signature) && empty($dsprsig->signer)) {
 				DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $dsprsig->signed_text], true);
-			} else {
-				// The other fields are used by very old Friendica servers, so we currently store them differently
-				DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
-					'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
 			}
 		}
 
@@ -2218,7 +2222,7 @@ class Item
 		// Only distribute public items from native networks
 		$condition = ['id' => $itemid, 'uid' => 0,
 			'network' => array_merge(Protocol::FEDERATED ,['']),
-			'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
+			'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => [self::PUBLIC, self::UNLISTED]];
 		$item = self::selectFirst(self::ITEM_FIELDLIST, $condition);
 		if (!DBA::isResult($item)) {
 			return;
@@ -2368,7 +2372,7 @@ class Item
 		}
 
 		// Is it a visible public post?
-		if (!$item["visible"] || $item["deleted"] || $item["moderated"] || $item["private"]) {
+		if (!$item["visible"] || $item["deleted"] || $item["moderated"] || ($item["private"] == Item::PRIVATE)) {
 			return;
 		}
 
@@ -2559,7 +2563,8 @@ class Item
 			Contact::unmarkForArchival($contact);
 		}
 
-		$update = (!$arr['private'] && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"])));
+		/// @todo On private posts we could obfuscate the date
+		$update = ($arr['private'] != self::PRIVATE);
 
 		// Is it a forum? Then we don't care about the rules from above
 		if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) {
@@ -2569,11 +2574,18 @@ class Item
 		}
 
 		if ($update) {
-			DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
-				['id' => $arr['contact-id']]);
+			// The "self" contact id is used (for example in the connectors) when the contact is unknown
+			// So we have to ensure to only update the last item when it had been our own post,
+			// or it had been done by a "regular" contact.
+			if (!empty($arr['wall'])) {
+				$condition = ['id' => $arr['contact-id']];
+			} else { 
+				$condition = ['id' => $arr['contact-id'], 'self' => false];
+			}
+			DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], $condition);
 		}
 		// Now do the same for the system wide contacts with uid=0
-		if (!$arr['private']) {
+		if ($arr['private'] != self::PRIVATE) {
 			DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
 				['id' => $arr['owner-id']]);
 
@@ -2606,7 +2618,10 @@ class Item
 
 		// This sorting is important when there are hashtags that are part of other hashtags
 		// Otherwise there could be problems with hashtags like #test and #test2
-		rsort($tags);
+		// Because of this we are sorting from the longest to the shortest tag.
+		usort($tags, function($a, $b) {
+			return strlen($b) <=> strlen($a);
+		});
 
 		$URLSearchString = "^\[\]";
 
@@ -2718,7 +2733,7 @@ class Item
 		if (!$mention) {
 			if (($community_page || $prvgroup) &&
 				  !$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) {
-				Logger::notice('Delete private group/communiy top-level item without mention', ['id' => $item_id]);
+				Logger::info('Delete private group/communiy top-level item without mention', ['id' => $item_id, 'guid'=> $item['guid']]);
 				DBA::delete('item', ['id' => $item_id]);
 				return true;
 			}
@@ -2752,7 +2767,7 @@ class Item
 
 		// also reset all the privacy bits to the forum default permissions
 
-		$private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0;
+		$private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? self::PRIVATE : self::PUBLIC;
 
 		$psid = PermissionSet::getIdFromACL(
 			$user['uid'],
@@ -2799,7 +2814,7 @@ class Item
 			return false;
 		}
 
-		if (($contact['network'] != Protocol::FEED) && $datarray['private']) {
+		if (($contact['network'] != Protocol::FEED) && ($datarray['private'] == self::PRIVATE)) {
 			Logger::log('Not public', Logger::DEBUG);
 			return false;
 		}
@@ -2837,7 +2852,7 @@ class Item
 				$urlpart = parse_url($datarray2['author-link']);
 				$datarray["app"] = $urlpart["host"];
 			} else {
-				$datarray['private'] = 0;
+				$datarray['private'] = self::PUBLIC;
 			}
 		}
 
@@ -3101,7 +3116,7 @@ class Item
 				continue;
 			}
 
-			self::deleteById($item['id'], PRIORITY_LOW);
+			self::markForDeletionById($item['id'], PRIORITY_LOW);
 
 			++$expired;
 		}
@@ -3137,7 +3152,7 @@ class Item
 	 *            array $arr
 	 *            'post_id' => ID of posted item
 	 */
-	public static function performLike($item_id, $verb)
+	public static function performActivity($item_id, $verb)
 	{
 		if (!Session::isAuthenticated()) {
 			return false;
@@ -3164,6 +3179,10 @@ class Item
 			case 'unattendmaybe':
 				$activity = Activity::ATTENDMAYBE;
 				break;
+			case 'follow':
+			case 'unfollow':
+				$activity = Activity::FOLLOW;
+				break;
 			default:
 				Logger::log('like: unknown verb ' . $verb . ' for item ' . $item_id);
 				return false;
@@ -3242,7 +3261,7 @@ class Item
 
 		// If it exists, mark it as deleted
 		if (DBA::isResult($like_item)) {
-			self::deleteById($like_item['id']);
+			self::markForDeletionById($like_item['id']);
 
 			if (!$event_verb_flag || $like_item['verb'] == $activity) {
 				return true;
@@ -3381,7 +3400,7 @@ class Item
 		 *
 		 * default permissions - anonymous user
 		 */
-		$sql = " AND NOT `item`.`private`";
+		$sql = sprintf(" AND `item`.`private` != %d", self::PRIVATE);
 
 		// Profile owner - everything is visible
 		if ($local_user && ($local_user == $owner_id)) {
@@ -3397,12 +3416,12 @@ class Item
 			$set = PermissionSet::get($owner_id, $remote_user);
 
 			if (!empty($set)) {
-				$sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
+				$sql_set = sprintf(" OR (`item`.`private` = %d AND `item`.`wall` AND `item`.`psid` IN (", self::PRIVATE) . implode(',', $set) . "))";
 			} else {
 				$sql_set = '';
 			}
 
-			$sql = " AND (NOT `item`.`private`" . $sql_set . ")";
+			$sql = sprintf(" AND (`item`.`private` != %d", self::PRIVATE) . $sql_set . ")";
 		}
 
 		return $sql;
@@ -3504,7 +3523,7 @@ class Item
 					continue;
 				}
 
-				if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) {
+				if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) {
 					$img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
 					$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
 				}
@@ -3682,7 +3701,7 @@ class Item
 				$ret["title"] = DI::l10n()->t('link to source');
 			}
 
-		} elseif (!empty($item['plink']) && ($item['private'] != 1)) {
+		} elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
 			$ret = [
 				'href' => $item['plink'],
 				'orig' => $item['plink'],
@@ -3866,6 +3885,10 @@ class Item
 		// first try to fetch the item via the GUID. This will work for all reshares that had been created on this system
 		$shared_item = self::selectFirst(['title', 'body', 'attach'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]);
 		if (!DBA::isResult($shared_item)) {
+			if (empty($shared['link'])) {
+				return $item;
+			}
+
 			// Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts
 			$id = self::fetchByLink($shared['link'], $uid);
 			if (empty($id)) {