Changes:

[friendica.git] / src / Model / Post / Media.php

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 343dc8f0e05697ec10ae9d100a7e97acc006bc7c..2b17614e89b1ce54ae4c425433d049138c8be149 100644 (file)
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -1,6 +1,6 @@
 <?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
  *
@@ -30,7 +30,8 @@ use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
-use Friendica\Network\HTTPClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -108,7 +109,7 @@ class Media
         * @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) {
@@ -144,7 +145,7 @@ class Media
         * @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]);
@@ -159,7 +160,7 @@ class Media
         * @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);
@@ -168,7 +169,13 @@ class Media
                // Fetch the mimetype or size if missing.
                if (empty($media['mimetype']) || empty($media['size'])) {
                        $timeout = DI::config()->get('system', 'xrd_timeout');
-                       $curlResult = DI::httpClient()->head($media['url'], [HTTPClientOptions::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] ?? '';
@@ -228,7 +235,7 @@ class Media
         * @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;
@@ -259,7 +266,7 @@ class 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]);
@@ -311,7 +318,7 @@ class Media
         * @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);
        }
@@ -323,7 +330,7 @@ class Media
         * @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);
@@ -406,6 +413,7 @@ class Media
         *
         * @param integer $uriid
         * @param string $body
+        * @return void
         */
        public static function insertFromRelevantUrl(int $uriid, string $body)
        {
@@ -441,6 +449,7 @@ class Media
         *
         * @param integer $uriid
         * @param string $body
+        * @return void
         */
        public static function insertFromAttachmentData(int $uriid, string $body)
        {
@@ -499,9 +508,9 @@ class Media
        /**
         * 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 = [])
@@ -512,18 +521,18 @@ class Media
                        $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];
 
@@ -537,15 +546,20 @@ class Media
        /**
         * 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;
@@ -636,7 +650,7 @@ class Media
         * @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]);
@@ -686,10 +700,10 @@ class Media
         * 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) {
@@ -716,10 +730,10 @@ class Media
         * 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) {