Merge pull request #12586 from MrPetovan/task/entitize-delivery-queue

[friendica.git] / src / Module / Photo.php

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 112f01d4535ae34608dd5e58509b69ee890b9ee1..3f18058de28cf3899cbe5770751379e869da4b96 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,7 +24,6 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -45,6 +44,7 @@ use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy;
+use Friendica\Worker\UpdateContact;
 
 /**
  * Photo Module
@@ -154,8 +154,12 @@ class Photo extends BaseModule
                $stamp = microtime(true);
 
                $imgdata = MPhoto::getImageDataForPhoto($photo);
-               if (empty($imgdata)) {
+               if (empty($imgdata) && empty($photo['blurhash'])) {
                        throw new HTTPException\NotFoundException();
+               } elseif (empty($imgdata) && !empty($photo['blurhash'])) {
+                       $image = New Image('', 'image/png');
+                       $image->getFromBlurHash($photo['blurhash'], $photo['width'], $photo['height']);
+                       $imgdata = $image->asString();
                }
 
                // The mimetype for an external or system resource can only be known reliably after it had been fetched
@@ -179,6 +183,12 @@ class Photo extends BaseModule
                        throw new HTTPException\InternalServerErrorException($error);
                }
 
+               if (!empty($request['static'])) {
+                       $img = new Image($imgdata, $photo['type']);
+                       $img->toStatic();
+                       $imgdata = $img->asString();
+               }
+
                // if customsize is set and image is not a gif, resize it
                if ($photo['type'] !== 'image/gif' && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
                        $img = new Image($imgdata, $photo['type']);
@@ -241,14 +251,18 @@ class Photo extends BaseModule
        {
                switch($type) {
                        case 'preview':
-                               $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $id]);
+                               $media = DBA::selectFirst('post-media', ['preview', 'url', 'preview-height', 'preview-width', 'height', 'width', 'mimetype', 'type', 'uri-id', 'blurhash'], ['id' => $id]);
                                if (empty($media)) {
                                        return false;
                                }
-                               $url = $media['preview'];
+                               $url    = $media['preview'];
+                               $width  = $media['preview-width'];
+                               $height = $media['preview-height'];
 
                                if (empty($url) && ($media['type'] == Post\Media::IMAGE)) {
-                                       $url = $media['url'];
+                                       $url    = $media['url'];
+                                       $width  = $media['width'];
+                                       $height = $media['height'];
                                }
 
                                if (empty($url)) {
@@ -259,9 +273,9 @@ class Photo extends BaseModule
                                        return MPhoto::getPhoto($matches[1], $matches[2]);
                                }
 
-                               return MPhoto::createPhotoForExternalResource($url, (int)Session::getLocalUser(), $media['mimetype'] ?? '');
+                               return MPhoto::createPhotoForExternalResource($url, (int)DI::userSession()->getLocalUserId(), $media['mimetype'] ?? '', $media['blurhash'], $width, $height);
                        case 'media':
-                               $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $id, 'type' => Post\Media::IMAGE]);
+                               $media = DBA::selectFirst('post-media', ['url', 'height', 'width', 'mimetype', 'uri-id', 'blurhash'], ['id' => $id, 'type' => Post\Media::IMAGE]);
                                if (empty($media)) {
                                        return false;
                                }
@@ -270,16 +284,16 @@ class Photo extends BaseModule
                                        return MPhoto::getPhoto($matches[1], $matches[2]);
                                }
 
-                               return MPhoto::createPhotoForExternalResource($media['url'], (int)Session::getLocalUser(), $media['mimetype']);
+                               return MPhoto::createPhotoForExternalResource($media['url'], (int)DI::userSession()->getLocalUserId(), $media['mimetype'], $media['blurhash'], $media['width'], $media['height']);
                        case 'link':
-                               $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $id]);
+                               $link = DBA::selectFirst('post-link', ['url', 'mimetype', 'blurhash', 'width', 'height'], ['id' => $id]);
                                if (empty($link)) {
                                        return false;
                                }
 
-                               return MPhoto::createPhotoForExternalResource($link['url'], (int)Session::getLocalUser(), $link['mimetype'] ?? '');
+                               return MPhoto::createPhotoForExternalResource($link['url'], (int)DI::userSession()->getLocalUserId(), $link['mimetype'] ?? '', $link['blurhash'] ?? '', $link['width'] ?? 0, $link['height'] ?? 0);
                        case 'contact':
-                               $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'xmpp', 'addr', 'network', 'failed', 'updated'];
+                               $fields = ['uid', 'uri-id', 'url', 'nurl', 'avatar', 'photo', 'blurhash', 'xmpp', 'addr', 'network', 'failed', 'updated'];
                                $contact = Contact::getById($id, $fields);
                                if (empty($contact)) {
                                        return false;
@@ -338,8 +352,12 @@ class Photo extends BaseModule
                                                        Logger::debug('Got return code for avatar', ['return code' => $curlResult->getReturnCode(), 'cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
                                                }
                                                if ($update) {
-                                                       Logger::info('Invalid file, contact update initiated', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
-                                                       Worker::add(Worker::PRIORITY_LOW, 'UpdateContact', $id);
+                                                       try {
+                                                               UpdateContact::add(Worker::PRIORITY_LOW, $id);
+                                                               Logger::info('Invalid file, contact update initiated', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
+                                                       } catch (\InvalidArgumentException $e) {
+                                                               Logger::notice($e->getMessage(), ['id' => $id, 'contact' => $contact]);
+                                                       }
                                                } else {
                                                        Logger::info('Invalid file', ['cid' => $id, 'url' => $contact['url'], 'avatar' => $url]);
                                                }
@@ -351,7 +369,11 @@ class Photo extends BaseModule
                                                Logger::debug('Expected Content-Type', ['mime' => $mimetext, 'url' => $url]);
                                        }
                                }
-                               if (empty($mimetext)) {
+                               if (empty($mimetext) && !empty($contact['blurhash'])) {
+                                       $image = New Image('', 'image/png');
+                                       $image->getFromBlurHash($contact['blurhash'], $customsize, $customsize);
+                                       return MPhoto::createPhotoForImageData($image->asString());
+                               } elseif (empty($mimetext)) {
                                        if ($customsize <= Proxy::PIXEL_MICRO) {
                                                $url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_MICRO);
                                        } elseif ($customsize <= Proxy::PIXEL_THUMB) {
@@ -360,7 +382,7 @@ class Photo extends BaseModule
                                                $url = Contact::getDefaultAvatar($contact ?: [], Proxy::SIZE_SMALL);
                                        }
                                }
-                               return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
+                               return MPhoto::createPhotoForExternalResource($url, 0, $mimetext, $contact['blurhash'] ?? null, $customsize, $customsize);
                        case 'header':
                                $fields = ['uid', 'url', 'header', 'network', 'gsid'];
                                $contact = Contact::getById($id, $fields);