Use central function to fetch the global directory

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

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index ada1cc070a2ca942abdb8eb3e7abe477b020b17f..b783fb6a4fc6c8532c1c2a639ea82c9b7952dce2 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;
@@ -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] ?? '';
@@ -388,6 +395,10 @@ 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 (Item::containsLink($unshared_body, $attachment['preview'] ?? $attachment['url'], $attachment['type'])) {
                                self::insert($attachment);
@@ -508,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']]);
        }
 
        /**
@@ -547,7 +558,7 @@ class Media
                        return $attachments;
                }
 
-               $height = 0;
+               $heights = [];
                $selected = '';
                $previews = [];
 
@@ -591,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;
@@ -607,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;
        }
 
@@ -674,7 +693,7 @@ 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
@@ -704,7 +723,7 @@ 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