X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=f6bec1561cb0f0ed0e6e010a74bb1e75f133d73c;hb=8a9f633ce26d4fcb74557891282572b372d5d223;hp=d842f2284f3c575746159d6f96dcb090b94eb2b8;hpb=75a90f5e5dcc019c131bb63d4c6cb43c0a4042f1;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index d842f2284f..f6bec1561c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -21,7 +21,6 @@ namespace Friendica\Model; -use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; @@ -173,7 +172,7 @@ class Item Logger::info('Updating per single row method', ['fields' => $fields, 'condition' => $condition]); - $items = Post::select(['id', 'origin', 'uri-id', 'uid'], $condition); + $items = Post::select(['id', 'origin', 'uri-id', 'uid', 'author-network'], $condition); $notify_items = []; @@ -184,9 +183,15 @@ class Item $content_fields = ['raw-body' => trim($fields['raw-body'] ?? $fields['body'])]; // Remove all media attachments from the body and store them in the post-media table - // @todo On shared postings (Diaspora style and commented reshare) don't fetch content from rhe shared part + // @todo On shared postings (Diaspora style and commented reshare) don't fetch content from the shared part $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\Content::update($item['uri-id'], $content_fields); } if (!empty($fields['file'])) { @@ -929,7 +934,25 @@ class Item if ($notify) { $item['edit'] = false; $item['parent'] = $parent_id; + + // Trigger automatic reactions for addons + $item['api_source'] = true; + + // We have to tell the hooks who we are - this really should be improved + if (!local_user()) { + $_SESSION['authenticated'] = true; + $_SESSION['uid'] = $uid; + $dummy_session = true; + } else { + $dummy_session = false; + } + Hook::callAll('post_local', $item); + + if ($dummy_session) { + unset($_SESSION['authenticated']); + unset($_SESSION['uid']); + } } else { Hook::callAll('post_remote', $item); } @@ -960,12 +983,24 @@ class Item self::setOwnerforResharedItem($item); } + if (isset($item['attachments'])) { + foreach ($item['attachments'] as $attachment) { + $attachment['uri-id'] = $item['uri-id']; + Post\Media::insert($attachment); + } + unset($item['attachments']); + } + 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']); + if (!DBA::exists('contact', ['id' => $item['author-id'], 'network' => Protocol::DFRN])) { + 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']); @@ -985,6 +1020,30 @@ class Item if (empty($item['event-id'])) { unset($item['event-id']); + + $ev = Event::fromBBCode($item['body']); + if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) { + Logger::info('Event found.'); + $ev['cid'] = $item['contact-id']; + $ev['uid'] = $item['uid']; + $ev['uri'] = $item['uri']; + $ev['edited'] = $item['edited']; + $ev['private'] = $item['private']; + $ev['guid'] = $item['guid']; + $ev['plink'] = $item['plink']; + $ev['network'] = $item['network']; + $ev['protocol'] = $item['protocol']; + $ev['direction'] = $item['direction']; + $ev['source'] = $item['source']; + + $event = DBA::selectFirst('event', ['id'], ['uri' => $item['uri'], 'uid' => $item['uid']]); + if (DBA::isResult($event)) { + $ev['id'] = $event['id']; + } + + $item['event-id'] = Event::store($ev); + Logger::info('Event was stored', ['id' => $item['event-id']]); + } } if (empty($item['causer-id'])) { @@ -1001,7 +1060,14 @@ class Item Post\Content::insert($item['uri-id'], $item); } - // Diaspora signature + // Create Diaspora signature + if ($item['origin'] && empty($item['diaspora_signed_text']) && ($item['gravity'] != GRAVITY_PARENT)) { + $signed = Diaspora::createCommentSignature($uid, $item); + if (!empty($signed)) { + $item['diaspora_signed_text'] = json_encode($signed); + } + } + if (!empty($item['diaspora_signed_text'])) { DBA::replace('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $item['diaspora_signed_text']]); } @@ -1161,13 +1227,10 @@ class Item Logger::info('The resharer is no forum: quit', ['resharer' => $item['author-id'], 'owner' => $parent['owner-id'], 'author' => $parent['author-id'], 'uid' => $item['uid']]); return; } - self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]); - Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]); - return; } - self::update(['owner-id' => $item['author-id'], 'contact-id' => $cid], ['id' => $parent['id']]); - Logger::info('Change owner of the parent', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'owner-id' => $item['author-id'], 'contact-id' => $cid]); + self::update(['post-reason' => self::PR_ANNOUNCEMENT, 'causer-id' => $item['author-id']], ['id' => $parent['id']]); + Logger::info('Set announcement post-reason', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]); } /** @@ -1289,19 +1352,26 @@ class Item /** * Store a public item defined by their URI-ID for the given users * - * @param integer $uri_id URI-ID of the given item - * @param integer $uid The user that will receive the item entry - * @param array $fields Additional fields to be stored + * @param integer $uri_id URI-ID of the given item + * @param integer $uid The user that will receive the item entry + * @param array $fields Additional fields to be stored + * @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 = []) + public static function storeForUserByUriId(int $uri_id, int $uid, array $fields = [], int $source_uid = 0) { - $item = Post::selectFirst(self::ITEM_FIELDLIST, ['uri-id' => $uri_id, 'uid' => 0]); + 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]); if (!DBA::isResult($item)) { + Logger::warning('Item could not be fetched', ['uri-id' => $uri_id, 'uid' => $source_uid]); return 0; } - if (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED)) { + if (($source_uid == 0) && (($item['private'] == self::PRIVATE) || !in_array($item['network'], Protocol::FEDERATED))) { Logger::notice('Item is private or not from a federated network. It will not be stored for the user.', ['uri-id' => $uri_id, 'uid' => $uid, 'private' => $item['private'], 'network' => $item['network']]); return 0; } @@ -1310,8 +1380,25 @@ class Item $item = array_merge($item, $fields); + $is_reshare = ($item['gravity'] == GRAVITY_ACTIVITY) && ($item['verb'] == Activity::ANNOUNCE); + + if ((($item['gravity'] == GRAVITY_PARENT) || $is_reshare) && + DI::pConfig()->get($uid, 'system', 'accept_only_sharer') && + !Contact::isSharingByURL($item['author-link'], $uid) && + !Contact::isSharingByURL($item['owner-link'], $uid)) { + Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid]); + return 0; + } + + if ((($item['gravity'] == GRAVITY_COMMENT) || $is_reshare) && !Post::exists(['uri-id' => $item['thr-parent-id'], 'uid' => $uid])) { + // Only do an auto complete with the source uid "0" to prevent privavy problems + $causer = $item['causer-id'] ?: $item['author-id']; + $result = self::storeForUserByUriId($item['thr-parent-id'], $uid, ['causer-id' => $causer, 'post-reason' => self::PR_FETCHED]); + Logger::info('Fetched thread parent', ['uri-id' => $item['thr-parent-id'], 'uid' => $uid, 'causer' => $causer, 'result' => $result]); + } + $stored = self::storeForUser($item, $uid); - Logger::info('Public item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'stored' => $stored]); + Logger::info('Item stored for user', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'source-uid' => $source_uid, 'stored' => $stored]); return $stored; } @@ -1331,11 +1418,18 @@ class Item } unset($item['id']); - unset($item['parent']); unset($item['mention']); unset($item['starred']); unset($item['unseen']); unset($item['psid']); + unset($item['pinned']); + unset($item['ignored']); + unset($item['pubmail']); + unset($item['forum_mode']); + + unset($item['event-id']); + unset($item['hidden']); + unset($item['notification-type']); $item['uid'] = $uid; $item['origin'] = 0; @@ -1361,8 +1455,6 @@ class Item $item['contact-id'] = $self['id']; } - /// @todo Handling of "event-id" - $notify = false; if ($item['gravity'] == GRAVITY_PARENT) { $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]); @@ -1374,9 +1466,9 @@ class Item $distributed = self::insert($item, $notify, true); if (!$distributed) { - Logger::info("Distributed public item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]); + Logger::info("Distributed item wasn't stored", ['uri-id' => $item['uri-id'], 'user' => $uid]); } else { - Logger::info('Distributed public item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]); + Logger::info('Distributed item was stored', ['uri-id' => $item['uri-id'], 'user' => $uid, 'stored' => $distributed]); } return $distributed; } @@ -1956,13 +2048,6 @@ class Item $result = true; } - // Trigger automatic reactions for addons - $datarray['api_source'] = true; - - // We have to tell the hooks who we are - this really should be improved - $_SESSION['authenticated'] = true; - $_SESSION['uid'] = $contact['uid']; - return (bool)$result; } @@ -2641,7 +2726,7 @@ class Item } $body = $item['body'] ?? ''; - $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $item['body']); + $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']); self::putInCache($item); $item['body'] = $body; $s = $item["rendered-html"]; @@ -2681,7 +2766,7 @@ class Item $shared_links = []; } - $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'], $shared_links); + $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links); $s = self::addVisualAttachments($attachments, $item, $s, false); $s = self::addLinkAttachment($attachments, $body, $s, false, $shared_links); $s = self::addNonVisualAttachments($attachments, $item, $s, false); @@ -2713,10 +2798,23 @@ class Item * * @param string $body * @param string $url + * @param int $type * @return bool */ - public static function containsLink(string $body, string $url) + public static function containsLink(string $body, string $url, int $type = 0) { + // Make sure that for example site parameters aren't used when testing if the link is contained in the body + $urlparts = parse_url($url); + unset($urlparts['query']); + unset($urlparts['fragment']); + $url = Network::unparseURL($urlparts); + + // Remove media links to only search in embedded content + // @todo Check images for image link, audio for audio links, ... + if (in_array($type, [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE])) { + $body = preg_replace("/\[url=[^\[\]]*\](.*)\[\/url\]/Usi", ' $1 ', $body); + } + if (strpos($body, $url)) { return true; } @@ -2743,8 +2841,9 @@ class Item $leading = ''; $trailing = ''; + // @todo In the future we should make a single for the template engine with all media in it. This allows more flexibilty. foreach ($attachments['visual'] as $attachment) { - if (self::containsLink($item['body'], $attachment['url'])) { + if (self::containsLink($item['body'], $attachment['url'], $attachment['type'])) { continue; } @@ -2769,7 +2868,7 @@ class Item 'mime' => $attachment['mimetype'], ], ]); - if ($item['post-type'] == Item::PT_VIDEO) { + if (($item['post-type'] ?? null) == Item::PT_VIDEO) { $leading .= $media; } else { $trailing .= $media; @@ -2783,7 +2882,7 @@ class Item 'mime' => $attachment['mimetype'], ], ]); - if ($item['post-type'] == Item::PT_AUDIO) { + if (($item['post-type'] ?? null) == Item::PT_AUDIO) { $leading .= $media; } else { $trailing .= $media; @@ -2832,7 +2931,7 @@ class Item * @param string $body * @param string $content * @param bool $shared - * @param array $ignore_links + * @param array $ignore_links A list of URLs to ignore * @return string modified content */ private static function addLinkAttachment(array $attachments, string $body, string $content, bool $shared, array $ignore_links) @@ -2849,7 +2948,11 @@ class Item $found = true; } } - if (!$found) { + // @todo Judge between the links to use the one with most information + if (!$found && (empty($attachment) || !empty($link['author-name']) || + (empty($attachment['name']) && !empty($link['name'])) || + (empty($attachment['description']) && !empty($link['description'])) || + (empty($attachment['preview']) && !empty($link['preview'])))) { $attachment = $link; } } @@ -2877,14 +2980,56 @@ class Item $data['preview'] = $attachment['preview'] ?? ''; } } + + if (!empty($data['description']) && !empty($content)) { + similar_text($data['description'], $content, $percent); + } else { + $percent = 0; + } + + if (!empty($data['description']) && (($data['title'] == $data['description']) || ($percent > 95) || (strpos($content, $data['description']) !== false))) { + $data['description'] = ''; + } + + if (($data['author_name'] ?? '') == ($data['provider_name'] ?? '')) { + $data['author_name'] = ''; + } + + if (($data['author_url'] ?? '') == ($data['provider_url'] ?? '')) { + $data['author_url'] = ''; + } } elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) { $data = BBCode::getAttachmentData($match[1]); } DI::profiler()->saveTimestamp($stamp1, 'rendering'); - if (!empty($data) && !in_array($data['url'], $ignore_links)) { - // @todo Use a template - $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data); + if (isset($data['url']) && !in_array($data['url'], $ignore_links)) { + if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) { + $parts = parse_url($data['url']); + if (!empty($parts['scheme']) && !empty($parts['host'])) { + if (empty($data['provider_name'])) { + $data['provider_name'] = $parts['host']; + } + if (empty($data['provider_url']) || empty(parse_url($data['provider_url'], PHP_URL_SCHEME))) { + $data['provider_url'] = $parts['scheme'] . '://' . $parts['host']; + + if (!empty($parts['port'])) { + $data['provider_url'] .= ':' . $parts['port']; + } + } + } + + // @todo Use a template + $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data); + } elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) { + $rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [ + '$url' => $data['url'], + '$title' => $data['title'], + ]); + } else { + return $content; + } + if ($shared) { return str_replace(BBCode::BOTTOM_ANCHOR, BBCode::BOTTOM_ANCHOR . $rendered, $content); } else { @@ -2948,18 +3093,19 @@ class Item 'href' => "display/" . $item['guid'], 'orig' => "display/" . $item['guid'], 'title' => DI::l10n()->t('View on separate page'), - 'orig_title' => DI::l10n()->t('view on separate page'), + 'orig_title' => DI::l10n()->t('View on separate page'), ]; if (!empty($item['plink'])) { - $ret["href"] = DI::baseUrl()->remove($item['plink']); - $ret["title"] = DI::l10n()->t('link to source'); + $ret['href'] = DI::baseUrl()->remove($item['plink']); + $ret['title'] = DI::l10n()->t('Link to source'); } } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) { $ret = [ 'href' => $item['plink'], 'orig' => $item['plink'], - 'title' => DI::l10n()->t('link to source'), + 'title' => DI::l10n()->t('Link to source'), + 'orig_title' => DI::l10n()->t('Link to source'), ]; } else { $ret = []; @@ -3197,4 +3343,41 @@ class Item return true; } + + /** + * Improve the data in shared posts + * + * @param array $item + * @return string body + */ + public static function improveSharedDataInBody(array $item) + { + $shared = BBCode::fetchShareAttributes($item['body']); + if (empty($shared['link'])) { + return $item['body']; + } + + $id = self::fetchByLink($shared['link']); + Logger::info('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'callstack' => System::callstack()]); + if (!$id) { + return $item['body']; + } + + $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]); + if (!DBA::isResult($shared_item)) { + return $item['body']; + } + + $shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid']); + + if (!empty($shared_item['title'])) { + $shared_content .= '[h3]'.$shared_item['title'].'[/h3]'."\n"; + } + + $shared_content .= $shared_item['body']; + + $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content . '[/share]', $item['body']); + Logger::info('New shared data', ['uri-id' => $item['uri-id'], 'id' => $id, 'shared_item' => $shared_item]); + return $item['body']; + } }