<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\Post;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
* @param array $media
* @return array cleaned media array
*/
- private static function unsetEmptyFields(array $media)
+ private static function unsetEmptyFields(array $media): array
{
$fields = ['mimetype', 'height', 'width', 'size', 'preview', 'preview-height', 'preview-width', 'description'];
foreach ($fields as $field) {
* @param string $title
* @return string "[attach]" element
*/
- public static function getAttachElement(string $href, int $length, string $type, string $title = '')
+ public static function getAttachElement(string $href, int $length, string $type, string $title = ''): string
{
$media = self::fetchAdditionalData(['type' => self::DOCUMENT, 'url' => $href,
'size' => $length, 'mimetype' => $type, 'description' => $title]);
* @param array $media
* @return array media array with additional data
*/
- public static function fetchAdditionalData(array $media)
+ public static function fetchAdditionalData(array $media): array
{
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')[0] ?? '';
* @param array $media
* @return array media with added data
*/
- private static function fetchLocalData(array $media)
+ private static function fetchLocalData(array $media): array
{
if (!preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $media['url'] ?? '', $matches)) {
return $media;
* @param array $data
* @return array data array with the detected type
*/
- public static function addType(array $data)
+ public static function addType(array $data): array
{
if (empty($data['mimetype'])) {
Logger::info('No MimeType provided', ['media' => $data]);
* @param string $preview Preview picture
* @return boolean
*/
- private static function isPictureLink(string $page, string $preview)
+ private static function isPictureLink(string $page, string $preview): bool
{
return preg_match('#/photos/.*/image/#ism', $page) && preg_match('#/photo/.*-1\.#ism', $preview);
}
* @param string $body
* @return string Body without media links
*/
- public static function insertFromBody(int $uriid, string $body)
+ public static function insertFromBody(int $uriid, string $body): string
{
// Simplify image codes
$unshared_body = $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
}
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['preview'] ?? $attachment['url'], $attachment['type'])) {
self::insert($attachment);
*
* @param integer $uriid
* @param string $body
+ * @return void
*/
public static function insertFromRelevantUrl(int $uriid, string $body)
{
*
* @param integer $uriid
* @param string $body
+ * @return void
*/
public static function insertFromAttachmentData(int $uriid, string $body)
{
/**
* Retrieves the media attachments associated with the provided item ID.
*
- * @param int $uri_id
- * @param array $types
- * @return array
+ * @param int $uri_id URI id
+ * @param array $types Media types
+ * @return array|bool Array on success, false on error
* @throws \Exception
*/
public static function getByURIId(int $uri_id, array $types = [])
$condition = DBA::mergeConditions($condition, ['type' => $types]);
}
- return DBA::selectToArray('post-media', [], $condition);
+ return DBA::selectToArray('post-media', [], $condition, ['order' => ['id']]);
}
/**
* Checks if media attachments are associated with the provided item ID.
*
- * @param int $uri_id
- * @param array $types
- * @return array
+ * @param int $uri_id URI id
+ * @param array $types Media types
+ * @return bool Whether media attachment exists
* @throws \Exception
*/
- public static function existsByURIId(int $uri_id, array $types = [])
+ public static function existsByURIId(int $uri_id, array $types = []): bool
{
$condition = ['uri-id' => $uri_id];
/**
* Split the attachment media in the three segments "visual", "link" and "additional"
*
- * @param int $uri_id
- * @param string $guid
+ * @param int $uri_id URI id
+ * @param string $guid GUID
* @param array $links list of links that shouldn't be added
+ * @param bool $has_media
* @return array attachments
*/
- public static function splitAttachments(int $uri_id, string $guid = '', array $links = [])
+ public static function splitAttachments(int $uri_id, string $guid = '', array $links = [], bool $has_media = true): array
{
$attachments = ['visual' => [], 'link' => [], 'additional' => []];
+ if (!$has_media) {
+ return $attachments;
+ }
+
$media = self::getByURIId($uri_id);
if (empty($media)) {
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;
}
* @param string $body
* @return string body
*/
- public static function addAttachmentsToBody(int $uriid, string $body = '')
+ public static function addAttachmentsToBody(int $uriid, string $body = ''): string
{
if (empty($body)) {
$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
* 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
+ public static function getPreviewUrlForId(int $id, string $size = ''): string
{
$url = DI::baseUrl() . '/photo/preview/';
switch ($size) {
* 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
+ public static function getUrlForId(int $id, string $size = ''): string
{
$url = DI::baseUrl() . '/photo/media/';
switch ($size) {
projects / friendica.git / blobdiff