X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=911e4216f0a70ea7c7d13a81ab6b1e4e6fab2fe9;hb=8bbf3f3699beefe6dccce0b349ce7912a28f1bc2;hp=ced18fc8a68f74aed8557da4522580aa8eb2c73d;hpb=c65fff6f93e4e33901510343faef69654fd1a97b;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index ced18fc8a6..911e4216f0 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -141,6 +141,7 @@ class Item Activity::FOLLOW, Activity::ANNOUNCE]; + // Privacy levels const PUBLIC = 0; const PRIVATE = 1; const UNLISTED = 2; @@ -196,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'])]; @@ -211,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); } @@ -331,7 +337,7 @@ class Item * generate a resource-id and therefore aren't intimately linked to the item. */ /// @TODO: this should first check if photo is used elsewhere - if (strlen($item['resource-id'])) { + if ($item['resource-id']) { Photo::delete(['resource-id' => $item['resource-id'], 'uid' => $item['uid']]); } @@ -577,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; } @@ -809,6 +815,49 @@ class Item return self::GRAVITY_UNKNOWN; // Should not happen } + private static function prepareOriginPost(array $item): array + { + $item['wall'] = 1; + $item['origin'] = 1; + $item['network'] = Protocol::DFRN; + $item['protocol'] = Conversation::PARCEL_DIRECT; + $item['direction'] = Conversation::PUSH; + + $owner = User::getOwnerDataById($item['uid']); + + if (empty($item['contact-id'])) { + $item['contact-id'] = $owner['id']; + } + + if (empty($item['author-link']) && empty($item['author-id'])) { + $item['author-link'] = $owner['url']; + $item['author-name'] = $owner['name']; + $item['author-avatar'] = $owner['thumb']; + } + + if (empty($item['owner-link']) && empty($item['owner-id'])) { + $item['owner-link'] = $item['author-link']; + $item['owner-name'] = $item['author-name']; + $item['owner-avatar'] = $item['author-avatar']; + } + + // Setting the object type if not defined before + if (empty($item['object-type'])) { + $item['object-type'] = Activity\ObjectType::NOTE; // Default value + $objectdata = BBCode::getAttachedData($item['body']); + + if ($objectdata['type'] == 'link') { + $item['object-type'] = Activity\ObjectType::BOOKMARK; + } elseif ($objectdata['type'] == 'video') { + $item['object-type'] = Activity\ObjectType::VIDEO; + } elseif ($objectdata['type'] == 'photo') { + $item['object-type'] = Activity\ObjectType::IMAGE; + } + } + + return $item; + } + /** * Inserts item record * @@ -825,11 +874,7 @@ class Item // If it is a posting where users should get notifications, then define it as wall posting if ($notify) { - $item['wall'] = 1; - $item['origin'] = 1; - $item['network'] = Protocol::DFRN; - $item['protocol'] = Conversation::PARCEL_DIRECT; - $item['direction'] = Conversation::PUSH; + $item = self::prepareOriginPost($item); if (is_int($notify) && in_array($notify, Worker::PRIORITIES)) { $priority = $notify; @@ -987,6 +1032,7 @@ class Item $item['parent-uri'] = $toplevel_parent['uri']; $item['parent-uri-id'] = $toplevel_parent['uri-id']; $item['deleted'] = $toplevel_parent['deleted']; + $item['wall'] = $toplevel_parent['wall']; // Reshares have to keep their permissions to allow forums to work if (!$item['origin'] || ($item['verb'] != Activity::ANNOUNCE)) { @@ -1118,22 +1164,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']); @@ -1316,10 +1368,11 @@ class Item } } + if (!empty($source) && ($transmit || DI::config()->get('debug', 'store_source'))) { + Post\Activity::insert($item['uri-id'], $source); + } + 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']); } @@ -2259,7 +2312,7 @@ class Item $datarray2 = $datarray; Logger::info('remote-self start', ['contact' => $contact['url'], 'remote_self'=> $contact['remote_self'], 'item' => $datarray]); - if ($contact['remote_self'] == Contact::MIRROR_OWN_POST) { + if (in_array($contact['remote_self'], [Contact::MIRROR_OWN_POST, Contact::MIRROR_FORWARDED])) { $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $contact['uid'], 'self' => true]); if (DBA::isResult($self)) { @@ -2305,8 +2358,8 @@ class Item $result = self::insert($datarray2); Logger::info('remote-self post original item', ['contact' => $contact['url'], 'result'=> $result, 'item' => $datarray2]); } else { - $datarray["app"] = "Feed"; - $result = true; + Logger::info('No valid mirroring option', ['uid' => $contact['uid'], 'id' => $contact['id'], 'network' => $contact['network'], 'remote_self' => $contact['remote_self']]); + return false; } return (bool)$result; @@ -2680,7 +2733,7 @@ class Item } $condition = ['vid' => $vids, 'deleted' => false, 'gravity' => self::GRAVITY_ACTIVITY, - 'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent-id' => $uri_id]; + 'author-id' => $author_id, 'uid' => $uid, 'thr-parent-id' => $uri_id]; $like_item = Post::selectFirst(['id', 'guid', 'verb'], $condition); if (DBA::isResult($like_item)) { @@ -2950,7 +3003,7 @@ class Item $body = $item['body'] ?? ''; - $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media']; + $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type']; $shared_uri_id = 0; $shared_links = []; @@ -2961,7 +3014,7 @@ class Item $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'])) { + } elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id']) && ($item['network'] != Protocol::DIASPORA)) { $media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]); if (!empty($media)) { $shared_item = Post::selectFirst($fields, ['plink' => $media[0]['url'], 'uid' => [$item['uid'], 0]]); @@ -2982,14 +3035,14 @@ class Item if (!empty($shared_item['uri-id'])) { $shared_uri_id = $shared_item['uri-id']; $shared_links[] = strtolower($shared_item['plink']); - $shared_attachments = Post\Media::splitAttachments($shared_uri_id, $shared_item['guid'], [], $shared_item['has-media']); + $shared_attachments = Post\Media::splitAttachments($shared_uri_id, [], $shared_item['has-media']); $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')); $item['body'] = self::replaceVisualAttachments($shared_attachments, $item['body']); } - $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links, $item['has-media'] ?? false); + $attachments = Post\Media::splitAttachments($item['uri-id'], $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']); @@ -3037,7 +3090,7 @@ class Item } if (!empty($shared_attachments)) { - $s = self::addVisualAttachments($shared_attachments, $item, $s, true); + $s = self::addVisualAttachments($shared_attachments, $shared_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 = BBCode::removeSharedData($body); @@ -3082,11 +3135,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; } @@ -3099,12 +3161,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; } @@ -3158,12 +3222,18 @@ class Item continue; } - if (!empty($attachment['preview'])) { + if ($attachment['filetype'] == 'image') { + $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE); + } elseif (!empty($attachment['preview'])) { $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], Proxy::SIZE_LARGE); } else { $preview_url = ''; } + if ($preview_url && self::containsLink($item['body'], $preview_url)) { + continue; + } + if (($attachment['filetype'] == 'video')) { /// @todo Move the template to /content as well $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [ @@ -3195,10 +3265,14 @@ class Item $trailing .= $media; } } elseif ($attachment['filetype'] == 'image') { + $src_url = Post\Media::getUrlForId($attachment['id']); + if (self::containsLink($item['body'], $src_url)) { + continue; + } $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ '$image' => [ - 'src' => Post\Media::getUrlForId($attachment['id']), - 'preview' => Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE), + 'src' => $src_url, + 'preview' => $preview_url, 'attachment' => $attachment, ], ]); @@ -3401,7 +3475,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']); } } @@ -3624,47 +3698,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; } }