Store the webp image as a base64 file

Author: Cyperghost

com.woltlab.wcf/templates/shared_unfurlUrl.tpl

@@ -4,10 +4,10 @@
 	{else}
 		<div class="unfurlUrlCardContainer">
 			<div class="unfurlUrlCard{*
-				*}{if URL_UNFURLING_SAVE_IMAGES && $object->hasCoverImage()} unfurlUrlCardCoverImage{/if}{*
-				*}{if URL_UNFURLING_SAVE_IMAGES && $object->hasSquaredImage()} unfurlUrlCardSquaredImage{/if}{*
+				*}{if $object->hasCoverImage()} unfurlUrlCardCoverImage{/if}{*
+				*}{if $object->hasSquaredImage()} unfurlUrlCardSquaredImage{/if}{*
 			*}">
-				{if URL_UNFURLING_SAVE_IMAGES && !$object->getImageUrl()|empty}
+				{if $object->hasImageUrl()}
 					<img src="{$object->getImageUrl()}" height="{$object->height}" width="{$object->width}" class="unfurlUrlImage" alt="" loading="lazy">
 				{/if}
 				<div class="unfurlUrlInformation">

wcfsetup/install/files/lib/data/unfurl/url/UnfurlUrl.class.php

@@ -110,10 +110,10 @@ public function getHost(): string
      */
     public function getImageUrl(): ?string
     {
-        if ($this->isStored && $this->fileID) {
+        if (URL_UNFURLING_SAVE_IMAGES && $this->isStored && $this->fileID !== null) {
             $file = FileRuntimeCache::getInstance()->getObject($this->fileID);
 
-            return $file?->getFullSizeImageSource();
+            return 'data:image/webp;base64, ' . \file_get_contents($file->getPathname());
         } elseif (!empty($this->imageUrl)) {
             if (MODULE_IMAGE_PROXY) {
                 $key = CryptoUtil::createSignedString($this->imageUrl);
@@ -129,14 +129,25 @@ public function getImageUrl(): ?string
         return null;
     }
 
+    public function hasImageUrl(): bool
+    {
+        if (URL_UNFURLING_SAVE_IMAGES && $this->isStored && $this->fileID !== null) {
+            return true;
+        } elseif (!empty($this->imageUrl)) {
+            return true;
+        }
+
+        return false;
+    }
+
     public function hasCoverImage(): bool
     {
-        return $this->getImageType() === self::IMAGE_COVER && !empty($this->getImageUrl());
+        return $this->getImageType() === self::IMAGE_COVER && $this->hasImageUrl();
     }
 
     public function hasSquaredImage(): bool
     {
-        return $this->getImageType() === self::IMAGE_SQUARED && !empty($this->getImageUrl());
+        return $this->getImageType() === self::IMAGE_SQUARED && $this->hasImageUrl();
     }
 
     public function isPlainUrl(): bool

wcfsetup/install/files/lib/data/unfurl/url/UnfurlUrlEditor.class.php

@@ -32,9 +32,9 @@ class UnfurlUrlEditor extends DatabaseObjectEditor
     public static $baseClass = UnfurlUrl::class;
 
     /**
-     * Creates a webp thumbnail for the given file.
+     * Creates a webp thumbnail for the given file and saves it base64 encoded in a new `.bin` file.
      */
-    public static function createWebpThumbnail(string $file, string $originalFile): ?File
+    public static function saveUnfurlImage(string $file, string $originalFile): ?File
     {
         $imageData = \getimagesize($file);
 
@@ -43,6 +43,7 @@ public static function createWebpThumbnail(string $file, string $originalFile):
             return null;
         }
         $webpFile = FileUtil::getTemporaryFilename(extension: 'webp');
+        $binFile = FileUtil::getTemporaryFilename(extension: 'bin');
 
         try {
             $imageAdapter->loadFile($file);
@@ -52,9 +53,12 @@ public static function createWebpThumbnail(string $file, string $originalFile):
             // Clean up the thumbnail
             $thumbnail = null;
 
+            // Save the webp file as a base64 encoded binary file
+            \file_put_contents($binFile, \base64_encode(\file_get_contents($webpFile)));
+
             return FileEditor::createFromExistingFile(
-                $webpFile,
-                \pathinfo($originalFile, \PATHINFO_BASENAME) . ".webp",
+                $binFile,
+                \pathinfo($originalFile, \PATHINFO_BASENAME) . ".bin",
                 'com.woltlab.wcf.unfurl'
             );
         } catch (SystemException | ImageNotReadable $e) {
@@ -74,6 +78,7 @@ public static function createWebpThumbnail(string $file, string $originalFile):
         } finally {
             // Clean up temporary files
             @\unlink($webpFile);
+            @\unlink($binFile);
         }
     }
 }

wcfsetup/install/files/lib/system/background/job/UnfurlUrlBackgroundJob.class.php

@@ -157,8 +157,8 @@ private function getImageData(UnfurlResponse $unfurlResponse): array
                 'imageUrlHash' => \sha1($unfurlResponse->getImageUrl()),
                 'fileID' => $file?->fileID,
                 'isStored' => $file !== null ? 1 : 0,
-                'width' => $file?->width ?? $imageData[0],
-                'height' => $file?->height ?? $imageData[1],
+                'width' => $imageData[0],
+                'height' => $imageData[1],
             ];
         } catch (UrlInaccessible | DownloadFailed $e) {
             return [];
@@ -225,7 +225,7 @@ private function createFile(array $imageData, string $originalFile, string $imag
         $tmp = FileUtil::getTemporaryFilename(extension: $extension);
         \file_put_contents($tmp, $image);
 
-        $file = UnfurlUrlEditor::createWebpThumbnail(
+        $file = UnfurlUrlEditor::saveUnfurlImage(
             $tmp,
             \sprintf(
                 "%s.%s",

wcfsetup/install/files/lib/system/worker/UnfurlUrlRebuildDataWorker.class.php

@@ -56,7 +56,7 @@ public function execute()
                 continue;
             }
 
-            if (URL_UNFURLING_NO_IMAGES) {
+            if (!URL_UNFURLING_SAVE_IMAGES) {
                 // delete stored images
                 if ($unfurlUrl->fileID !== null) {
                     $deleteFileIDs[] = $unfurlUrl->fileID;
@@ -69,7 +69,7 @@ public function execute()
             } elseif ($unfurlUrl->fileID !== null) {
                 $fileLocation = $this->getOldFileLocation($unfurlUrl);
 
-                $file = UnfurlUrlEditor::createWebpThumbnail(
+                $file = UnfurlUrlEditor::saveUnfurlImage(
                     $fileLocation,
                     \pathinfo($unfurlUrl->imageUrl, PATHINFO_FILENAME)
                 );