Remove cover photo file strategy classes

com.woltlab.wcf/fileDelete.xml

@@ -2997,6 +2997,8 @@
 		<file>lib/system/template/plugin/TemplatePluginPrefilterIcon.class.php</file>
 		<file>lib/system/template/plugin/TemplatePluginPrefilterLang.class.php</file>
 		<file>lib/system/template/plugin/WordwrapModifierTemplatePlugin.class.php</file>
+		<file>lib/system/upload/UserCoverPhotoUploadFileSaveStrategy.class.php</file>
+		<file>lib/system/upload/UserCoverPhotoUploadFileValidationStrategy.class.php</file>
 		<file>lib/system/user/UserCollapsibleContentHandler.class.php</file>
 		<file>lib/system/user/activity/point/AbstractUserActivityPointObjectProcessor.class.php</file>
 		<file>lib/system/user/activity/point/DefaultUserActivityPointObjectProcessor.class.php</file>

wcfsetup/install/files/lib/data/user/UserProfile.class.php

@@ -415,14 +415,12 @@ public function canSeeAvatar()
     public function getCoverPhoto($isACP = false)
     {
         if ($this->coverPhoto === null) {
-            if ($this->coverPhotoHash) {
+            if ($this->coverPhotoFileID) {
                 if ($isACP || !$this->disableCoverPhoto) {
                     if ($this->canSeeCoverPhoto()) {
                         $this->coverPhoto = new UserCoverPhoto(
                             $this->userID,
-                            $this->coverPhotoHash,
-                            $this->coverPhotoExtension,
-                            $this->coverPhotoHasWebP
+                            FileRuntimeCache::getInstance()->getObject($this->coverPhotoFileID)
                         );
                     }
                 }

wcfsetup/install/files/lib/data/user/UserProfileAction.class.php

@@ -17,9 +17,6 @@
 use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 use wcf\system\option\user\UserOptionHandler;
 use wcf\system\upload\UploadFile;
-use wcf\system\upload\UploadHandler;
-use wcf\system\upload\UserCoverPhotoUploadFileSaveStrategy;
-use wcf\system\upload\UserCoverPhotoUploadFileValidationStrategy;
 use wcf\system\user\group\assignment\UserGroupAssignmentHandler;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\WCF;
@@ -599,128 +596,6 @@ public function setAvatar(): array
         ];
     }
 
-    /**
-     * Validates the 'uploadCoverPhoto' method.
-     *
-     * @throws  PermissionDeniedException
-     * @throws  UserInputException
-     * @since   3.1
-     */
-    public function validateUploadCoverPhoto()
-    {
-        WCF::getSession()->checkPermissions(['user.profile.coverPhoto.canUploadCoverPhoto']);
-
-        $this->readInteger('userID', true);
-        // The `userID` parameter did not exist in 3.1, defaulting to the own user for backwards compatibility.
-        if (!$this->parameters['userID']) {
-            $this->parameters['userID'] = WCF::getUser()->userID;
-        }
-
-        $this->user = new User($this->parameters['userID']);
-        if (!$this->user->userID) {
-            throw new UserInputException('userID');
-        } elseif ($this->user->userID == WCF::getUser()->userID && WCF::getUser()->disableCoverPhoto) {
-            throw new PermissionDeniedException();
-        } elseif (
-            $this->user->userID != WCF::getUser()->userID
-            && (!$this->user->canEdit() || !WCF::getSession()->getPermission('admin.user.canDisableCoverPhoto'))
-        ) {
-            throw new PermissionDeniedException();
-        }
-
-        // validate uploaded file
-        if (!isset($this->parameters['__files']) || \count($this->parameters['__files']->getFiles()) != 1) {
-            throw new UserInputException('files');
-        }
-
-        /** @var UploadHandler $uploadHandler */
-        $uploadHandler = $this->parameters['__files'];
-
-        $this->uploadFile = $uploadHandler->getFiles()[0];
-
-        $uploadHandler->validateFiles(new UserCoverPhotoUploadFileValidationStrategy());
-    }
-
-    /**
-     * Uploads a cover photo.
-     *
-     * @since   3.1
-     */
-    public function uploadCoverPhoto()
-    {
-        $saveStrategy = new UserCoverPhotoUploadFileSaveStrategy(
-            (!empty($this->parameters['userID']) ? \intval($this->parameters['userID']) : WCF::getUser()->userID)
-        );
-        /** @noinspection PhpUndefinedMethodInspection */
-        $this->parameters['__files']->saveFiles($saveStrategy);
-
-        if ($this->uploadFile->getValidationErrorType()) {
-            return [
-                'filesize' => $this->uploadFile->getFilesize(),
-                'errorMessage' => WCF::getLanguage()->getDynamicVariable(
-                    'wcf.user.coverPhoto.upload.error.' . $this->uploadFile->getValidationErrorType(),
-                    [
-                        'file' => $this->uploadFile,
-                    ]
-                ),
-                'errorType' => $this->uploadFile->getValidationErrorType(),
-            ];
-        } else {
-            return [
-                'url' => $saveStrategy->getCoverPhoto()->getURL(),
-            ];
-        }
-    }
-
-    /**
-     * Validates the `deleteCoverPhoto` action.
-     *
-     * @throws  PermissionDeniedException
-     * @throws  UserInputException
-     */
-    public function validateDeleteCoverPhoto()
-    {
-        $this->readInteger('userID', true);
-        // The `userID` parameter did not exist in 3.1, defaulting to the own user for backwards compatibility.
-        if (!$this->parameters['userID']) {
-            $this->parameters['userID'] = WCF::getUser()->userID;
-        }
-
-        $this->user = new User($this->parameters['userID']);
-        if (!$this->user->userID) {
-            throw new UserInputException('userID');
-        } elseif (
-            $this->user->userID != WCF::getUser()->userID
-            && (!$this->user->canEdit() || !WCF::getSession()->getPermission('admin.user.canDisableCoverPhoto'))
-        ) {
-            throw new PermissionDeniedException();
-        }
-    }
-
-    /**
-     * Deletes the cover photo of the active user.
-     *
-     * @return  string[]    link to the new cover photo
-     */
-    public function deleteCoverPhoto()
-    {
-        if ($this->user->coverPhotoHash) {
-            UserProfileRuntimeCache::getInstance()->getObject($this->user->userID)->getCoverPhoto()->delete();
-
-            (new UserEditor($this->user))->update([
-                'coverPhotoHash' => null,
-                'coverPhotoExtension' => '',
-            ]);
-        }
-
-        // force-reload the user profile to use a predictable code-path to fetch the cover photo
-        UserProfileRuntimeCache::getInstance()->removeObject($this->user->userID);
-
-        return [
-            'url' => UserProfileRuntimeCache::getInstance()->getObject($this->user->userID)->getCoverPhoto()->getURL(),
-        ];
-    }
-
     /**
      * Returns the user option handler object.
      *

wcfsetup/install/files/lib/data/user/cover/photo/IUserCoverPhoto.class.php

@@ -11,11 +11,6 @@
  */
 interface IUserCoverPhoto
 {
-    /**
-     * Deletes this cover photo.
-     */
-    public function delete();
-
     /**
      * Returns the physical location of this cover photo.
      */

wcfsetup/install/files/lib/data/user/cover/photo/UserCoverPhoto.class.php

@@ -2,8 +2,7 @@
 
 namespace wcf\data\user\cover\photo;
 
-use wcf\system\WCF;
-use wcf\util\ImageUtil;
+use wcf\data\file\File;
 
 /**
  * Represents a user's cover photo.
@@ -12,119 +11,47 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
-class UserCoverPhoto implements IWebpUserCoverPhoto
+final class UserCoverPhoto implements IUserCoverPhoto
 {
-    /**
-     * file extension
-     * @var string
-     */
-    protected $coverPhotoExtension;
+    public const MAX_HEIGHT = 800;
 
-    /**
-     * file hash
-     * @var string
-     */
-    protected $coverPhotoHash;
+    public const MAX_WIDTH = 2000;
 
-    /**
-     * @var int
-     */
-    protected $coverPhotoHasWebP = 0;
-
-    /**
-     * user id
-     * @var int
-     */
-    protected $userID;
+    public const MIN_HEIGHT = 200;
 
-    const MAX_HEIGHT = 800;
-
-    const MAX_WIDTH = 2000;
-
-    const MIN_HEIGHT = 200;
-
-    const MIN_WIDTH = 500;
+    public const MIN_WIDTH = 500;
 
     /**
      * UserCoverPhoto constructor.
-     *
-     * @param int $userID
-     * @param string $coverPhotoHash
-     * @param string $coverPhotoExtension
      */
-    public function __construct($userID, $coverPhotoHash, $coverPhotoExtension, int $coverPhotoHasWebP)
-    {
-        $this->userID = $userID;
-        $this->coverPhotoHash = $coverPhotoHash;
-        $this->coverPhotoExtension = $coverPhotoExtension;
-        $this->coverPhotoHasWebP = $coverPhotoHasWebP;
+    public function __construct(
+        protected readonly int $userID,
+        protected readonly File $file
+    ) {
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function delete()
-    {
-        if (\file_exists($this->getLocation(false))) {
-            @\unlink($this->getLocation(false));
-        }
-
-        if (\file_exists($this->getLocation(true))) {
-            @\unlink($this->getLocation(true));
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
+    #[\Override]
     public function getLocation(?bool $forceWebP = null): string
     {
-        return WCF_DIR . 'images/coverPhotos/' . $this->getFilename($forceWebP);
+        return $this->file->getPath();
     }
 
-    /**
-     * @inheritDoc
-     */
+    #[\Override]
     public function getURL(?bool $forceWebP = null): string
     {
-        return WCF::getPath() . 'images/coverPhotos/' . $this->getFilename($forceWebP);
+        return $this->file->getLink();
     }
 
-    /**
-     * @inheritDoc
-     */
+    #[\Override]
     public function getFilename(?bool $forceWebP = null): string
     {
-        $useWebP = $forceWebP || ($this->coverPhotoHasWebP && $forceWebP === null && ImageUtil::browserSupportsWebp());
-
-        return \substr(
-            $this->coverPhotoHash,
-            0,
-            2
-        ) . '/' . $this->userID . '-' . $this->coverPhotoHash . '.' . ($useWebP ? 'webp' : $this->coverPhotoExtension);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createWebpVariant()
-    {
-        if ($this->coverPhotoHasWebP) {
-            return;
-        }
-
-        $sourceLocation = $this->getLocation($this->coverPhotoExtension === 'webp');
-        $outputFilenameWithoutExtension = \preg_replace('~\.[a-z]+$~', '', $sourceLocation);
-
-        return ImageUtil::createWebpVariant($sourceLocation, $outputFilenameWithoutExtension);
+        return $this->file->filename;
     }
 
     /**
      * Returns the minimum and maximum dimensions for cover photos.
-     *
-     * @return      array
      */
-    public static function getCoverPhotoDimensions()
+    public static function getCoverPhotoDimensions(): array
     {
         return [
             'max' => [