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 78e403e6c751cda090c977b82a99ef33e1935d6a..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
  *
@@ -44,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
@@ -285,14 +286,14 @@ class Photo extends BaseModule
 
                                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)DI::userSession()->getLocalUserId(), $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;
@@ -351,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]);
                                                }
@@ -364,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) {
@@ -373,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);