X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FPostUpdate.php;h=5593d932a3b3cf75d4624efa838fc75a3eaae493;hb=ec49d004e32d873dfb67e93e733c27602255d8ee;hp=88bec31b74f42d5e4fbe0e0c75b31193b4e17a20;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 88bec31b74..5593d932a3 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -8,6 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\PermissionSet;
 use dba;
 
 require_once 'include/dba.php';
@@ -31,10 +32,7 @@ class PostUpdate
 		if (!self::update1206()) {
 			return;
 		}
-		if (!self::update1274()) {
-			return;
-		}
-		if (!self::update1275()) {
+		if (!self::update1279()) {
 			return;
 		}
 	}
@@ -226,95 +224,78 @@ class PostUpdate
 	}
 
 	/**
-	 * @brief update the "item-content" table
+	 * @brief update the item related tables
 	 *
 	 * @return bool "true" when the job is done
 	 */
-	private static function update1274()
+	private static function update1279()
 	{
 		// Was the script completed?
-		if (Config::get("system", "post_update_version") >= 1274) {
+		if (Config::get("system", "post_update_version") >= 1279) {
 			return true;
 		}
 
-		logger("Start", LOGGER_DEBUG);
+		$id = Config::get("system", "post_update_version_1279_id", 0);
 
-		$fields = ['id', 'title', 'content-warning', 'body', 'location', 'tag', 'file',
-			'coord', 'app', 'rendered-hash', 'rendered-html', 'verb',
-			'object-type', 'object', 'target-type', 'target', 'plink',
-			'author-id', 'owner-id'];
+		logger("Start from item " . $id, LOGGER_DEBUG);
 
-		$condition = ["`icid` IS NULL"];
-		$params = ['limit' => 10000];
+		$fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
+			'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
+			'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid', 'post-type', 'bookmark', 'type',
+			'inform']);
+
+		$start_id = $id;
+		$rows = 0;
+		$condition = ["`id` > ?", $id];
+		$params = ['order' => ['id'], 'limit' => 10000];
 		$items = Item::select($fields, $condition, $params);
+		while ($item = Item::fetch($items)) {
+			$id = $item['id'];
 
-		if (!DBM::is_result($items)) {
-			Config::set("system", "post_update_version", 1274);
-			logger("Done", LOGGER_DEBUG);
-			return true;
-		}
+			if (empty($item['author-id'])) {
+				$default = ['url' => $item['author-link'], 'name' => $item['author-name'],
+					'photo' => $item['author-avatar'], 'network' => $item['network']];
 
-		$rows = 0;
+				$item['author-id'] = Contact::getIdForURL($item["author-link"], 0, false, $default);
+			}
 
-		while ($item = Item::fetch($items)) {
-			// Clearing the author and owner data if there is an id.
-			if ($item['author-id'] > 0) {
-				$item['author-name'] = '';
-				$item['author-link'] = '';
-				$item['author-avatar'] = '';
+			if (empty($item['owner-id'])) {
+				$default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
+					'photo' => $item['owner-avatar'], 'network' => $item['network']];
+
+				$item['owner-id'] = Contact::getIdForURL($item["owner-link"], 0, false, $default);
+			}
+
+			if (empty($item['psid'])) {
+				$item['psid'] = PermissionSet::fetchIDForPost($item);
 			}
 
-			if ($item['owner-id'] > 0) {
-				$item['owner-name'] = '';
-				$item['owner-link'] = '';
-				$item['owner-avatar'] = '';
+			if ($item['post-type'] == 0) {
+				if (!empty($item['type']) && ($item['type'] == 'note')) {
+					$item['post-type'] = Item::PT_PERSONAL_NOTE;
+				} elseif (!empty($item['type']) && ($item['type'] == 'photo')) {
+					$item['post-type'] = Item::PT_IMAGE;
+				} elseif (!empty($item['bookmark']) && $item['bookmark']) {
+					$item['post-type'] = Item::PT_PAGE;
+				}
 			}
 
-			Item::update($item, ['id' => $item['id']]);
+			Item::update($item, ['id' => $id]);
+
 			++$rows;
 		}
 		dba::close($items);
 
-		logger("Processed rows: " . $rows, LOGGER_DEBUG);
-		return true;
-	}
-	/**
-	 * @brief update the "item-activity" table
-	 *
-	 * @return bool "true" when the job is done
-	 */
-	private static function update1275()
-	{
-		// Was the script completed?
-		if (Config::get("system", "post_update_version") >= 1275) {
-			return true;
-		}
-
-		logger("Start", LOGGER_DEBUG);
-
-		$fields = ['id', 'verb'];
-
-		$condition = ["`iaid` IS NULL AND NOT `icid` IS NULL AND `verb` IN (?, ?, ?, ?, ?)",
-			ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+		Config::set("system", "post_update_version_1279_id", $id);
 
-		$params = ['limit' => 10000];
-		$items = Item::select($fields, $condition, $params);
+		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
 
-		if (!DBM::is_result($items)) {
-			Config::set("system", "post_update_version", 1275);
+		if ($start_id == $id) {
+			Config::set("system", "post_update_version", 1279);
 			logger("Done", LOGGER_DEBUG);
 			return true;
 		}
 
-		$rows = 0;
-
-		while ($item = Item::fetch($items)) {
-			Item::update($item, ['id' => $item['id']]);
-			++$rows;
-		}
-		dba::close($items);
-
-		logger("Processed rows: " . $rows, LOGGER_DEBUG);
-		return true;
+		return false;
 	}
 }