use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
+use Friendica\Model\Photo;
use Friendica\Model\Post;
+use Friendica\Network\HTTPClientOptions;
use Friendica\Util\Images;
+use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy;
use Friendica\Util\Strings;
*/
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]);
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]);
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
*
}
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 (Item::containsLink($unshared_body, $attachment['url'], $attachment['type'])) {
+ if (Item::containsLink($unshared_body, $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
self::insert($attachment);
}
}
*
* @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 = [])
return $attachments;
}
- $height = 0;
+ $heights = [];
$selected = '';
$previews = [];
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;
$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;
}
$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'], $media['type'])) {
+ if (Item::containsLink($body, $media['preview'] ?? $media['url'], $media['type'])) {
continue;
}
* Get preview link for given media id
*
* @param integer $id media id
- * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @param string $size One of the Proxy::SIZE_* constants
* @return string preview link
*/
public static function getPreviewUrlForId(int $id, string $size = ''):string
* Get media link for given media id
*
* @param integer $id media id
- * @param string $size One of the ProxyUtils::SIZE_* constants
+ * @param string $size One of the Proxy::SIZE_* constants
* @return string media link
*/
public static function getUrlForId(int $id, string $size = ''):string
projects / friendica.git / blobdiff