Use FileRuntimeCache

Show notification when avatar changes in acp

Author: Cyperghost

ts/WoltLabSuite/Core/Component/User/Avatar.ts

@@ -10,6 +10,7 @@
 import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
 import { wheneverFirstSeen } from "WoltLabSuite/Core/Helper/Selector";
 import { dialogFactory } from "WoltLabSuite/Core/Component/Dialog";
+import { show as showNotification } from "WoltLabSuite/Core/Ui/Notification";
 import UiCloseOverlay from "WoltLabSuite/Core/Ui/CloseOverlay";
 
 interface Result {
@@ -27,8 +28,8 @@ async function editAvatar(button: HTMLElement): Promise<void> {
     if (avatarForm) {
       // In the ACP, the form should not be reloaded after changing the avatar.
       avatarForm.querySelector<HTMLImageElement>("img.userAvatarImage")!.src = result.avatar;
+      showNotification();
     } else {
-      // TODO can we simple replace all avatar images?
       window.location.reload();
     }
   }

wcfsetup/install/files/js/WoltLabSuite/Core/Component/User/Avatar.js

@@ -11,6 +11,7 @@
 use wcf\data\user\UserEditor;
 use wcf\data\user\UserProfileAction;
 use wcf\form\AbstractForm;
+use wcf\system\cache\runtime\FileRuntimeCache;
 use wcf\system\cache\runtime\UserProfileRuntimeCache;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -290,7 +291,7 @@ public function readData()
 
         // get the avatar object
         if ($this->avatarType == 'custom' && $this->user->avatarFileID) {
-            $this->userAvatar = new File($this->user->avatarFileID);
+            $this->userAvatar = FileRuntimeCache::getInstance()->getObject($this->user->avatarFileID);
         }
 
         // get the user cover photo object

wcfsetup/install/files/lib/acp/form/UserEditForm.class.php

@@ -3,11 +3,11 @@
 namespace wcf\data\attachment;
 
 use wcf\data\DatabaseObject;
+use wcf\data\file\File;
 use wcf\data\ILinkableObject;
 use wcf\data\IThumbnailFile;
-use wcf\data\file\File;
-use wcf\data\file\thumbnail\FileThumbnailList;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\cache\runtime\FileRuntimeCache;
 use wcf\system\request\IRouteController;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
@@ -375,14 +375,7 @@ public function getFile(): ?File
         }
 
         if (!isset($this->file)) {
-            $this->file = new File($fileID);
-
-            $thumbnailList = new FileThumbnailList();
-            $thumbnailList->getConditionBuilder()->add("fileID = ?", [$this->file->fileID]);
-            $thumbnailList->readObjects();
-            foreach ($thumbnailList as $thumbnail) {
-                $this->file->addThumbnail($thumbnail);
-            }
+            $this->file = FileRuntimeCache::getInstance()->getObject($fileID);
         }
 
         return $this->file;