X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FItem.php;h=7eb36d85e025f2aaae996af6db3a6d676cb08f96;hb=3945de5e3b293bed0c2dcfab29cf85568407a6d4;hp=d040c876de6df1ab4a1ee614102173943bfbc66a;hpb=4eecf733e156eca7ea7cc4458b2daa8adda96209;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index d040c876de..7eb36d85e0 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -42,7 +42,9 @@ use Friendica\Util\Map; use Friendica\Util\Network; use Friendica\Util\Proxy; use Friendica\Util\Strings; +use Friendica\Util\Temporal; use Friendica\Worker\Delivery; +use GuzzleHttp\Psr7\Uri; use LanguageDetection\Language; class Item @@ -73,6 +75,12 @@ class Item const PR_GLOBAL = 73; const PR_RELAY = 74; const PR_FETCHED = 75; + const PR_COMPLETION = 76; + const PR_DIRECT = 77; + const PR_ACTIVITY = 78; + const PR_DISTRIBUTE = 79; + const PR_PUSHED = 80; + const PR_LOCAL = 81; // system.accept_only_sharer setting values const COMPLETION_NONE = 1; @@ -82,25 +90,27 @@ class Item // Field list that is used to display the items const DISPLAY_FIELDLIST = [ 'uid', 'id', 'parent', 'guid', 'network', 'gravity', - 'uri-id', 'uri', 'thr-parent-id', 'thr-parent', 'parent-uri-id', 'parent-uri', + 'uri-id', 'uri', 'thr-parent-id', 'thr-parent', 'parent-uri-id', 'parent-uri', 'conversation', 'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink', 'wall', 'private', 'starred', 'origin', 'parent-origin', 'title', 'body', 'language', 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'mention', 'global', - 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network', - 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', + 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network', 'author-updated', 'author-gsid', 'author-addr', 'author-uri-id', + 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network', 'owner-contact-type', 'owner-updated', 'causer-id', 'causer-link', 'causer-name', 'causer-avatar', 'causer-contact-type', 'causer-network', 'contact-id', 'contact-uid', 'contact-link', 'contact-name', 'contact-avatar', 'writable', 'self', 'cid', 'alias', 'event-created', 'event-edited', 'event-start', 'event-finish', 'event-summary', 'event-desc', 'event-location', 'event-type', 'event-nofinish', 'event-ignore', 'event-id', + 'question-id', 'question-multiple', 'question-voters', 'question-end-time', + 'has-categories', 'has-media', 'delivery_queue_count', 'delivery_queue_done', 'delivery_queue_failed' ]; // Field list that is used to deliver items via the protocols const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', - 'parent-guid', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target', + 'parent-guid', 'conversation', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target', 'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app', 'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', @@ -113,7 +123,7 @@ class Item // All fields in the item table const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', - 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'vid', + 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'conversation', 'vid', 'contact-id', 'wall', 'gravity', 'extid', 'psid', 'created', 'edited', 'commented', 'received', 'changed', 'verb', 'postopts', 'plink', 'resource-id', 'event-id', 'inform', @@ -223,7 +233,7 @@ class Item foreach ($notify_items as $notify_item) { $post = Post::selectFirst(['uri-id', 'uid'], ['id' => $notify_item]); - Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$post['uri-id'], (int)$post['uid']); + Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::POST, (int)$post['uri-id'], (int)$post['uid']); } return $rows; @@ -234,9 +244,10 @@ class Item * * @param array $condition The condition for finding the item entries * @param integer $priority Priority for the notification + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function markForDeletion($condition, $priority = PRIORITY_HIGH) + public static function markForDeletion(array $condition, int $priority = PRIORITY_HIGH) { $items = Post::select(['id'], $condition); while ($item = Post::fetch($items)) { @@ -250,9 +261,10 @@ class Item * * @param array $condition The condition for finding the item entries * @param integer $uid User who wants to delete this item + * @return void * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function deleteForUser($condition, $uid) + public static function deleteForUser(array $condition, int $uid) { if ($uid == 0) { return; @@ -279,11 +291,10 @@ class Item * * @param integer $item_id * @param integer $priority Priority for the notification - * * @return boolean success * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH) + public static function markForDeletionById(int $item_id, int $priority = PRIORITY_HIGH): bool { Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]); // locate item to be deleted @@ -328,7 +339,7 @@ class Item // If item has attachments, drop them $attachments = Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT]); foreach($attachments as $attachment) { - if (preg_match("|attach/(\d+)|", $attachment['url'], $matches)) { + if (preg_match('|attach/(\d+)|', $attachment['url'], $matches)) { Attach::delete(['id' => $matches[1], 'uid' => $item['uid']]); } } @@ -357,7 +368,7 @@ class Item // send the notification upstream/downstream if ($priority) { - Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, (int)$item['uri-id'], (int)$item['uid']); + Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', Delivery::DELETION, (int)$item['uri-id'], (int)$item['uid']); } } elseif ($item['uid'] != 0) { Post\User::update($item['uri-id'], $item['uid'], ['hidden' => true]); @@ -369,7 +380,14 @@ class Item return true; } - public static function guid($item, $notify) + /** + * Get guid from given item record + * + * @param array $item Item record + * @param bool Whether to notify (?) + * @return string Guid + */ + public static function guid(array $item, bool $notify): string { if (!empty($item['guid'])) { return trim($item['guid']); @@ -422,7 +440,13 @@ class Item return $guid; } - private static function contactId($item) + /** + * Returns contact id from given item record + * + * @param array $item Item record + * @return int Contact id + */ + private static function contactId(array $item): int { if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) { return $item['contact-id']; @@ -448,17 +472,17 @@ class Item * @param array $item The item fields that are to be inserted * @throws \Exception */ - private static function spool($orig_item) + private static function spool(array $item) { // Now we store the data in the spool directory // We use "microtime" to keep the arrival order and "mt_rand" to avoid duplicates $file = 'item-' . round(microtime(true) * 10000) . '-' . mt_rand() . '.msg'; $spoolpath = System::getSpoolPath(); - if ($spoolpath != "") { + if ($spoolpath != '') { $spool = $spoolpath . '/' . $file; - file_put_contents($spool, json_encode($orig_item)); + file_put_contents($spool, json_encode($item)); Logger::warning("Item wasn't stored - Item was spooled into file", ['file' => $file]); } } @@ -466,10 +490,10 @@ class Item /** * Check if the item array is a duplicate * - * @param array $item + * @param array $item Item record * @return boolean is it a duplicate? */ - private static function isDuplicate(array $item) + private static function isDuplicate(array $item): bool { // Checking if there is already an item with the same guid $condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']]; @@ -518,10 +542,10 @@ class Item /** * Check if the item array is valid * - * @param array $item + * @param array $item Item record * @return boolean item is valid */ - public static function isValid(array $item) + public static function isValid(array $item): bool { // When there is no content then we don't post it if (($item['body'] . $item['title'] == '') && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) { @@ -588,10 +612,10 @@ class Item /** * Check if the item array is too old * - * @param array $item + * @param array $item Item record * @return boolean item is too old */ - public static function isTooOld(array $item) + public static function isTooOld(array $item): bool { // check for create date and expire time $expire_interval = DI::config()->get('system', 'dbclean-expire-days', 0); @@ -620,15 +644,20 @@ class Item /** * Return the id of the given item array if it has been stored before * - * @param array $item - * @return integer item id + * @param array $item Item record + * @return integer Item id or zero on error */ - private static function getDuplicateID(array $item) + private static function getDuplicateID(array $item): int { if (empty($item['network']) || in_array($item['network'], Protocol::FEDERATED)) { - $condition = ["`uri-id` = ? AND `uid` = ? AND `network` IN (?, ?, ?, ?)", - $item['uri-id'], $item['uid'], - Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS]; + $condition = ['`uri-id` = ? AND `uid` = ? AND `network` IN (?, ?, ?, ?)', + $item['uri-id'], + $item['uid'], + Protocol::ACTIVITYPUB, + Protocol::DIASPORA, + Protocol::DFRN, + Protocol::OSTATUS + ]; $existing = Post::selectFirst(['id', 'network'], $condition); if (DBA::isResult($existing)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives @@ -637,12 +666,12 @@ class Item 'uri-id' => $item['uri-id'], 'uid' => $item['uid'], 'network' => $item['network'], - 'existing_id' => $existing["id"], - 'existing_network' => $existing["network"] + 'existing_id' => $existing['id'], + 'existing_network' => $existing['network'] ]); } - return $existing["id"]; + return $existing['id']; } } return 0; @@ -655,20 +684,25 @@ class Item * @return array item array with parent data * @throws \Exception */ - private static function getTopLevelParent(array $item) + private static function getTopLevelParent(array $item): array { $fields = ['uid', 'uri', 'parent-uri', 'id', 'deleted', 'uri-id', 'parent-uri-id', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'wall', 'private', 'origin', 'author-id']; - $condition = ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid']]; + $condition = ['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => $item['uid']]; $params = ['order' => ['id' => false]]; $parent = Post::selectFirst($fields, $condition, $params); - if (!DBA::isResult($parent) && $item['origin']) { - $stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid']); - Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]); - $parent = Post::selectFirst($fields, $condition, $params); + if (!DBA::isResult($parent) && Post::exists(['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => 0])) { + $stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]); + if (!$stored && ($item['thr-parent-id'] != $item['parent-uri-id'])) { + $stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]); + } + if ($stored) { + Logger::info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]); + $parent = Post::selectFirst($fields, $condition, $params); + } } if (!DBA::isResult($parent)) { @@ -687,7 +721,7 @@ class Item $toplevel_parent = Post::selectFirst($fields, $condition, $params); if (!DBA::isResult($toplevel_parent) && $item['origin']) { - $stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid']); + $stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]); Logger::info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]); $toplevel_parent = Post::selectFirst($fields, $condition, $params); } @@ -706,7 +740,7 @@ class Item * @param array $item * @return integer gravity */ - private static function getGravity(array $item) + private static function getGravity(array $item): int { $activity = DI::activity(); @@ -721,11 +755,20 @@ class Item } elseif ($activity->match($item['verb'], Activity::ANNOUNCE)) { return GRAVITY_ACTIVITY; } + Logger::info('Unknown gravity for verb', ['verb' => $item['verb']]); return GRAVITY_UNKNOWN; // Should not happen } - public static function insert(array $item, bool $notify = false, bool $post_local = true) + /** + * Inserts item record + * + * @param array $item Item array to be inserted + * @param int $notify Notification (type?) + * @param bool $post_local (???) + * @return int Zero means error, otherwise primary key (id) is being returned + */ + public static function insert(array $item, int $notify = 0, bool $post_local = true): int { $orig_item = $item; @@ -739,7 +782,7 @@ class Item $item['protocol'] = Conversation::PARCEL_DIRECT; $item['direction'] = Conversation::PUSH; - if (in_array($notify, PRIORITIES)) { + if (is_int($notify) && in_array($notify, PRIORITIES)) { $priority = $notify; } } else { @@ -749,20 +792,26 @@ class Item $uid = intval($item['uid']); $item['guid'] = self::guid($item, $notify); - $item['uri'] = substr(trim($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']), 0, 255); + $item['uri'] = substr(trim($item['uri'] ?? '') ?: self::newURI($item['guid']), 0, 255); // Store URI data $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); // Backward compatibility: parent-uri used to be the direct parent uri. // If it is provided without a thr-parent, it probably is the old behavior. - $item['thr-parent'] = trim($item['thr-parent'] ?? $item['parent-uri'] ?? $item['uri']); - $item['parent-uri'] = $item['thr-parent']; + if (empty($item['thr-parent']) || empty($item['parent-uri'])) { + $item['thr-parent'] = trim($item['thr-parent'] ?? $item['parent-uri'] ?? $item['uri']); + $item['parent-uri'] = $item['thr-parent']; + } - $item['thr-parent-id'] = $item['parent-uri-id'] = ItemURI::getIdByURI($item['thr-parent']); + $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']); + $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']); // Store conversation data - $item = Conversation::insert($item); + $source = $item['source'] ?? ''; + unset($item['conversation-uri']); + unset($item['conversation-href']); + unset($item['source']); /* * Do we already have this item? @@ -861,15 +910,19 @@ class Item $item['post-reason'] = self::PR_FOLLOWER; } + if ($item['origin'] && empty($item['post-reason'])) { + $item['post-reason'] = self::PR_LOCAL; + } + // Ensure that there is an avatar cache Contact::checkAvatarCache($item['author-id']); Contact::checkAvatarCache($item['owner-id']); // The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes - $item["contact-id"] = self::contactId($item); + $item['contact-id'] = self::contactId($item); if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) && - self::isTooOld($item)) { + empty($item['origin']) && self::isTooOld($item)) { Logger::info('Item is too old', ['item' => $item]); return 0; } @@ -935,14 +988,22 @@ class Item } else { $parent_id = 0; $parent_origin = $item['origin']; + + if ($item['wall'] && empty($item['conversation'])) { + $item['conversation'] = $item['parent-uri'] . '#context'; + } } $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']); $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']); + if (!empty($item['conversation']) && empty($item['conversation-id'])) { + $item['conversation-id'] = ItemURI::getIdByURI($item['conversation']); + } + // Is this item available in the global items (with uid=0)? - if ($item["uid"] == 0) { - $item["global"] = true; + if ($item['uid'] == 0) { + $item['global'] = true; // Set the global flag on all items if this was a global item entry Post::update(['global' => true], ['uri-id' => $item['uri-id']]); @@ -951,8 +1012,8 @@ class Item } // ACL settings - if (!empty($item["allow_cid"] . $item["allow_gid"] . $item["deny_cid"] . $item["deny_gid"])) { - $item["private"] = self::PRIVATE; + if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) { + $item['private'] = self::PRIVATE; } if ($notify && $post_local) { @@ -1079,7 +1140,7 @@ class Item if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) { $content_warning = BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB); if (!empty($content_warning) && empty($item['content-warning'])) { - $item['content-warning'] = $content_warning; + $item['content-warning'] = BBCode::toPlaintext($content_warning); } } @@ -1212,12 +1273,36 @@ class Item } if ($transmit) { + if (!empty($source)) { + Post\Activity::insert($item['uri-id'], $source); + } Worker::add(['priority' => $priority, 'dont_fork' => true], 'Notifier', $notify_type, (int)$posted_item['uri-id'], (int)$posted_item['uid']); } + // Fill the cache with the rendered content. + if (in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) && ($posted_item['uid'] == 0)) { + self::updateDisplayCache($posted_item['uri-id']); + } + + if ($posted_item['origin'] && ($posted_item['uid'] != 0) && in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT])) { + DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_OUTBOX . $posted_item['uid']); + } + return $post_user_id; } + /** + * Update the display cache + * + * @param integer $uri_id + * @return void + */ + public static function updateDisplayCache(int $uri_id) + { + $item = Post::selectFirst(self::DISPLAY_FIELDLIST, ['uri-id' => $uri_id]); + self::prepareBody($item, false, false, true); + } + /** * Change the owner of a parent item if it had been shared by a forum * @@ -1281,14 +1366,8 @@ class Item $uids = Tag::getUIDListByURIId($item['uri-id']); foreach ($uids as $uid) { - if (Contact::isSharing($item['author-id'], $uid)) { - $fields = []; - } else { - $fields = ['post-reason' => self::PR_TAG]; - } - - $stored = self::storeForUserByUriId($item['uri-id'], $uid, $fields); - Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'fields' => $fields, 'stored' => $stored]); + $stored = self::storeForUserByUriId($item['uri-id'], $uid, ['post-reason' => self::PR_TAG]); + Logger::info('Stored item for users', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]); } } @@ -1299,7 +1378,7 @@ class Item * @param string $signed_text Original text (for Diaspora signatures), JSON encoded. * @throws \Exception */ - public static function distribute($itemid, $signed_text = '') + public static function distribute(int $itemid, string $signed_text = '') { $condition = ["`id` IN (SELECT `parent` FROM `post-user-view` WHERE `id` = ?)", $itemid]; $parent = Post::selectFirst(['owner-id'], $condition); @@ -1312,7 +1391,7 @@ class Item $condition = ['id' => $itemid, 'uid' => 0, 'network' => array_merge(Protocol::FEDERATED ,['']), 'visible' => true, 'deleted' => false, 'private' => [self::PUBLIC, self::UNLISTED]]; - $item = Post::selectFirst(self::ITEM_FIELDLIST, $condition); + $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), $condition); if (!DBA::isResult($item)) { Logger::warning('Item not found', ['condition' => $condition]); return; @@ -1380,6 +1459,7 @@ class Item if ($origin_uid == $uid) { $item['diaspora_signed_text'] = $signed_text; } + $item['post-reason'] = self::PR_DISTRIBUTE; self::storeForUser($item, $uid); } } @@ -1393,14 +1473,14 @@ class Item * @param integer $source_uid User id of the source post * @return integer stored item id */ - public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [], int $source_uid = 0) + public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [], int $source_uid = 0): int { if ($uid == $source_uid) { Logger::warning('target UID must not be be equal to the source UID', ['uri-id' => $uri_id, 'uid' => $uid]); return 0; } - $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => $source_uid]); + $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['uri-id' => $uri_id, 'uid' => $source_uid]); if (!DBA::isResult($item)) { Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]); return 0; @@ -1425,7 +1505,7 @@ class Item return 0; } - if ((($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) { + if (($uri_id != $item['thr-parent-id']) && (($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) { // Fetch the origin user for the post $origin_uid = self::GetOriginUidForUriId($item['thr-parent-id'], $uid); if (is_null($origin_uid)) { @@ -1501,7 +1581,7 @@ class Item * @return integer stored item id * @throws \Exception */ - private static function storeForUser(array $item, int $uid) + private static function storeForUser(array $item, int $uid): int { if (Post::exists(['uri-id' => $item['uri-id'], 'uid' => $uid])) { if (!empty($item['event-id'])) { @@ -1531,7 +1611,6 @@ class Item unset($item['event-id']); unset($item['hidden']); unset($item['notification-type']); - unset($item['post-reason']); // Data from the "post-delivery-data" table unset($item['postopts']); @@ -1589,7 +1668,7 @@ class Item * @param integer $itemid Item ID that should be added * @throws \Exception */ - private static function addShadow($itemid) + private static function addShadow(int $itemid) { $fields = ['uid', 'private', 'visible', 'deleted', 'network', 'uri-id']; $condition = ['id' => $itemid, 'gravity' => GRAVITY_PARENT]; @@ -1618,7 +1697,7 @@ class Item return; } - $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); + $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]); if (DBA::isResult($item)) { // Preparing public shadow (removing user specific data) @@ -1652,9 +1731,9 @@ class Item * @param integer $itemid Item ID that should be added * @throws \Exception */ - private static function addShadowPost($itemid) + private static function addShadowPost(int $itemid) { - $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); + $item = Post::selectFirst(array_merge(self::ITEM_FIELDLIST, ['protocol']), ['id' => $itemid]); if (!DBA::isResult($item)) { return; } @@ -1716,7 +1795,7 @@ class Item * @return string detected language * @throws \Text_LanguageDetect_Exception */ - private static function getLanguage(array $item) + private static function getLanguage(array $item): string { if (!empty($item['language'])) { return $item['language']; @@ -1751,7 +1830,7 @@ class Item // which point it will be automatically available through `getAvailableLanguages()` and this should be removed. $availableLanguages['fa'] = 'fa'; - $ld = new Language($availableLanguages); + $ld = new Language(array_keys($availableLanguages)); $languages = $ld->detect($naked_body)->limit(0, 3)->close(); if (is_array($languages)) { return json_encode($languages); @@ -1760,7 +1839,7 @@ class Item return ''; } - public static function getLanguageMessage(array $item) + public static function getLanguageMessage(array $item): string { $iso639 = new \Matriphe\ISO639\ISO639; @@ -1778,38 +1857,37 @@ class Item * Posts that are created on this system are using System::createUUID. * Received ActivityPub posts are using Processor::getGUIDByURL. * - * @param string $uri uri of an item entry - * @param string $host hostname for the GUID prefix - * @return string unique guid + * @param string $uri uri of an item entry + * @param string|null $host hostname for the GUID prefix + * @return string Unique guid */ - public static function guidFromUri($uri, $host) + public static function guidFromUri(string $uri, string $host = null): string { // Our regular guid routine is using this kind of prefix as well // We have to avoid that different routines could accidentally create the same value $parsed = parse_url($uri); // Remove the scheme to make sure that "https" and "http" doesn't make a difference - unset($parsed["scheme"]); + unset($parsed['scheme']); // Glue it together to be able to make a hash from it - $host_id = implode("/", $parsed); + $host_id = implode('/', $parsed); // Use a mixture of several hashes to provide some GUID like experience - return hash("crc32", $host) . '-'. hash('joaat', $host_id) . '-'. hash('fnv164', $host_id); + return hash('crc32', $host) . '-'. hash('joaat', $host_id) . '-'. hash('fnv164', $host_id); } /** * generate an unique URI * - * @param integer $uid User id - * @param string $guid An existing GUID (Otherwise it will be generated) + * @param string $guid An existing GUID (Otherwise it will be generated) * * @return string * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function newURI($uid, $guid = "") + public static function newURI(string $guid = ''): string { - if ($guid == "") { + if ($guid == '') { $guid = System::createUUID(); } @@ -1826,7 +1904,7 @@ class Item * @param array $arr Contains the just posted item record * @throws \Exception */ - private static function updateContact($arr) + private static function updateContact(array $arr) { // Unarchive the author $contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]); @@ -1873,7 +1951,7 @@ class Item } } - public static function setHashtags($body) + public static function setHashtags(string $body): string { $body = BBCode::performWithEscapedTags($body, ['noparse', 'pre', 'code', 'img'], function ($body) { $tags = BBCode::getTags($body); @@ -1947,7 +2025,7 @@ class Item * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - private static function tagDeliver($uid, $item_id) + private static function tagDeliver(int $uid, int $item_id): bool { $mention = false; @@ -2042,7 +2120,7 @@ class Item self::performActivity($item['id'], 'announce', $item['uid']); } - public static function isRemoteSelf($contact, &$datarray) + public static function isRemoteSelf(array $contact, array &$datarray): bool { if (!$contact['remote_self']) { return false; @@ -2098,7 +2176,7 @@ class Item $old_uri_id = $datarray["uri-id"] ?? 0; $datarray["guid"] = System::createUUID(); unset($datarray["plink"]); - $datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]); + $datarray["uri"] = self::newURI($datarray["guid"]); $datarray["uri-id"] = ItemURI::getIdByURI($datarray["uri"]); $datarray["extid"] = Protocol::DFRN; $urlpart = parse_url($datarray2['author-link']); @@ -2136,7 +2214,7 @@ class Item * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function fixPrivatePhotos($s, $uid, $item = null, $cid = 0) + public static function fixPrivatePhotos(string $s, int $uid, array $item = null, int $cid = 0): string { if (DI::config()->get('system', 'disable_embedded')) { return $s; @@ -2230,13 +2308,14 @@ class Item return $new_body; } - private static function hasPermissions($obj) + private static function hasPermissions(array $obj) { return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) || !empty($obj['deny_cid']) || !empty($obj['deny_gid']); } - private static function samePermissions($uid, $obj1, $obj2) + // @TODO $uid is unused parameter + private static function samePermissions($uid, array $obj1, array $obj2): bool { // first part is easy. Check that these are exactly the same. if (($obj1['allow_cid'] == $obj2['allow_cid']) @@ -2264,7 +2343,7 @@ class Item * @return array * @throws \Exception */ - public static function enumeratePermissions(array $obj, bool $check_dead = false) + public static function enumeratePermissions(array $obj, bool $check_dead = false): array { $aclFormater = DI::aclFormatter(); @@ -2352,7 +2431,7 @@ class Item Logger::notice('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); } - public static function firstPostDate($uid, $wall = false) + public static function firstPostDate(int $uid, bool $wall = false) { $user = User::getById($uid, ['register_date']); if (empty($user)) { @@ -2393,7 +2472,7 @@ class Item * array $arr * 'post_id' => ID of posted item */ - public static function performActivity(int $item_id, string $verb, int $uid, string $allow_cid = null, string $allow_gid = null, string $deny_cid = null, string $deny_gid = null) + public static function performActivity(int $item_id, string $verb, int $uid, string $allow_cid = null, string $allow_gid = null, string $deny_cid = null, string $deny_gid = null): bool { if (empty($uid)) { return false; @@ -2414,7 +2493,7 @@ class Item } if (!Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) { - $stored = self::storeForUserByUriId($item['parent-uri-id'], $uid); + $stored = self::storeForUserByUriId($item['parent-uri-id'], $uid, ['post-reason' => Item::PR_ACTIVITY]); if (($item['parent-uri-id'] == $item['uri-id']) && !empty($stored)) { $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $stored]); if (!DBA::isResult($item)) { @@ -2538,7 +2617,7 @@ class Item $new_item = [ 'guid' => System::createUUID(), - 'uri' => self::newURI($item['uid']), + 'uri' => self::newURI(), 'uid' => $item['uid'], 'contact-id' => $owner['id'], 'wall' => $item['wall'], @@ -2587,7 +2666,7 @@ class Item * @param integer $owner_id User ID for which the permissions should be fetched * @return array condition */ - public static function getPermissionsConditionArrayByUserId(int $owner_id) + public static function getPermissionsConditionArrayByUserId(int $owner_id): array { $local_user = local_user(); $remote_user = Session::getRemoteContactID($owner_id); @@ -2619,7 +2698,7 @@ class Item * @param string $table * @return string */ - public static function getPermissionsSQLByUserId(int $owner_id, string $table = '') + public static function getPermissionsSQLByUserId(int $owner_id, string $table = ''): string { $local_user = local_user(); $remote_user = Session::getRemoteContactID($owner_id); @@ -2667,7 +2746,7 @@ class Item * @param \Friendica\Core\L10n $l10n * @return string */ - public static function postType(array $item, \Friendica\Core\L10n $l10n) + public static function postType(array $item, \Friendica\Core\L10n $l10n): string { if (!empty($item['event-id'])) { return $l10n->t('event'); @@ -2692,7 +2771,7 @@ class Item * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @todo Remove reference, simply return "rendered-html" and "rendered-hash" */ - public static function putInCache(&$item) + private static function putInCache(&$item) { // Save original body to prevent addons to modify it $body = $item['body']; @@ -2705,8 +2784,6 @@ class Item || $rendered_hash != hash('md5', BBCode::VERSION . '::' . $body) || DI::config()->get('system', 'ignore_cache') ) { - self::addRedirToImageTags($item); - $item['rendered-html'] = BBCode::convertForUriId($item['uri-id'], $item['body']); $item['rendered-hash'] = hash('md5', BBCode::VERSION . '::' . $body); @@ -2731,38 +2808,14 @@ class Item $item['body'] = $body; } - /** - * Find any non-embedded images in private items and add redir links to them - * - * @param array &$item The field array of an item row - */ - private static function addRedirToImageTags(array &$item) - { - $app = DI::app(); - - $matches = []; - $cnt = preg_match_all('|\[img\](http[^\[]*?/photo/[a-fA-F0-9]+?(-[0-9]\.[\w]+?)?)\[\/img\]|', $item['body'], $matches, PREG_SET_ORDER); - if ($cnt) { - foreach ($matches as $mtch) { - if (strpos($mtch[1], '/redir') !== false) { - continue; - } - - if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->getContactId()) && ($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']); - } - } - } - } - /** * Given an item array, convert the body element from bbcode to html and add smilie icons. * If attach is true, also add icons for item attachments. * - * @param array $item - * @param boolean $attach - * @param boolean $is_preview + * @param array $item Record from item table + * @param boolean $attach If true, add icons for item attachments as well + * @param boolean $is_preview Whether this is a preview + * @param boolean $only_cache Whether only cached HTML should be updated * @return string item body html * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException @@ -2771,7 +2824,7 @@ class Item * @hook prepare_body ('item'=>item array, 'html'=>body string, 'is_preview'=>boolean, 'filter_reasons'=>string array) after first bbcode to html * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author) */ - public static function prepareBody(array &$item, $attach = false, $is_preview = false) + public static function prepareBody(array &$item, bool $attach = false, bool $is_preview = false, bool $only_cache = false): string { $a = DI::app(); Hook::callAll('prepare_body_init', $item); @@ -2792,10 +2845,10 @@ class Item $body = $item['body'] ?? ''; $shared = BBCode::fetchShareAttributes($body); if (!empty($shared['guid'])) { - $shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]); + $shared_item = Post::selectFirst(['uri-id', 'plink', 'has-media'], ['guid' => $shared['guid']]); $shared_uri_id = $shared_item['uri-id'] ?? 0; $shared_links = [strtolower($shared_item['plink'] ?? '')]; - $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid']); + $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared['guid'], [], $shared_item['has-media'] ?? false); $shared_links = array_merge($shared_links, array_column($shared_attachments['visual'], 'url')); $shared_links = array_merge($shared_links, array_column($shared_attachments['link'], 'url')); $shared_links = array_merge($shared_links, array_column($shared_attachments['additional'], 'url')); @@ -2804,7 +2857,8 @@ class Item $shared_uri_id = 0; $shared_links = []; } - $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links); + + $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links, $item['has-media'] ?? false); $item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? ''); $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']); @@ -2812,6 +2866,10 @@ class Item $item['body'] = $body; $s = $item["rendered-html"]; + if ($only_cache) { + return ''; + } + // Compile eventual content filter reasons $filter_reasons = []; if (!$is_preview && public_contact() != $item['author-id']) { @@ -2857,6 +2915,7 @@ class Item $s = self::addVisualAttachments($attachments, $item, $s, false); $s = self::addLinkAttachment($item['uri-id'], $attachments, $body, $s, false, $shared_links); $s = self::addNonVisualAttachments($attachments, $item, $s, false); + $s = self::addQuestions($item, $s); // Map. if (strpos($s, '