Merge remote-tracking branch 'upstream/2023.09-rc' into user-defined-channels

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

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index 2d7df08096b22d498159e0deeb5cfba3dc0245ea..64f44c198d6bc2f20640c65bd1e6e82c2f9b328a 100644 (file)
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -1012,25 +1012,9 @@ class Media
         */
        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;
+               return '/photo/preview/' .
+                       (Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') .
+                       $id;
        }
 
        /**
@@ -1042,24 +1026,8 @@ class Media
         */
        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;
+               return '/photo/media/' .
+                       (Proxy::getPixelsFromSize($size) ? Proxy::getPixelsFromSize($size) . '/' : '') .
+                       $id;
        }
 }