X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=b12624aa49a248e5b25a5d8981d17840e3c2cacb;hb=4b5c6994b26a8b6bcb3e92afb4a46a537b796aa7;hp=130a1c463de0123645466104a11d423c9b30ee10;hpb=3a158d00ebb734b9fd2945e6ab65ee1bcf7ab426;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 130a1c463d..b12624aa49 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -27,7 +27,6 @@ use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Model\Tag; use Friendica\Core\Worker; @@ -113,7 +112,7 @@ class Item 'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app', 'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', - 'author-id', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid', + 'author-id', 'author-addr', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid', 'signed_text', 'network', 'wall', 'contact-id', 'plink', 'origin', 'thr-parent-id', 'parent-uri-id', 'quote-uri', 'quote-uri-id', 'postopts', 'pubmail', 'event-created', 'event-edited', 'event-start', 'event-finish', @@ -142,10 +141,17 @@ class Item Activity::FOLLOW, Activity::ANNOUNCE]; + // Privacy levels const PUBLIC = 0; const PRIVATE = 1; const UNLISTED = 2; + // Item weight for query ordering + const GRAVITY_PARENT = 0; + const GRAVITY_ACTIVITY = 3; + const GRAVITY_COMMENT = 6; + const GRAVITY_UNKNOWN = 9; + /** * Update existing item entries * @@ -191,12 +197,20 @@ class Item Logger::info('Updating per single row method', ['fields' => $fields, 'condition' => $condition]); - $items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network'], $condition); + $items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network', 'quote-uri-id'], $condition); $notify_items = []; while ($item = DBA::fetch($items)) { if (!empty($fields['body'])) { + if (!empty($item['quote-uri-id'])) { + $fields['body'] = BBCode::removeSharedData($fields['body']); + + if (!empty($fields['raw-body'])) { + $fields['raw-body'] = BBCode::removeSharedData($fields['raw-body']); + } + } + Post\Media::insertFromAttachmentData($item['uri-id'], $fields['body']); $content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])]; @@ -206,10 +220,7 @@ class Item $content_fields['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $content_fields['raw-body']); $content_fields['raw-body'] = self::setHashtags($content_fields['raw-body']); - if ($item['author-network'] != Protocol::DFRN) { - Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']); - } - + Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']); Post\Content::update($item['uri-id'], $content_fields); } @@ -356,7 +367,7 @@ class Item Post\DeliveryData::delete($item['uri-id']); // If it's the parent of a comment thread, kill all the kids - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority); } @@ -463,7 +474,7 @@ class Item } } - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { if (Contact::isSharingByURL($item['owner-link'], $item['uid'], true)) { $contact_id = Contact::getIdForURL($item['owner-link'], $item['uid']); } else { @@ -572,7 +583,7 @@ class 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']))) { + if (($item['body'] . $item['title'] == '') && empty($item['quote-uri-id']) && (empty($item['uri-id']) || !Post\Media::existsByURIId($item['uri-id']))) { Logger::notice('No body, no title.'); return false; } @@ -714,7 +725,7 @@ class Item return 0; } - if ($thread_parent['gravity'] == GRAVITY_PARENT) { + if ($thread_parent['gravity'] == Item::GRAVITY_PARENT) { return $uriid; } @@ -791,17 +802,17 @@ class Item if (isset($item['gravity'])) { return intval($item['gravity']); } elseif ($item['parent-uri-id'] === $item['uri-id']) { - return GRAVITY_PARENT; + return self::GRAVITY_PARENT; } elseif ($activity->match($item['verb'], Activity::POST)) { - return GRAVITY_COMMENT; + return self::GRAVITY_COMMENT; } elseif ($activity->match($item['verb'], Activity::FOLLOW)) { - return GRAVITY_ACTIVITY; + return self::GRAVITY_ACTIVITY; } elseif ($activity->match($item['verb'], Activity::ANNOUNCE)) { - return GRAVITY_ACTIVITY; + return self::GRAVITY_ACTIVITY; } Logger::info('Unknown gravity for verb', ['verb' => $item['verb']]); - return GRAVITY_UNKNOWN; // Should not happen + return self::GRAVITY_UNKNOWN; // Should not happen } /** @@ -965,7 +976,7 @@ class Item return 0; } - if ($item['gravity'] !== GRAVITY_PARENT) { + if ($item['gravity'] !== self::GRAVITY_PARENT) { $toplevel_parent = self::getTopLevelParent($item); if (empty($toplevel_parent)) { return 0; @@ -1060,7 +1071,7 @@ class Item } // We have to tell the hooks who we are - this really should be improved - if (!local_user()) { + if (!DI::userSession()->getLocalUserId()) { $_SESSION['authenticated'] = true; $_SESSION['uid'] = $uid; $dummy_session = true; @@ -1113,22 +1124,28 @@ class Item unset($item['attachments']); } + if (empty($item['quote-uri-id'])) { + $quote_id = self::getQuoteUriId($item['body']); + if (!empty($quote_id)) { + // This is one of these "should not happen" situations. + // The protocol implementations should already have done this job. + Logger::notice('Quote-uri-id detected in post', ['id' => $quote_id, 'guid' => $item['guid'], 'uri-id' => $item['uri-id'], 'callstack' => System::callstack(20)]); + $item['quote-uri-id'] = $quote_id; + } + } + + if (!empty($item['quote-uri-id'])) { + $item['raw-body'] = BBCode::removeSharedData($item['raw-body']); + $item['body'] = BBCode::removeSharedData($item['body']); + } + Post\Media::insertFromAttachmentData($item['uri-id'], $item['body']); // Remove all media attachments from the body and store them in the post-media table $item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']); $item['raw-body'] = self::setHashtags($item['raw-body']); - $quote_id = self::getQuoteUriId($item['body']); - - if (!empty($quote_id) && Post::exists(['uri-id' => $quote_id, 'network' => Protocol::FEDERATED])) { - $item['quote-uri-id'] = $quote_id; - $item['raw-body'] = BBCode::removeSharedData($item['raw-body']); - } - - if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) { - Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']); - } + Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']); // Check for hashtags in the body and repair or add hashtag links $item['body'] = self::setHashtags($item['body']); @@ -1185,7 +1202,7 @@ class Item Post::insert($item['uri-id'], $item); - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { Post\Thread::insert($item['uri-id'], $item); } @@ -1194,7 +1211,7 @@ class Item } // Create Diaspora signature - if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) { + if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != self::GRAVITY_PARENT)) { $signed = Diaspora::createCommentSignature($item); if (!empty($signed)) { $item['diaspora_signed_text'] = json_encode($signed); @@ -1234,7 +1251,7 @@ class Item return 0; } - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { $item['post-user-id'] = $post_user_id; Post\ThreadUser::insert($item['uri-id'], $item['uid'], $item); } @@ -1252,7 +1269,7 @@ class Item // update the commented timestamp on the parent if (DI::config()->get('system', 'like_no_comment')) { // Update when it is a comment - $update_commented = in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]); + $update_commented = in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]); } else { // Update when it isn't a follow or tag verb $update_commented = !in_array($posted_item['verb'], [Activity::FOLLOW, Activity::TAG]); @@ -1276,7 +1293,7 @@ class Item } if ($notify) { - if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == GRAVITY_COMMENT)) { + if (!\Friendica\Content\Feature::isEnabled($posted_item['uid'], 'explicit_mentions') && ($posted_item['gravity'] == self::GRAVITY_COMMENT)) { Tag::createImplicitMentions($posted_item['uri-id'], $posted_item['thr-parent-id']); } Hook::callAll('post_local_end', $posted_item); @@ -1284,7 +1301,7 @@ class Item Hook::callAll('post_remote_end', $posted_item); } - if ($posted_item['gravity'] === GRAVITY_PARENT) { + if ($posted_item['gravity'] === self::GRAVITY_PARENT) { self::addShadow($post_user_id); } else { self::addShadowPost($post_user_id); @@ -1319,7 +1336,7 @@ class Item } // Fill the cache with the rendered content. - if (in_array($posted_item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) && ($posted_item['uid'] == 0)) { + if (in_array($posted_item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]) && ($posted_item['uid'] == 0)) { self::updateDisplayCache($posted_item['uri-id']); } @@ -1335,7 +1352,7 @@ class Item */ public static function getPostReason(array $item): int { - $actor = ($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id']; + $actor = ($item['gravity'] == self::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id']; if (empty($item['origin']) && ($item['uid'] != 0) && Contact::isSharing($actor, $item['uid'])) { return self::PR_FOLLOWER; } @@ -1416,7 +1433,7 @@ class Item */ private static function distributeByTags(array $item) { - if (($item['uid'] != 0) || ($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) { + if (($item['uid'] != 0) || ($item['gravity'] != self::GRAVITY_PARENT) || !in_array($item['network'], Protocol::FEDERATED)) { return; } @@ -1542,7 +1559,7 @@ class Item return 0; } - if (($uid != 0) && ($item['gravity'] == GRAVITY_PARENT)) { + if (($uid != 0) && ($item['gravity'] == self::GRAVITY_PARENT)) { $owner = User::getOwnerDataById($uid); if (($owner['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY) && !Tag::isMentioned($uri_id, $owner['url'])) { Logger::info('Target user is a forum but is not mentioned here, thread will not be stored', ['uid' => $uid, 'uri-id' => $uri_id]); @@ -1559,13 +1576,13 @@ class Item $item = array_merge($item, $fields); - if (($uid != 0) && Contact::isSharing(($item['gravity'] == GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'], $uid)) { + if (($uid != 0) && Contact::isSharing(($item['gravity'] == Item::GRAVITY_PARENT) ? $item['owner-id'] : $item['author-id'], $uid)) { $item['post-reason'] = self::PR_FOLLOWER; } - $is_reshare = ($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE); + $is_reshare = ($item['gravity'] == self::GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE); - if (($uid != 0) && (($item['gravity'] == GRAVITY_PARENT) || $is_reshare) && + if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) && DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE && !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) { Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]); @@ -1574,7 +1591,7 @@ class Item $causer = $item['causer-id'] ?: $item['author-id']; - if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) { + if (($uri_id != $item['parent-uri-id']) && ($item['gravity'] == self::GRAVITY_COMMENT) && !Post::exists(['uri-id' => $item['parent-uri-id'], 'uid' => $uid])) { if (!self::fetchParent($item['parent-uri-id'], $uid, $causer)) { Logger::info('Parent post had not been added', ['uri-id' => $item['parent-uri-id'], 'uid' => $uid, 'causer' => $causer]); return 0; @@ -1715,7 +1732,7 @@ class Item $item['contact-id'] = self::contactId($item); $notify = false; - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]); if (DBA::isResult($contact)) { $notify = self::isRemoteSelf($contact, $item); @@ -1745,7 +1762,7 @@ class Item private static function addShadow(int $itemid) { $fields = ['uid', 'private', 'visible', 'deleted', 'network', 'uri-id']; - $condition = ['id' => $itemid, 'gravity' => GRAVITY_PARENT]; + $condition = ['id' => $itemid, 'gravity' => self::GRAVITY_PARENT]; $item = Post::selectFirst($fields, $condition); if (!DBA::isResult($item)) { @@ -1813,7 +1830,7 @@ class Item } // Is it a toplevel post? - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { self::addShadow($itemid); return; } @@ -1875,7 +1892,7 @@ class Item return $item['language']; } - if (!in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) || empty($item['body'])) { + if (!in_array($item['gravity'], [self::GRAVITY_PARENT, self::GRAVITY_COMMENT]) || empty($item['body'])) { return ''; } @@ -2155,13 +2172,13 @@ class Item return false; } - $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'origin' => false]); + $item = Post::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id, 'gravity' => [self::GRAVITY_PARENT, self::GRAVITY_COMMENT], 'origin' => false]); if (!DBA::isResult($item)) { Logger::debug('Post is an activity or origin or not found at all, quitting here.', ['id' => $item_id]); return false; } - if ($item['gravity'] == GRAVITY_PARENT) { + if ($item['gravity'] == self::GRAVITY_PARENT) { if (Tag::isMentioned($item['uri-id'], $owner['url'])) { Logger::info('Mention found in tag.', ['uri' => $item['uri'], 'uid' => $uid, 'id' => $item_id, 'uri-id' => $item['uri-id'], 'guid' => $item['guid']]); } else { @@ -2206,7 +2223,7 @@ class Item */ private static function autoReshare(array $item) { - if ($item['gravity'] != GRAVITY_PARENT) { + if ($item['gravity'] != self::GRAVITY_PARENT) { return; } @@ -2467,7 +2484,7 @@ class Item } $condition = ["`uid` = ? AND NOT `deleted` AND `gravity` = ?", - $uid, GRAVITY_PARENT]; + $uid, self::GRAVITY_PARENT]; /* * $expire_network_only = save your own wall posts @@ -2674,7 +2691,7 @@ class Item $vids = Verb::getID($activity); } - $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY, + $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => self::GRAVITY_ACTIVITY, 'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent-id' => $uri_id]; $like_item = Post::selectFirst(['id', 'guid', 'verb'], $condition); @@ -2728,7 +2745,7 @@ class Item 'network' => Protocol::DFRN, 'protocol' => Conversation::PARCEL_DIRECT, 'direction' => Conversation::PUSH, - 'gravity' => GRAVITY_ACTIVITY, + 'gravity' => self::GRAVITY_ACTIVITY, 'parent' => $item['id'], 'thr-parent' => $item['uri'], 'owner-id' => $author_id, @@ -2769,8 +2786,8 @@ class Item */ public static function getPermissionsConditionArrayByUserId(int $owner_id): array { - $local_user = local_user(); - $remote_user = Session::getRemoteContactID($owner_id); + $local_user = DI::userSession()->getLocalUserId(); + $remote_user = DI::userSession()->getRemoteContactID($owner_id); // default permissions - anonymous user $condition = ["`private` != ?", self::PRIVATE]; @@ -2801,8 +2818,8 @@ class Item */ public static function getPermissionsSQLByUserId(int $owner_id, string $table = ''): string { - $local_user = local_user(); - $remote_user = Session::getRemoteContactID($owner_id); + $local_user = DI::userSession()->getLocalUserId(); + $remote_user = DI::userSession()->getRemoteContactID($owner_id); if (!empty($table)) { $table = DBA::quoteIdentifier($table) . '.'; @@ -2853,9 +2870,9 @@ class Item return $l10n->t('event'); } elseif (!empty($item['resource-id'])) { return $l10n->t('photo'); - } elseif ($item['gravity'] == GRAVITY_ACTIVITY) { + } elseif ($item['gravity'] == self::GRAVITY_ACTIVITY) { return $l10n->t('activity'); - } elseif ($item['gravity'] == GRAVITY_COMMENT) { + } elseif ($item['gravity'] == self::GRAVITY_COMMENT) { return $l10n->t('comment'); } @@ -2944,20 +2961,18 @@ class Item $item['mentions'] = $tags['mentions']; $body = $item['body'] ?? ''; - $shared = BBCode::fetchShareAttributes($body); - if (!empty($shared['guid'])) { - $shared_item = Post::selectFirst(['uri-id', 'guid', 'plink', 'has-media'], ['guid' => $shared['guid'], 'uid' => [$item['uid'], 0]]); - } $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media']; $shared_uri_id = 0; $shared_links = []; - if (empty($shared_item['uri-id']) && !empty($item['quote-uri-id'])) { - $shared_item = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id']]); - $quote_uri_id = $item['quote-uri-id'] ?? 0; - $shared_links[] = strtolower($item['quote-uri']); + $shared = DI::contentItem()->getSharedPost($item, $fields); + if (!empty($shared['post'])) { + $shared_item = $shared['post']; + $quote_uri_id = $shared['post']['uri-id']; + $shared_links[] = strtolower($shared['post']['uri']); + $item['body'] = BBCode::removeSharedData($item['body']); } elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id'])) { $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]); if (!empty($media)) { @@ -3000,8 +3015,8 @@ class Item // Compile eventual content filter reasons $filter_reasons = []; - if (!$is_preview && public_contact() != $item['author-id']) { - if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) { + if (!$is_preview && DI::userSession()->getPublicContactId() != $item['author-id']) { + if (!empty($item['content-warning']) && (!DI::userSession()->getLocalUserId() || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'disable_cw', false))) { $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']); } @@ -3037,7 +3052,7 @@ class Item $s = self::addVisualAttachments($shared_attachments, $item, $s, true); $s = self::addLinkAttachment($shared_uri_id ?: $item['uri-id'], $shared_attachments, $body, $s, true, []); $s = self::addNonVisualAttachments($shared_attachments, $item, $s, true); - $body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); + $body = BBCode::removeSharedData($body); } $s = self::addVisualAttachments($attachments, $item, $s, false); @@ -3079,11 +3094,20 @@ class Item { // Make sure that for example site parameters aren't used when testing if the link is contained in the body $urlparts = parse_url($url); - if (!empty($urlparts)) { - unset($urlparts['query']); - unset($urlparts['fragment']); + if (empty($urlparts)) { + return false; + } + + unset($urlparts['query']); + unset($urlparts['fragment']); + + try { $url = (string)Uri::fromParts($urlparts); - } else { + } catch (\InvalidArgumentException $e) { + DI::logger()->notice('Invalid URL', ['$url' => $url, '$urlparts' => $urlparts]); + /* See https://github.com/friendica/friendica/issues/12113 + * Malformed URLs will result in a Fatal Error + */ return false; } @@ -3096,12 +3120,14 @@ class Item if (strpos($body, $url)) { return true; } + foreach ([0, 1, 2] as $size) { if (preg_match('#/photo/.*-' . $size . '\.#ism', $url) && strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $body), $url)) { return true; } } + return false; } @@ -3398,7 +3424,7 @@ class Item $percent = $option['replies'] / $question['voters'] * 100; $options[$key]['vote'] = DI::l10n()->tt('%2$s (%3$d%%, %1$d vote)', '%2$s (%3$d%%, %1$d votes)', $option['replies'], $option['name'], round($percent, 1)); } else { - $options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name'], ); + $options[$key]['vote'] = DI::l10n()->tt('%2$s (%1$d vote)', '%2$s (%1$d votes)', $option['replies'], $option['name']); } } @@ -3437,7 +3463,7 @@ class Item $plink = $item['uri']; } - if (local_user()) { + if (DI::userSession()->getLocalUserId()) { $ret = [ 'href' => "display/" . $item['guid'], 'orig' => "display/" . $item['guid'], @@ -3583,21 +3609,6 @@ class Item return 0; } - /** - * Return share data from an item array (if the item is shared item) - * We are providing the complete Item array, because at some time in the future - * we hopefully will define these values not in the body anymore but in some item fields. - * This function is meant to replace all similar functions in the system. - * - * @param array $item - * - * @return array with share information - */ - public static function getShareArray(array $item): array - { - return BBCode::fetchShareAttributes($item['body']); - } - /** * Check a prospective item array against user-level permissions * @@ -3627,7 +3638,7 @@ class Item return false; } - if (!empty($item['causer-id']) && ($item['gravity'] === GRAVITY_PARENT) && Contact\User::isIgnored($item['causer-id'], $user_id)) { + if (!empty($item['causer-id']) && ($item['gravity'] === self::GRAVITY_PARENT) && Contact\User::isIgnored($item['causer-id'], $user_id)) { Logger::notice('Causer is ignored by user', ['causer-link' => $item['causer-link'] ?? $item['causer-id'], 'uid' => $user_id, 'item-uri' => $item['uri']]); return false; } @@ -3636,47 +3647,61 @@ class Item } /** - * Improve the data in shared posts + * Fetch the uri-id of a quote * - * @param array $item - * @param bool $add_media - * @return string body + * @param string $body + * @return integer */ - public static function improveSharedDataInBody(array $item, bool $add_media = false): string + public static function getQuoteUriId(string $body, int $uid = 0): int { - $shared = BBCode::fetchShareAttributes($item['body']); + $shared = BBCode::fetchShareAttributes($body); if (empty($shared['guid']) && empty($shared['message_id'])) { - return $item['body']; + return 0; } - $link = $shared['link'] ?: $shared['message_id']; - - if (empty($shared_content)) { - $shared_content = DI::contentItem()->createSharedPostByUrl($link, $item['uid'] ?? 0, $add_media); + if (empty($shared['link']) && empty($shared['message_id'])) { + Logger::notice('Invalid share block.', ['share' => $shared]); + return 0; } - if (empty($shared_content)) { - return $item['body']; + if (!empty($shared['guid'])) { + $shared_item = Post::selectFirst(['uri-id'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]); + if (!empty($shared_item['uri-id'])) { + Logger::debug('Found post by guid', ['guid' => $shared['guid'], 'uid' => $uid]); + return $shared_item['uri-id']; + } } - $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content, $item['body']); + if (!empty($shared['message_id'])) { + $shared_item = Post::selectFirst(['uri-id'], ['uri' => $shared['message_id'], 'uid' => [0, $uid]]); + if (!empty($shared_item['uri-id'])) { + Logger::debug('Found post by message_id', ['message_id' => $shared['message_id'], 'uid' => $uid]); + return $shared_item['uri-id']; + } + } - Logger::debug('New shared data', ['uri-id' => $item['uri-id'], 'link' => $link, 'guid' => $item['guid']]); - return $item['body']; - } + if (!empty($shared['link'])) { + $shared_item = Post::selectFirst(['uri-id'], ['plink' => $shared['link'], 'uid' => [0, $uid]]); + if (!empty($shared_item['uri-id'])) { + Logger::debug('Found post by link', ['link' => $shared['link'], 'uid' => $uid]); + return $shared_item['uri-id']; + } + } - /** - * Fetch the uri-id of a quote - * - * @param string $body - * @return integer - */ - private static function getQuoteUriId(string $body): int - { - $shared = BBCode::fetchShareAttributes($body); - if (empty($shared['message_id'])) { + $url = $shared['message_id'] ?: $shared['link']; + $id = self::fetchByLink($url); + if (!$id) { + Logger::notice('Post could not be fetched.', ['url' => $url, 'uid' => $uid]); return 0; } - return ItemURI::getIdByURI($shared['message_id']); + + $shared_item = Post::selectFirst(['uri-id'], ['id' => $id]); + if (!empty($shared_item['uri-id'])) { + Logger::debug('Fetched shared post', ['id' => $id, 'url' => $url, 'uid' => $uid]); + return $shared_item['uri-id']; + } + + Logger::warning('Post does not exist although it was supposed to had been fetched.', ['id' => $id, 'url' => $url, 'uid' => $uid]); + return 0; } }