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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index a9a6eede23..97c96f6748 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -94,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',
@@ -342,10 +343,6 @@ class Item
 			}
 		}
 
-		if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) {
-			$row['signed_text'] = $row['interaction'];
-		}
-
 		if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
 			$row['ignored'] = $row['internal-user-ignored'];
 		}
@@ -672,7 +669,8 @@ 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',
@@ -714,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;
 	}
@@ -801,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`";
 		}
@@ -858,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 = [];
@@ -1261,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;
@@ -2000,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]);
 			}
 		}
 
@@ -2579,7 +2563,8 @@ class Item
 			Contact::unmarkForArchival($contact);
 		}
 
-		$update = (($arr['private'] != self::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"])) {
@@ -2589,8 +2574,15 @@ 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'] != self::PRIVATE) {
@@ -2626,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 = "^\[\]";