X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPost%2FMedia.php;h=b783fb6a4fc6c8532c1c2a639ea82c9b7952dce2;hb=171354181d7effb5f292b85531ee587c809a8942;hp=b975a09022a31186dbd10783b88e8f8cf8a64712;hpb=53d4312903749b7b09a63b2462d89a88789ae92a;p=friendica.git diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index b975a09022..b783fb6a4f 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -1,6 +1,6 @@ $media['uri-id'], 'preview' => $media['url']])) { + Logger::info('Media already exists as preview', ['uri-id' => $media['uri-id'], 'url' => $media['url'], 'callstack' => System::callstack()]); + return; + } + // "document" has got the lowest priority. So when the same file is both attached as document // and embedded as picture then we only store the picture or replace the document $found = DBA::selectFirst('post-media', ['type'], ['uri-id' => $media['uri-id'], 'url' => $media['url']]); @@ -153,16 +162,26 @@ class Media */ public static function fetchAdditionalData(array $media) { + if (Network::isLocalLink($media['url'])) { + $media = self::fetchLocalData($media); + } + // Fetch the mimetype or size if missing. if (empty($media['mimetype']) || empty($media['size'])) { $timeout = DI::config()->get('system', 'xrd_timeout'); - $curlResult = DI::httpRequest()->head($media['url'], ['timeout' => $timeout]); + $curlResult = DI::httpClient()->head($media['url'], [HttpClientOptions::TIMEOUT => $timeout]); + + // Workaround for systems that can't handle a HEAD request + if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() == 405)) { + $curlResult = DI::httpClient()->get($media['url'], HttpClientAccept::DEFAULT, [HttpClientOptions::TIMEOUT => $timeout]); + } + if ($curlResult->isSuccess()) { if (empty($media['mimetype'])) { - $media['mimetype'] = $curlResult->getHeader('Content-Type'); + $media['mimetype'] = $curlResult->getHeader('Content-Type')[0] ?? ''; } if (empty($media['size'])) { - $media['size'] = (int)$curlResult->getHeader('Content-Length'); + $media['size'] = (int)($curlResult->getHeader('Content-Length')[0] ?? 0); } } else { Logger::notice('Could not fetch head', ['media' => $media]); @@ -211,6 +230,36 @@ class Media return $media; } + /** + * Fetch media data from local resources + * @param array $media + * @return array media with added data + */ + private static function fetchLocalData(array $media) + { + if (!preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $media['url'] ?? '', $matches)) { + return $media; + } + $photo = Photo::selectFirst([], ['resource-id' => $matches[1], 'scale' => $matches[2]]); + if (!empty($photo)) { + $media['mimetype'] = $photo['type']; + $media['size'] = $photo['datasize']; + $media['width'] = $photo['width']; + $media['height'] = $photo['height']; + } + + if (!preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $media['preview'] ?? '', $matches)) { + return $media; + } + $photo = Photo::selectFirst([], ['resource-id' => $matches[1], 'scale' => $matches[2]]); + if (!empty($photo)) { + $media['preview-width'] = $photo['width']; + $media['preview-height'] = $photo['height']; + } + + return $media; + } + /** * Add the detected type to the media array * @@ -284,9 +333,13 @@ class Media public static function insertFromBody(int $uriid, string $body) { // Simplify image codes - $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body); + $unshared_body = $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body); - $unshared_body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); + // Only remove the shared data from "real" reshares + $shared = BBCode::fetchShareAttributes($body); + if (!empty($shared['guid'])) { + $unshared_body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); + } $attachments = []; if (preg_match_all("#\[url=([^\]]+?)\]\s*\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]\s*\[/url\]#ism", $body, $pictures, PREG_SET_ORDER)) { @@ -342,8 +395,12 @@ class Media } foreach ($attachments as $attachment) { + if (Post\Link::exists($uriid, $attachment['preview'] ?? $attachment['url'])) { + continue; + } + // Only store attachments that are part of the unshared body - if (strpos($unshared_body, $attachment['url']) !== false) { + if (Item::containsLink($unshared_body, $attachment['preview'] ?? $attachment['url'], $attachment['type'])) { self::insert($attachment); } } @@ -359,8 +416,12 @@ class Media */ public static function insertFromRelevantUrl(int $uriid, string $body) { - // Don't look at the shared content - $body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); + // Only remove the shared data from "real" reshares + $shared = BBCode::fetchShareAttributes($body); + if (!empty($shared['guid'])) { + // Don't look at the shared content + $body = preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body); + } // Remove all hashtags and mentions $body = preg_replace("/([#@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '', $body); @@ -458,7 +519,7 @@ class Media $condition = DBA::mergeConditions($condition, ['type' => $types]); } - return DBA::selectToArray('post-media', [], $condition); + return DBA::selectToArray('post-media', [], $condition, ['order' => ['id']]); } /** @@ -482,10 +543,10 @@ class Media /** * Split the attachment media in the three segments "visual", "link" and "additional" - * - * @param int $uri_id + * + * @param int $uri_id * @param string $guid - * @param array $links ist of links that shouldn't be added + * @param array $links list of links that shouldn't be added * @return array attachments */ public static function splitAttachments(int $uri_id, string $guid = '', array $links = []) @@ -497,8 +558,9 @@ class Media return $attachments; } - $height = 0; + $heights = []; $selected = ''; + $previews = []; foreach ($media as $medium) { foreach ($links as $link) { @@ -507,6 +569,17 @@ class Media } } + // Avoid adding separate media entries for previews + foreach ($previews as $preview) { + if (Strings::compareLink($preview, $medium['url'])) { + continue 2; + } + } + + if (!empty($medium['preview'])) { + $previews[] = $medium['preview']; + } + $type = explode('/', current(explode(';', $medium['mimetype']))); if (count($type) < 2) { Logger::info('Unknown MimeType', ['type' => $type, 'media' => $medium]); @@ -529,14 +602,11 @@ class Media in_array($filetype, ['audio', 'image'])) { $attachments['visual'][] = $medium; } elseif (($medium['type'] == self::VIDEO) || ($filetype == 'video')) { - if (strpos($medium['url'], $guid) !== false) { + if (!empty($medium['height'])) { // Peertube videos are delivered in many different resolutions. We pick a moderate one. - // By checking against the GUID we also ensure to only work this way on Peertube posts. - // This wouldn't be executed when someone for example on Mastodon was sharing multiple videos in a single post. - if (empty($height) || ($height > $medium['height']) && ($medium['height'] >= 480)) { - $height = $medium['height']; - $selected = $medium['url']; - } + // Since only Peertube provides a "height" parameter, this wouldn't be executed + // when someone for example on Mastodon was sharing multiple videos in a single post. + $heights[$medium['height']] = $medium['url']; $video[$medium['url']] = $medium; } else { $attachments['visual'][] = $medium; @@ -545,13 +615,24 @@ class Media $attachments['additional'][] = $medium; } } - if (!empty($selected)) { - $attachments['visual'][] = $video[$selected]; - unset($video[$selected]); - foreach ($video as $element) { - $attachments['additional'][] = $element; + + if (!empty($heights)) { + ksort($heights); + foreach ($heights as $height => $url) { + if (empty($selected) || $height <= 480) { + $selected = $url; + } + } + + if (!empty($selected)) { + $attachments['visual'][] = $video[$selected]; + unset($video[$selected]); + foreach ($video as $element) { + $attachments['additional'][] = $element; + } } } + return $attachments; } @@ -576,7 +657,7 @@ class Media $body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body); foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) { - if (Item::containsLink($body, $media['url'])) { + if (Item::containsLink($body, $media['preview'] ?? $media['url'], $media['type'])) { continue; } @@ -607,4 +688,64 @@ class Media return $body; } + + /** + * Get preview link for given media id + * + * @param integer $id media id + * @param string $size One of the Proxy::SIZE_* constants + * @return string preview link + */ + public static function getPreviewUrlForId(int $id, string $size = ''):string + { + $url = DI::baseUrl() . '/photo/preview/'; + switch ($size) { + case Proxy::SIZE_MICRO: + $url .= Proxy::PIXEL_MICRO . '/'; + break; + case Proxy::SIZE_THUMB: + $url .= Proxy::PIXEL_THUMB . '/'; + break; + case Proxy::SIZE_SMALL: + $url .= Proxy::PIXEL_SMALL . '/'; + break; + case Proxy::SIZE_MEDIUM: + $url .= Proxy::PIXEL_MEDIUM . '/'; + break; + case Proxy::SIZE_LARGE: + $url .= Proxy::PIXEL_LARGE . '/'; + break; + } + return $url . $id; + } + + /** + * Get media link for given media id + * + * @param integer $id media id + * @param string $size One of the Proxy::SIZE_* constants + * @return string media link + */ + public static function getUrlForId(int $id, string $size = ''):string + { + $url = DI::baseUrl() . '/photo/media/'; + switch ($size) { + case Proxy::SIZE_MICRO: + $url .= Proxy::PIXEL_MICRO . '/'; + break; + case Proxy::SIZE_THUMB: + $url .= Proxy::PIXEL_THUMB . '/'; + break; + case Proxy::SIZE_SMALL: + $url .= Proxy::PIXEL_SMALL . '/'; + break; + case Proxy::SIZE_MEDIUM: + $url .= Proxy::PIXEL_MEDIUM . '/'; + break; + case Proxy::SIZE_LARGE: + $url .= Proxy::PIXEL_LARGE . '/'; + break; + } + return $url . $id; + } }