X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=d24340d76494657e1c47bab33ac68a31d26c59b2;hb=57cd063da10b827f2457c27e6cf53255b4561c8e;hp=0cf9368b5930ef7ff3c5b1c52ff3a9206e85e526;hpb=6f22e3909be052fee65d4ac93a5278a41e201de9;p=friendica.git

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0cf9368b59..d24340d764 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -177,7 +177,7 @@ class Item
 		}
 
 		$pinned = [];
-		while ($useritem = self::fetch($useritems)) {
+		while ($useritem = DBA::fetch($useritems)) {
 			$pinned[] = $useritem['iid'];
 		}
 		DBA::close($useritems);
@@ -342,10 +342,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'];
 		}
@@ -356,7 +352,6 @@ class Item
 		unset($row['internal-iid']);
 		unset($row['internal-psid']);
 		unset($row['internal-iaid']);
-		unset($row['internal-icid']);
 		unset($row['internal-user-ignored']);
 		unset($row['interaction']);
 
@@ -673,15 +668,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', 'psid' => 'internal-psid'];
+			'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid'];
 
 		if ($usermode) {
 			$fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored'];
@@ -716,9 +711,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;
 	}
@@ -803,10 +796,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`";
 		}
@@ -846,14 +835,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-psid';			
-			$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)) {
@@ -864,10 +849,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 = [];
@@ -1963,7 +1944,7 @@ class Item
 			// There are duplicates. We delete our just created entry.
 			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;
@@ -2006,10 +1987,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]);
 			}
 		}