X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=d9bd72d7c783d981de2d8338e5773494d698911b;hb=1a1e452faec7b06bc2be49289620cd59ac210c67;hp=5271dcefaab3cdb2c170a8a6034ad7c04939ec36;hpb=6bf5c344f57d4a9908901697f39f5ac687e2f53f;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 5271dcefaa..d9bd72d7c7 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -220,7 +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']); - Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body']); + Post\Media::insertFromRelevantUrl($item['uri-id'], $content_fields['raw-body'], $fields['body'], $item['author-network']); Post\Content::update($item['uri-id'], $content_fields); } @@ -385,6 +385,9 @@ class Item Post\ThreadUser::update($item['uri-id'], $item['uid'], ['hidden' => true]); } + DI::notify()->deleteForItem($item['uri-id']); + DI::notification()->deleteForItem($item['uri-id']); + Logger::info('Item has been marked for deletion.', ['id' => $item_id]); return true; @@ -815,6 +818,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 * @@ -831,11 +877,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; @@ -993,6 +1035,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)) { @@ -1145,7 +1188,8 @@ class Item $item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']); $item['raw-body'] = self::setHashtags($item['raw-body']); - Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body']); + $author = Contact::getById($item['author-id'], ['network']); + Post\Media::insertFromRelevantUrl($item['uri-id'], $item['raw-body'], $item['body'], $author['network'] ?? ''); // Check for hashtags in the body and repair or add hashtag links $item['body'] = self::setHashtags($item['body']); @@ -1585,7 +1629,7 @@ class Item 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])) { + !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) { 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']]); return 0; } @@ -1990,9 +2034,10 @@ 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 $uri uri of an item entry * @param string|null $host hostname for the GUID prefix * @return string Unique guid + * @throws \Exception */ public static function guidFromUri(string $uri, string $host = null): string { @@ -2003,11 +2048,16 @@ class Item // Remove the scheme to make sure that "https" and "http" doesn't make a difference unset($parsed['scheme']); + $hostPart = $host ?? $parsed['host'] ?? ''; + if (!$hostPart) { + Logger::warning('Empty host GUID part', ['uri' => $uri, 'host' => $host, 'parsed' => $parsed, 'callstack' => System::callstack(10)]); + } + // Glue it together to be able to make a hash from it $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', $hostPart) . '-' . hash('joaat', $host_id) . '-' . hash('fnv164', $host_id); } /** @@ -2228,6 +2278,11 @@ class Item return; } + $cdata = Contact::getPublicAndUserContactID($item['author-id'], $item['uid']); + if (empty($cdata['user']) || ($cdata['user'] != $item['contact-id'])) { + return; + } + if (!DBA::exists('contact', ['id' => $item['contact-id'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) { return; } @@ -2243,24 +2298,24 @@ class Item public static function isRemoteSelf(array $contact, array &$datarray): bool { - if (!$contact['remote_self']) { + if ($contact['remote_self'] != Contact::MIRROR_OWN_POST) { return false; } // Prevent the forwarding of posts that are forwarded - if (!empty($datarray["extid"]) && ($datarray["extid"] == Protocol::DFRN)) { + if (!empty($datarray['extid']) && ($datarray['extid'] == Protocol::DFRN)) { Logger::info('Already forwarded'); return false; } // Prevent to forward already forwarded posts - if ($datarray["app"] == DI::baseUrl()->getHostname()) { + if ($datarray['app'] == DI::baseUrl()->getHostname()) { Logger::info('Already forwarded (second test)'); return false; } // Only forward posts - if ($datarray["verb"] != Activity::POST) { + if ($datarray['verb'] != Activity::POST) { Logger::info('No post'); return false; } @@ -2272,53 +2327,48 @@ 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) { - $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], - ['uid' => $contact['uid'], 'self' => true]); - if (DBA::isResult($self)) { - $datarray['contact-id'] = $self["id"]; - - $datarray['owner-name'] = $self["name"]; - $datarray['owner-link'] = $self["url"]; - $datarray['owner-avatar'] = $self["thumb"]; - - $datarray['author-name'] = $datarray['owner-name']; - $datarray['author-link'] = $datarray['owner-link']; - $datarray['author-avatar'] = $datarray['owner-avatar']; - - unset($datarray['edited']); - - unset($datarray['network']); - unset($datarray['owner-id']); - unset($datarray['author-id']); - } - - if ($contact['network'] != Protocol::FEED) { - $old_uri_id = $datarray["uri-id"] ?? 0; - $datarray["guid"] = System::createUUID(); - unset($datarray["plink"]); - $datarray["uri"] = self::newURI($datarray["guid"]); - $datarray["uri-id"] = ItemURI::getIdByURI($datarray["uri"]); - $datarray["extid"] = Protocol::DFRN; - $urlpart = parse_url($datarray2['author-link']); - $datarray["app"] = $urlpart["host"]; - if (!empty($old_uri_id)) { - Post\Media::copy($old_uri_id, $datarray["uri-id"]); - } - unset($datarray["parent-uri"]); - unset($datarray["thr-parent"]); - } else { - $datarray['private'] = self::PUBLIC; - } + $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], + ['uid' => $contact['uid'], 'self' => true]); + if (!DBA::isResult($self)) { + Logger::error('Self contact not found', ['uid' => $contact['uid']]); + return false; } + $datarray['contact-id'] = $self['id']; + + $datarray['author-name'] = $datarray['owner-name'] = $self['name']; + $datarray['author-link'] = $datarray['owner-link'] = $self['url']; + $datarray['author-avatar'] = $datarray['owner-avatar'] = $self['thumb']; + + unset($datarray['edited']); + + unset($datarray['network']); + unset($datarray['owner-id']); + unset($datarray['author-id']); + if ($contact['network'] != Protocol::FEED) { + $old_uri_id = $datarray['uri-id'] ?? 0; + $datarray['guid'] = System::createUUID(); + unset($datarray['plink']); + $datarray['uri'] = self::newURI($datarray['guid']); + $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']); + $datarray['extid'] = Protocol::DFRN; + $urlpart = parse_url($datarray2['author-link']); + $datarray['app'] = $urlpart['host']; + if (!empty($old_uri_id)) { + Post\Media::copy($old_uri_id, $datarray['uri-id']); + } + + unset($datarray['parent-uri']); + unset($datarray['thr-parent']); + // Store the original post $result = self::insert($datarray2); Logger::info('remote-self post original item', ['contact' => $contact['url'], 'result'=> $result, 'item' => $datarray2]); } else { - $datarray["app"] = "Feed"; + $datarray['private'] = self::PUBLIC; + $datarray['app'] = 'Feed'; $result = true; } @@ -2961,7 +3011,7 @@ class Item $item['hashtags'] = $tags['hashtags']; $item['mentions'] = $tags['mentions']; - $body = $item['body'] ?? ''; + $body = $item['body'] = Post\Media::removeFromEndOfBody($item['body'] ?? ''); $fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media', 'quote-uri-id', 'post-type']; @@ -2974,7 +3024,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]]); @@ -3173,8 +3223,9 @@ class Item private static function addVisualAttachments(array $attachments, array $item, string $content, bool $shared): string { DI::profiler()->startRecording('rendering'); - $leading = ''; + $leading = ''; $trailing = ''; + $images = []; // @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) { @@ -3229,19 +3280,19 @@ class Item if (self::containsLink($item['body'], $src_url)) { continue; } - $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ - '$image' => [ - 'src' => $src_url, - 'preview' => $preview_url, - 'attachment' => $attachment, - ], - ]); - // On Diaspora posts the attached pictures are leading - if ($item['network'] == Protocol::DIASPORA) { - $leading .= $media; - } else { - $trailing .= $media; - } + $images[] = ['src' => $src_url, 'preview' => $preview_url, 'attachment' => $attachment]; + } + } + + foreach ($images as $image) { + $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [ + '$image' => $image, + ]); + // On Diaspora posts the attached pictures are leading + if ($item['network'] == Protocol::DIASPORA) { + $leading .= $media; + } else { + $trailing .= $media; } } @@ -3359,7 +3410,10 @@ class Item } // @todo Use a template - $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid); + $preview_mode = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'preview_mode', BBCode::PREVIEW_LARGE); + if ($preview_mode != BBCode::PREVIEW_NONE) { + $rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid, $preview_mode); + } } elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) { $rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [ '$url' => $data['url'],