X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FPostUpdate.php;h=3e2627b9a9f5f585fd06af4fef7f9244d5f79172;hb=bb5e6d248b384192ab070108afbfb58acbee3fc3;hp=bb3b11160ba8dd1a4022c27e5b6cc1a36e5fdd15;hpb=1a4beaf061123cf74dc80230636efbf20bd13659;p=friendica.git diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php index bb3b11160b..3e2627b9a9 100644 --- a/src/Database/PostUpdate.php +++ b/src/Database/PostUpdate.php @@ -1,6 +1,6 @@ get("system", "post_update_version") >= 1194) { + if (DI::config()->get('system', 'post_update_version') >= 1297) { return true; } - Logger::log("Start", Logger::DEBUG); - - $end_id = DI::config()->get("system", "post_update_1194_end"); - if (!$end_id) { - $r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1"); - if ($r) { - DI::config()->set("system", "post_update_1194_end", $r[0]["id"]); - $end_id = DI::config()->get("system", "post_update_1194_end"); - } + if (!DBStructure::existsTable('item-delivery-data')) { + DI::config()->set('system', 'post_update_version', 1297); + return true; } - Logger::log("End ID: ".$end_id, Logger::DEBUG); - - $start_id = DI::config()->get("system", "post_update_1194_start"); + $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]); + $max_iid = $max_item_delivery_data['iid']; - $query1 = "SELECT `item`.`id` FROM `item` "; + Logger::info('Start update1297 with max iid: ' . $max_iid); - $query2 = "INNER JOIN `item` AS `shadow` ON `item`.`uri` = `shadow`.`uri` AND `shadow`.`uid` = 0 "; + $condition = ['`queue_count` = 0 AND `iid` < ?', $max_iid]; - $query3 = "WHERE `item`.`uid` != 0 AND `item`.`id` >= %d AND `item`.`id` <= %d - AND `item`.`visible` AND NOT `item`.`private` - AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND `item`.`network` IN ('%s', '%s', '%s', '') - AND NOT `item`.`global`"; + DBA::update('item-delivery-data', ['queue_count' => -1], $condition); - $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1", - intval($start_id), intval($end_id), - DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS)); - if (!$r) { - DI::config()->set("system", "post_update_version", 1194); - Logger::log("Update is done", Logger::DEBUG); - return true; - } else { - DI::config()->set("system", "post_update_1194_start", $r[0]["id"]); - $start_id = DI::config()->get("system", "post_update_1194_start"); + if (DBA::errorNo() != 0) { + Logger::error('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage()); + return false; } - Logger::log("Start ID: ".$start_id, Logger::DEBUG); + Logger::info('Processed rows: ' . DBA::affectedRows()); - $r = q($query1.$query2.$query3." ORDER BY `item`.`id` LIMIT 1000,1", - intval($start_id), intval($end_id), - DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS)); - if ($r) { - $pos_id = $r[0]["id"]; - } else { - $pos_id = $end_id; - } - Logger::log("Progress: Start: ".$start_id." position: ".$pos_id." end: ".$end_id, Logger::DEBUG); + DI::config()->set('system', 'post_update_version', 1297); - q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3, - intval($start_id), intval($pos_id), - DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS)); + Logger::info('Done'); - Logger::log("Done", Logger::DEBUG); + return true; } - /** - * update the "last-item" field in the "self" contact - * - * This field avoids cost intensive calls in the admin panel and in "nodeinfo" + * Remove contact duplicates * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function update1206() + private static function update1322() { // Was the script completed? - if (DI::config()->get("system", "post_update_version") >= 1206) { + if (DI::config()->get('system', 'post_update_version') >= 1322) { return true; } - Logger::log("Start", Logger::DEBUG); - $r = q("SELECT `contact`.`id`, `contact`.`last-item`, - (SELECT MAX(`changed`) FROM `item` USE INDEX (`uid_wall_changed`) WHERE `wall` AND `uid` = `user`.`uid`) AS `lastitem_date` - FROM `user` - INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`"); + Logger::info('Start'); - if (!DBA::isResult($r)) { - return false; - } - foreach ($r as $user) { - if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) { - DBA::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]); - } + $contacts = DBA::p("SELECT `nurl`, `uid` FROM `contact` + WHERE EXISTS (SELECT `nurl` FROM `contact` AS `c2` + WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` IN (?, ?, ?) AND NOT `deleted`) + AND (`network` IN (?, ?, ?) OR (`uid` = ?)) AND NOT `deleted` GROUP BY `nurl`, `uid`", + Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, + Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, 0); + + while ($contact = DBA::fetch($contacts)) { + Logger::info('Remove duplicates', ['nurl' => $contact['nurl'], 'uid' => $contact['uid']]); + Contact::removeDuplicates($contact['nurl'], $contact['uid']); } - DI::config()->set("system", "post_update_version", 1206); - Logger::log("Done", Logger::DEBUG); + DBA::close($contact); + DI::config()->set('system', 'post_update_version', 1322); + + Logger::info('Done'); + return true; } /** - * update the item related tables + * update user notification data * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException - * @throws \ImagickException */ - private static function update1279() + private static function update1329() { // Was the script completed? - if (DI::config()->get("system", "post_update_version") >= 1279) { + if (DI::config()->get('system', 'post_update_version') >= 1329) { return true; } - $id = DI::config()->get("system", "post_update_version_1279_id", 0); + if (!DBStructure::existsTable('item')) { + DI::config()->set('system', 'post_update_version', 1329); + return true; + } - Logger::log("Start from item " . $id, Logger::DEBUG); + $id = DI::config()->get('system', 'post_update_version_1329_id', 0); - $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', 'postopts', 'icid']); + Logger::info('Start', ['item' => $id]); $start_id = $id; $rows = 0; $condition = ["`id` > ?", $id]; $params = ['order' => ['id'], 'limit' => 10000]; - $items = Item::select($fields, $condition, $params); + $items = DBA::select('item', ['id', 'uri-id', 'uid'], $condition, $params); if (DBA::errorNo() != 0) { - Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage()); + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - while ($item = Item::fetch($items)) { + while ($item = DBA::fetch($items)) { $id = $item['id']; - if (empty($item['author-id'])) { - $default = ['url' => $item['author-link'], 'name' => $item['author-name'], - 'photo' => $item['author-avatar'], 'network' => $item['network']]; - - $item['author-id'] = Contact::getIdForURL($item["author-link"], 0, false, $default); - } - - 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::getIdFromACL( - $item['uid'], - $item['allow_cid'], - $item['allow_gid'], - $item['deny_cid'], - $item['deny_gid'] - ); - } - - $item['allow_cid'] = null; - $item['allow_gid'] = null; - $item['deny_cid'] = null; - $item['deny_gid'] = null; - - 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; - } - } - - self::createLanguage($item); - - if (!empty($item['icid']) && !empty($item['language'])) { - DBA::update('item-content', ['language' => $item['language']], ['id' => $item['icid']]); - } - unset($item['language']); - - Item::update($item, ['id' => $id]); + Post\UserNotification::setNotification($item['uri-id'], $item['uid']); ++$rows; } DBA::close($items); - DI::config()->set("system", "post_update_version_1279_id", $id); + DI::config()->set('system', 'post_update_version_1329_id', $id); - Logger::log("Processed rows: " . $rows . " - last processed item: " . $id, Logger::DEBUG); + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - // Set all deprecated fields to "null" if they contain an empty string - $nullfields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'postopts', 'inform', 'type', - 'bookmark', 'file', 'location', 'coord', 'tag', 'plink', 'title', 'content-warning', - 'body', 'app', 'verb', 'object-type', 'object', 'target-type', 'target', - 'author-name', 'author-link', 'author-avatar', 'owner-name', 'owner-link', 'owner-avatar', - 'rendered-hash', 'rendered-html']; - foreach ($nullfields as $field) { - $fields = [$field => null]; - $condition = [$field => '']; - Logger::log("Setting '" . $field . "' to null if empty.", Logger::DEBUG); - // Important: This has to be a "DBA::update", not a "Item::update" - DBA::update('item', $fields, $condition); - } - - DI::config()->set("system", "post_update_version", 1279); - Logger::log("Done", Logger::DEBUG); + DI::config()->set('system', 'post_update_version', 1329); + Logger::info('Done'); return true; } return false; } - private static function createLanguage(&$item) + /** + * Fill the "tag" table with tags and mentions from the body + * + * @return bool "true" when the job is done + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + */ + private static function update1341() { - if (empty($item['postopts'])) { - return; + // Was the script completed? + if (DI::config()->get('system', 'post_update_version') >= 1341) { + return true; } - $opts = explode(',', $item['postopts']); + if (!DBStructure::existsTable('item-content')) { + DI::config()->set('system', 'post_update_version', 1342); + return true; + } - $postopts = []; + $id = DI::config()->get('system', 'post_update_version_1341_id', 0); - foreach ($opts as $opt) { - if (strstr($opt, 'lang=')) { - $language = substr($opt, 5); - } else { - $postopts[] = $opt; - } - } + Logger::info('Start', ['item' => $id]); + + $rows = 0; + + $items = DBA::p("SELECT `uri-id`,`body` FROM `item-content` WHERE + (`body` LIKE ? OR `body` LIKE ? OR `body` LIKE ?) AND `uri-id` >= ? + ORDER BY `uri-id` LIMIT 100000", '%#%', '%@%', '%!%', $id); - if (empty($language)) { - return; + if (DBA::errorNo() != 0) { + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); + return false; } - if (!empty($postopts)) { - $item['postopts'] = implode(',', $postopts); - } else { - $item['postopts'] = null; + while ($item = DBA::fetch($items)) { + Tag::storeFromBody($item['uri-id'], $item['body'], '#!@', false); + $id = $item['uri-id']; + ++$rows; + if ($rows % 1000 == 0) { + DI::config()->set('system', 'post_update_version_1341_id', $id); + } } + DBA::close($items); - $lang_pairs = explode(':', $language); + DI::config()->set('system', 'post_update_version_1341_id', $id); - $lang_arr = []; + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); - foreach ($lang_pairs as $pair) { - $lang_pair_arr = explode(';', $pair); - if (count($lang_pair_arr) == 2) { - $lang_arr[$lang_pair_arr[0]] = $lang_pair_arr[1]; - } + // When there are less than 1,000 items processed this means that we reached the end + // The other entries will then be processed with the regular functionality + if ($rows < 1000) { + DI::config()->set('system', 'post_update_version', 1341); + Logger::info('Done'); + return true; } - $item['language'] = json_encode($lang_arr); + return false; } /** - * update item-uri data. Prerequisite for the next item structure update. + * Fill the "tag" table with tags and mentions from the "term" table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function update1281() + private static function update1342() { // Was the script completed? - if (DI::config()->get("system", "post_update_version") >= 1281) { + if (DI::config()->get('system', 'post_update_version') >= 1342) { return true; } - $id = DI::config()->get("system", "post_update_version_1281_id", 0); + if (!DBStructure::existsTable('term') || !DBStructure::existsTable('item-content')) { + DI::config()->set('system', 'post_update_version', 1342); + return true; + } - Logger::log("Start from item " . $id, Logger::DEBUG); + $id = DI::config()->get('system', 'post_update_version_1342_id', 0); - $fields = ['id', 'guid', 'uri', 'uri-id', 'parent-uri', 'parent-uri-id', 'thr-parent', 'thr-parent-id']; + Logger::info('Start', ['item' => $id]); - $start_id = $id; $rows = 0; - $condition = ["`id` > ?", $id]; - $params = ['order' => ['id'], 'limit' => 10000]; - $items = DBA::select('item', $fields, $condition, $params); + + $terms = DBA::p("SELECT `term`.`tid`, `item`.`uri-id`, `term`.`type`, `term`.`term`, `term`.`url`, `item-content`.`body` + FROM `term` + INNER JOIN `item` ON `item`.`id` = `term`.`oid` + INNER JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id` + WHERE term.type IN (?, ?, ?, ?) AND `tid` >= ? ORDER BY `tid` LIMIT 100000", + Tag::HASHTAG, Tag::MENTION, Tag::EXCLUSIVE_MENTION, Tag::IMPLICIT_MENTION, $id); if (DBA::errorNo() != 0) { - Logger::log('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage()); + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - while ($item = DBA::fetch($items)) { - $id = $item['id']; - - if (empty($item['uri'])) { - // Should not happen - continue; - } elseif (empty($item['uri-id'])) { - $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); - } - - if (empty($item['parent-uri'])) { - $item['parent-uri-id'] = $item['uri-id']; - } elseif (empty($item['parent-uri-id'])) { - $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']); - } + while ($term = DBA::fetch($terms)) { + if (($term['type'] == Tag::MENTION) && !empty($term['url']) && !strstr($term['body'], $term['url'])) { + $condition = ['nurl' => Strings::normaliseLink($term['url']), 'uid' => 0, 'deleted' => false]; + $contact = DBA::selectFirst('contact', ['url', 'alias'], $condition, ['order' => ['id']]); + if (!DBA::isResult($contact)) { + $ssl_url = str_replace('http://', 'https://', $term['url']); + $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $term['url'], Strings::normaliseLink($term['url']), $ssl_url, 0]; + $contact = DBA::selectFirst('contact', ['url', 'alias'], $condition, ['order' => ['id']]); + } - // Very old items don't have this field - if (empty($item['thr-parent'])) { - $item['thr-parent-id'] = $item['parent-uri-id']; - } elseif (empty($item['thr-parent-id'])) { - $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']); + if (DBA::isResult($contact) && (!strstr($term['body'], $contact['url']) && (empty($contact['alias']) || !strstr($term['body'], $contact['alias'])))) { + $term['type'] = Tag::IMPLICIT_MENTION; + } } - unset($item['id']); - unset($item['guid']); - unset($item['uri']); - unset($item['parent-uri']); - unset($item['thr-parent']); - - DBA::update('item', $item, ['id' => $id]); + Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url'], false); + $id = $term['tid']; ++$rows; + if ($rows % 1000 == 0) { + DI::config()->set('system', 'post_update_version_1342_id', $id); + } } - DBA::close($items); - - DI::config()->set("system", "post_update_version_1281_id", $id); - - Logger::log("Processed rows: " . $rows . " - last processed item: " . $id, Logger::DEBUG); + DBA::close($terms); - if ($start_id == $id) { - Logger::log("Updating item-uri in item-activity", Logger::DEBUG); - DBA::e("UPDATE `item-activity` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-activity`.`uri` SET `item-activity`.`uri-id` = `item-uri`.`id` WHERE `item-activity`.`uri-id` IS NULL"); + DI::config()->set('system', 'post_update_version_1342_id', $id); - Logger::log("Updating item-uri in item-content", Logger::DEBUG); - DBA::e("UPDATE `item-content` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-content`.`uri` SET `item-content`.`uri-id` = `item-uri`.`id` WHERE `item-content`.`uri-id` IS NULL"); + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); - DI::config()->set("system", "post_update_version", 1281); - Logger::log("Done", Logger::DEBUG); + // When there are less than 1,000 items processed this means that we reached the end + // The other entries will then be processed with the regular functionality + if ($rows < 1000) { + DI::config()->set('system', 'post_update_version', 1342); + Logger::info('Done'); return true; } @@ -426,97 +359,185 @@ class PostUpdate } /** - * Set the delivery queue count to a negative value for all items preceding the feature. + * Fill the "post-delivery-data" table with data from the "item-delivery-data" table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function update1297() + private static function update1345() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1297) { + if (DI::config()->get('system', 'post_update_version') >= 1345) { return true; } - $max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]); - $max_iid = $max_item_delivery_data['iid']; + if (!DBStructure::existsTable('item-delivery-data')) { + DI::config()->set('system', 'post_update_version', 1345); + return true; + } - Logger::info('Start update1297 with max iid: ' . $max_iid); + $id = DI::config()->get('system', 'post_update_version_1345_id', 0); - $condition = ['`queue_count` = 0 AND `iid` < ?', $max_iid]; + Logger::info('Start', ['item' => $id]); - DBA::update('item-delivery-data', ['queue_count' => -1], $condition); + $rows = 0; + + $deliveries = DBA::p("SELECT `uri-id`, `iid`, `item-delivery-data`.`postopts`, `item-delivery-data`.`inform`, + `queue_count`, `queue_done`, `activitypub`, `dfrn`, `diaspora`, `ostatus`, `legacy_dfrn`, `queue_failed` + FROM `item-delivery-data` + INNER JOIN `item` ON `item`.`id` = `item-delivery-data`.`iid` + WHERE `iid` >= ? ORDER BY `iid` LIMIT 10000", $id); if (DBA::errorNo() != 0) { - Logger::error('Database error ' . DBA::errorNo() . ':' . DBA::errorMessage()); + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - Logger::info('Processed rows: ' . DBA::affectedRows()); + while ($delivery = DBA::fetch($deliveries)) { + $id = $delivery['iid']; + unset($delivery['iid']); + DBA::insert('post-delivery-data', $delivery, Database::INSERT_UPDATE); + ++$rows; + } + DBA::close($deliveries); - DI::config()->set('system', 'post_update_version', 1297); + DI::config()->set('system', 'post_update_version_1345_id', $id); - Logger::info('Done'); + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); - return true; + // When there are less than 100 items processed this means that we reached the end + // The other entries will then be processed with the regular functionality + if ($rows < 100) { + DI::config()->set('system', 'post_update_version', 1345); + Logger::info('Done'); + return true; + } + + return false; } + /** - * Remove contact duplicates + * Generates the legacy item.file field string from an item ID. + * Includes only file and category terms. + * + * @param int $item_id + * @return string + * @throws \Exception + */ + private static function fileTextFromItemId($item_id) + { + $file_text = ''; + + $condition = ['otype' => self::OBJECT_TYPE_POST, 'oid' => $item_id, 'type' => [Category::FILE, Category::CATEGORY]]; + $tags = DBA::selectToArray('term', ['type', 'term', 'url'], $condition); + foreach ($tags as $tag) { + if ($tag['type'] == Category::CATEGORY) { + $file_text .= '<' . $tag['term'] . '>'; + } else { + $file_text .= '[' . $tag['term'] . ']'; + } + } + + return $file_text; + } + + /** + * Fill the "tag" table with tags and mentions from the "term" table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private static function update1322() + private static function update1346() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1322) { + if (DI::config()->get('system', 'post_update_version') >= 1346) { return true; } - Logger::info('Start'); + if (!DBStructure::existsTable('term')) { + DI::config()->set('system', 'post_update_version', 1346); + return true; + } - $contacts = DBA::p("SELECT `nurl`, `uid` FROM `contact` - WHERE EXISTS (SELECT `nurl` FROM `contact` AS `c2` - WHERE `c2`.`nurl` = `contact`.`nurl` AND `c2`.`id` != `contact`.`id` AND `c2`.`uid` = `contact`.`uid` AND `c2`.`network` IN (?, ?, ?) AND NOT `deleted`) - AND (`network` IN (?, ?, ?) OR (`uid` = ?)) AND NOT `deleted` GROUP BY `nurl`, `uid`", - Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, - Protocol::DIASPORA, Protocol::OSTATUS, Protocol::ACTIVITYPUB, 0); + $id = DI::config()->get('system', 'post_update_version_1346_id', 0); - while ($contact = DBA::fetch($contacts)) { - Logger::info('Remove duplicates', ['nurl' => $contact['nurl'], 'uid' => $contact['uid']]); - Contact::removeDuplicates($contact['nurl'], $contact['uid']); + Logger::info('Start', ['item' => $id]); + + $rows = 0; + + $terms = DBA::select('term', ['oid'], + ["`type` IN (?, ?) AND `oid` >= ?", Category::CATEGORY, Category::FILE, $id], + ['order' => ['oid'], 'limit' => 1000, 'group_by' => ['oid']]); + + if (DBA::errorNo() != 0) { + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); + return false; } - DBA::close($contact); - DI::config()->set('system', 'post_update_version', 1322); + while ($term = DBA::fetch($terms)) { + $item = Post::selectFirst(['uri-id', 'uid'], ['id' => $term['oid']]); + if (!DBA::isResult($item)) { + continue; + } - Logger::info('Done'); + $file = self::fileTextFromItemId($term['oid']); + if (!empty($file)) { + Category::storeTextByURIId($item['uri-id'], $item['uid'], $file); + } - return true; + $id = $term['oid']; + ++$rows; + if ($rows % 100 == 0) { + DI::config()->set('system', 'post_update_version_1346_id', $id); + } + } + DBA::close($terms); + + DI::config()->set('system', 'post_update_version_1346_id', $id); + + Logger::info('Processed', ['rows' => $rows, 'last' => $id]); + + // When there are less than 10 items processed this means that we reached the end + // The other entries will then be processed with the regular functionality + if ($rows < 10) { + DI::config()->set('system', 'post_update_version', 1346); + Logger::info('Done'); + return true; + } + + return false; } /** - * update user-item data with notifications + * update the "vid" (verb) field in the item table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - private static function update1329() + private static function update1347() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1329) { + if (DI::config()->get("system", "post_update_version") >= 1347) { return true; } - $id = DI::config()->get('system', 'post_update_version_1329_id', 0); + if (!DBStructure::existsTable('item-activity') || !DBStructure::existsTable('item')) { + DI::config()->set('system', 'post_update_version', 1347); + return true; + } + + $id = DI::config()->get("system", "post_update_version_1347_id", 0); Logger::info('Start', ['item' => $id]); $start_id = $id; $rows = 0; - $condition = ["`id` > ?", $id]; - $params = ['order' => ['id'], 'limit' => 10000]; - $items = DBA::select('item', ['id'], $condition, $params); + + $items = DBA::p("SELECT `item`.`id`, `item`.`verb` AS `item-verb`, `item-content`.`verb`, `item-activity`.`activity` + FROM `item` LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id` + LEFT JOIN `item-activity` ON `item-activity`.`uri-id` = `item`.`uri-id` AND `item`.`gravity` = ? + WHERE `item`.`id` >= ? AND `item`.`vid` IS NULL ORDER BY `item`.`id` LIMIT 10000", GRAVITY_ACTIVITY, $id); if (DBA::errorNo() != 0) { Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); @@ -525,19 +546,28 @@ class PostUpdate while ($item = DBA::fetch($items)) { $id = $item['id']; + $verb = $item['item-verb']; + if (empty($verb)) { + $verb = $item['verb']; + } + if (empty($verb) && is_int($item['activity'])) { + $verb = Item::ACTIVITIES[$item['activity']]; + } + if (empty($verb)) { + continue; + } - UserItem::setNotification($item['id']); - + DBA::update('item', ['vid' => Verb::getID($verb)], ['id' => $item['id']]); ++$rows; } DBA::close($items); - DI::config()->set('system', 'post_update_version_1329_id', $id); + DI::config()->set("system", "post_update_version_1347_id", $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); if ($start_id == $id) { - DI::config()->set('system', 'post_update_version', 1329); + DI::config()->set("system", "post_update_version", 1347); Logger::info('Done'); return true; } @@ -546,51 +576,51 @@ class PostUpdate } /** - * Fill the "tag" table with tags and mentions from the body + * update the "gsid" (global server id) field in the contact table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - private static function update1341() + private static function update1348() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1341) { + if (DI::config()->get("system", "post_update_version") >= 1348) { return true; } - $id = DI::config()->get('system', 'post_update_version_1341_id', 0); + $id = DI::config()->get("system", "post_update_version_1348_id", 0); - Logger::info('Start', ['item' => $id]); + Logger::info('Start', ['contact' => $id]); + $start_id = $id; $rows = 0; - - $items = DBA::p("SELECT `uri-id`,`body` FROM `item-content` WHERE - (`body` LIKE ? OR `body` LIKE ? OR `body` LIKE ?) AND `uri-id` >= ? - ORDER BY `uri-id` LIMIT 100000", '%#%', '%@%', '%!%', $id); + $condition = ["`id` > ? AND `gsid` IS NULL AND `baseurl` != '' AND NOT `baseurl` IS NULL", $id]; + $params = ['order' => ['id'], 'limit' => 10000]; + $contacts = DBA::select('contact', ['id', 'baseurl'], $condition, $params); if (DBA::errorNo() != 0) { Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - while ($item = DBA::fetch($items)) { - Tag::storeFromBody($item['uri-id'], $item['body'], '#!@', false); - $id = $item['uri-id']; + while ($contact = DBA::fetch($contacts)) { + $id = $contact['id']; + + DBA::update('contact', + ['gsid' => GServer::getID($contact['baseurl'], true), 'baseurl' => GServer::cleanURL($contact['baseurl'])], + ['id' => $contact['id']]); + ++$rows; - if ($rows % 1000 == 0) { - DI::config()->set('system', 'post_update_version_1341_id', $id); - } } - DBA::close($items); + DBA::close($contacts); - DI::config()->set('system', 'post_update_version_1341_id', $id); + DI::config()->set("system", "post_update_version_1348_id", $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); - // When there are less than 1,000 items processed this means that we reached the end - // The other entries will then be processed with the regular functionality - if ($rows < 1000) { - DI::config()->set('system', 'post_update_version', 1341); + if ($start_id == $id) { + DI::config()->set("system", "post_update_version", 1348); Logger::info('Done'); return true; } @@ -599,69 +629,51 @@ class PostUpdate } /** - * Fill the "tag" table with tags and mentions from the "term" table + * update the "gsid" (global server id) field in the apcontact table * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - private static function update1342() + private static function update1349() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1342) { + if (DI::config()->get("system", "post_update_version") >= 1349) { return true; } - $id = DI::config()->get('system', 'post_update_version_1342_id', 0); + $id = DI::config()->get("system", "post_update_version_1349_id", ''); - Logger::info('Start', ['item' => $id]); + Logger::info('Start', ['apcontact' => $id]); + $start_id = $id; $rows = 0; - - $terms = DBA::p("SELECT `term`.`tid`, `item`.`uri-id`, `term`.`type`, `term`.`term`, `term`.`url`, `item-content`.`body` - FROM `term` - INNER JOIN `item` ON `item`.`id` = `term`.`oid` - INNER JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id` - WHERE term.type IN (?, ?, ?, ?) AND `tid` >= ? ORDER BY `tid` LIMIT 100000", - Tag::HASHTAG, Tag::MENTION, Tag::EXCLUSIVE_MENTION, Tag::IMPLICIT_MENTION, $id); + $condition = ["`url` > ? AND `gsid` IS NULL AND `baseurl` != '' AND NOT `baseurl` IS NULL", $id]; + $params = ['order' => ['url'], 'limit' => 10000]; + $apcontacts = DBA::select('apcontact', ['url', 'baseurl'], $condition, $params); if (DBA::errorNo() != 0) { Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - while ($term = DBA::fetch($terms)) { - if (($term['type'] == Tag::MENTION) && !empty($term['url']) && !strstr($term['body'], $term['url'])) { - $condition = ['nurl' => Strings::normaliseLink($term['url']), 'uid' => 0, 'deleted' => false]; - $contact = DBA::selectFirst('contact', ['url', 'alias'], $condition, ['order' => ['id']]); - if (!DBA::isResult($contact)) { - $ssl_url = str_replace('http://', 'https://', $term['url']); - $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $term['url'], Strings::normaliseLink($term['url']), $ssl_url, 0]; - $contact = DBA::selectFirst('contact', ['url', 'alias'], $condition, ['order' => ['id']]); - } - - if (DBA::isResult($contact) && (!strstr($term['body'], $contact['url']) && (empty($contact['alias']) || !strstr($term['body'], $contact['alias'])))) { - $term['type'] = Tag::IMPLICIT_MENTION; - } - } + while ($apcontact = DBA::fetch($apcontacts)) { + $id = $apcontact['url']; - Tag::store($term['uri-id'], $term['type'], $term['term'], $term['url'], false); + DBA::update('apcontact', + ['gsid' => GServer::getID($apcontact['baseurl'], true), 'baseurl' => GServer::cleanURL($apcontact['baseurl'])], + ['url' => $apcontact['url']]); - $id = $term['tid']; ++$rows; - if ($rows % 1000 == 0) { - DI::config()->set('system', 'post_update_version_1342_id', $id); - } } - DBA::close($terms); + DBA::close($apcontacts); - DI::config()->set('system', 'post_update_version_1342_id', $id); + DI::config()->set("system", "post_update_version_1349_id", $id); Logger::info('Processed', ['rows' => $rows, 'last' => $id]); - // When there are less than 1,000 items processed this means that we reached the end - // The other entries will then be processed with the regular functionality - if ($rows < 1000) { - DI::config()->set('system', 'post_update_version', 1342); + if ($start_id == $id) { + DI::config()->set("system", "post_update_version", 1349); Logger::info('Done'); return true; } @@ -670,51 +682,134 @@ class PostUpdate } /** - * Fill the "post-delivery-data" table with data from the "item-delivery-data" table + * Remove orphaned photo entries * * @return bool "true" when the job is done * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ - private static function update1345() + private static function update1383() { // Was the script completed? - if (DI::config()->get('system', 'post_update_version') >= 1345) { + if (DI::config()->get("system", "post_update_version") >= 1383) { return true; } - $id = DI::config()->get('system', 'post_update_version_1345_id', 0); + Logger::info('Start'); - Logger::info('Start', ['item' => $id]); + $deleted = 0; + $avatar = [4 => 'photo', 5 => 'thumb', 6 => 'micro']; - $rows = 0; + $photos = DBA::select('photo', ['id', 'contact-id', 'resource-id', 'scale'], ["`contact-id` != ? AND `album` = ?", 0, Photo::CONTACT_PHOTOS]); + while ($photo = DBA::fetch($photos)) { + $delete = !in_array($photo['scale'], [4, 5, 6]); - $deliveries = DBA::p("SELECT `uri-id`, `iid`, `item-delivery-data`.`postopts`, `item-delivery-data`.`inform`, - `queue_count`, `queue_done`, `activitypub`, `dfrn`, `diaspora`, `ostatus`, `legacy_dfrn`, `queue_failed` - FROM `item-delivery-data` - INNER JOIN `item` ON `item`.`id` = `item-delivery-data`.`iid` - WHERE `iid` >= ? ORDER BY `iid` LIMIT 10000", $id); + if (!$delete) { + // Check if there is a contact entry with that photo + $delete = !DBA::exists('contact', ["`id` = ? AND `" . $avatar[$photo['scale']] . "` LIKE ?", + $photo['contact-id'], '%' . $photo['resource-id'] . '%']); + } + + if ($delete) { + Photo::delete(['id' => $photo['id']]); + $deleted++; + } + } + DBA::close($photos); + + DI::config()->set("system", "post_update_version", 1383); + Logger::info('Done', ['deleted' => $deleted]); + return true; + } + + /** + * update the "hash" field in the photo table + * + * @return bool "true" when the job is done + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function update1384() + { + // Was the script completed? + if (DI::config()->get("system", "post_update_version") >= 1384) { + return true; + } + + $condition = ["`hash` IS NULL"]; + Logger::info('Start', ['rest' => DBA::count('photo', $condition)]); + + $rows = 0; + $photos = DBA::select('photo', [], $condition, ['limit' => 10000]); if (DBA::errorNo() != 0) { Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); return false; } - while ($delivery = DBA::fetch($deliveries)) { - $id = $delivery['iid']; - unset($delivery['iid']); - DBA::insert('post-delivery-data', $delivery); + while ($photo = DBA::fetch($photos)) { + $img = Photo::getImageForPhoto($photo); + if (!empty($img)) { + $md5 = md5($img->asString()); + } else { + $md5 = ''; + } + DBA::update('photo', ['hash' => $md5], ['id' => $photo['id']]); ++$rows; } - DBA::close($deliveries); + DBA::close($photos); - DI::config()->set('system', 'post_update_version_1345_id', $id); + Logger::info('Processed', ['rows' => $rows]); - Logger::info('Processed', ['rows' => $rows, 'last' => $id]); + if ($rows <= 100) { + DI::config()->set("system", "post_update_version", 1384); + Logger::info('Done'); + return true; + } - // When there are less than 100 items processed this means that we reached the end - // The other entries will then be processed with the regular functionality - if ($rows < 100) { - DI::config()->set('system', 'post_update_version', 1345); + return false; + } + + /** + * update the "hash" field in the photo table + * + * @return bool "true" when the job is done + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + */ + private static function update1400() + { + // Was the script completed? + if (DI::config()->get("system", "post_update_version") >= 1400) { + return true; + } + + if (!DBStructure::existsTable('item')) { + DI::config()->set("system", "post_update_version", 1400); + return true; + } + + $condition = ["`extid` != ? AND EXISTS(SELECT `id` FROM `post-user` WHERE `uri-id` = `item`.`uri-id` AND `uid` = `item`.`uid` AND `external-id` IS NULL)", '']; + Logger::info('Start', ['rest' => DBA::count('item', $condition)]); + + $rows = 0; + $items = DBA::select('item', ['uri-id', 'uid', 'extid'], $condition, ['order' => ['id'], 'limit' => 10000]); + + if (DBA::errorNo() != 0) { + Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]); + return false; + } + + while ($item = DBA::fetch($items)) { + Post::update(['external-id' => ItemURI::getIdByURI($item['extid'])], ['uri-id' => $item['uri-id'], 'uid' => $item['uid']]); + ++$rows; + } + DBA::close($items); + + Logger::info('Processed', ['rows' => $rows]); + + if ($rows <= 100) { + DI::config()->set("system", "post_update_version", 1400); Logger::info('Done'); return true; }