Merge branch '6.1' into 6.2

Author: dtdesign

.gitignore

@@ -60,3 +60,6 @@ nbactions.xml
 
 # Node.js
 node_modules/
+
+# Composer
+/vendor/

com.woltlab.wcf/package.xml

@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.3</version>
-		<date>2025-01-06</date>
+		<version>6.1.4 dev 1</version>
+		<date>2025-02-11</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,70 +50,10 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.0.*">
-		<!--
-tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
-	acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php \
-	acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php \
-	acp/update_com.woltlab.wcf_6.1_sharedTemplate.php \
-	acp/database/update_com.woltlab.wcf_6.1.php
-		-->
-		<instruction type="file">files_pre_check.tar</instruction>
-
-		<!-- Checks that need to happen before the upgrade starts. -->
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php</instruction>
-
-		<!-- Required for the shared templates. -->
-		<instruction type="script">acp/update_com.woltlab.wcf_6.1_sharedTemplate.php</instruction>
-
-		<!-- Clean up any duplicate entries in the message embedded objects table. -->
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php</instruction>
-
-		<!-- Migrate the database as early as possible. -->
-		<instruction type="database">acp/database/update_com.woltlab.wcf_6.1.php</instruction>
-
-		<!-- Deploy the new application code. -->
-		<instruction type="file"/>
-		<instruction type="acpTemplate"/>
-		<instruction type="template"/>
-
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_spider_step1.php</instruction>
-		<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.1_spider_step2.php</instruction>
-
-		<instruction type="language"/>
-		<instruction type="objectTypeDefinition"/>
-		<instruction type="objectType"/>
-		<instruction type="page"/>
-		<instruction type="userGroupOption"/>
-		<instruction type="userProfileMenu"/>
-		<instruction type="bbcode"/>
-		<instruction type="acpTemplateDelete"/>
-		<instruction type="fileDelete"/>
-		<instruction type="userMenu"/>
-		<instruction type="option"/>
-		<instruction type="templateDelete"/>
-		<instruction type="cronjob"/>
-		<instruction type="userOption"/>
-		<instruction type="userNotificationEvent"/>
-
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
-	</instructions>
-
-	<instructions type="update" fromversion="6.1.2">
+	<instructions type="update" fromversion="6.1.3">
 		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
 		<instruction type="file">files_update.tar</instruction>
 		<instruction type="template">templates_update.tar</instruction>
 		<instruction type="language"/>
 	</instructions>
-	<instructions type="update" fromversion="6.1.3 dev 1">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-	<instructions type="update" fromversion="6.1.3 dev 2">
-		<instruction type="file">files_update.tar</instruction>
-	</instructions>
-	<instructions type="update" fromversion="6.1.3 dev 3">
-		<instruction type="file">files_update.tar</instruction>
-	</instructions>
 </package>

ts/WoltLabSuite/Core/Component/Comment/List.ts

@@ -388,7 +388,9 @@ class CommentList {
     DomUtil.insertHtml(response.value.template, commentResponseList, "append");
     DomChangeListener.trigger();
 
-    const scrollTarget = commentResponseList.firstElementChild as HTMLElement;
+    const scrollTarget = this.#container.querySelector(
+      `.commentResponseList__item[data-response-id="${responseId}"]`,
+    ) as HTMLElement;
 
     window.setTimeout(() => {
       UiScroll.element(scrollTarget);

ts/WoltLabSuite/Core/Component/File/Upload.ts

@@ -174,7 +174,7 @@ async function resizeImage(element: WoltlabCoreFileUploadElement, file: File): P
 
   let fileType: string = resizeConfiguration.fileType;
   if (fileType === "image/jpeg" || fileType === "image/webp") {
-    fileType = "image/webp";
+    fileType = "image/jpeg";
   } else {
     fileType = file.type;
   }
@@ -192,15 +192,15 @@ async function resizeImage(element: WoltlabCoreFileUploadElement, file: File): P
   return resizedFile;
 }
 
-function validateFileLimit(element: WoltlabCoreFileUploadElement): boolean {
+function validateFileLimit(element: WoltlabCoreFileUploadElement, count: number): boolean {
   const maximumCount = element.maximumCount;
   if (maximumCount === -1) {
     return true;
   }
 
   const files = Array.from(element.parentElement!.querySelectorAll("woltlab-core-file"));
   const numberOfUploadedFiles = files.filter((file) => !file.isFailedUpload()).length;
-  if (numberOfUploadedFiles + 1 <= maximumCount) {
+  if (numberOfUploadedFiles + count <= maximumCount) {
     return true;
   }
 
@@ -210,6 +210,12 @@ function validateFileLimit(element: WoltlabCoreFileUploadElement): boolean {
 }
 
 function validateFileSize(element: WoltlabCoreFileUploadElement, file: File): boolean {
+  if (file.size === 0) {
+    innerError(element, getPhrase("wcf.upload.error.emptyFile", { filename: file.name }));
+
+    return false;
+  }
+
   let isImage = false;
   switch (file.type) {
     case "image/gif":
@@ -256,47 +262,54 @@ function validateFileExtension(element: WoltlabCoreFileUploadElement, file: File
 
 export function setup(): void {
   wheneverFirstSeen("woltlab-core-file-upload", (element: WoltlabCoreFileUploadElement) => {
-    element.addEventListener("upload", (event: CustomEvent<File>) => {
-      const file = event.detail;
+    element.addEventListener("upload:files", (event: CustomEvent<{ files: File[] }>) => {
+      const { files } = event.detail;
 
       clearPreviousErrors(element);
 
-      if (!validateFileLimit(element)) {
-        return;
-      } else if (!validateFileExtension(element, file)) {
-        return;
-      } else if (!validateFileSize(element, file)) {
+      if (!validateFileLimit(element, files.length)) {
         return;
       }
 
+      for (const file of files) {
+        if (!validateFileExtension(element, file)) {
+          return;
+        } else if (!validateFileSize(element, file)) {
+          return;
+        }
+      }
+
+      let processImage: (file: File) => Promise<File>;
       if (element.dataset.cropperConfiguration) {
         const cropperConfiguration = JSON.parse(element.dataset.cropperConfiguration) as CropperConfiguration;
 
-        void cropImage(element, file, cropperConfiguration)
-          .then((resizedFile) => {
-            void upload(element, resizedFile);
-          })
-          .catch((e) => {
+        processImage = async (file) => {
+          try {
+            return await cropImage(element, file, cropperConfiguration);
+          } catch (e) {
             element.dispatchEvent(new CustomEvent("cancel"));
 
-            if (e === undefined) {
-              // User closed the dialog.
-              return;
-            }
-
-            if (e instanceof Error) {
-              innerError(element, e.message);
-            }
-          });
+            throw e;
+          }
+        };
       } else {
-        void resizeImage(element, file)
-        .then((resizedFile) => {
-            void upload(element, resizedFile);
-          })
-        .catch(() => {
-          innerError(element, getPhrase("wcf.upload.error.damagedImageFile", { filename: file.name }));
-        });
+        processImage = async (file) => resizeImage(element, file);
       }
+
+      // Resize all files in parallel but keep the original order. This ensures
+      // that files are uploaded in the same order that they were provided by
+      // the browser.
+      void Promise.allSettled(files.map((file) => processImage(file))).then((results) => {
+        for (let i = 0, length = results.length; i < length; i++) {
+          const result = results[i];
+
+          if (result.status === "fulfilled") {
+            void upload(element, result.value);
+          } else if (result.reason !== undefined) {
+            innerError(element, getPhrase("wcf.upload.error.damagedImageFile", { filename: files[i].name }));
+          }
+        }
+      });
     });
 
     element.addEventListener("ckeditorDrop", (event: CustomEvent<CkeditorDropEvent>) => {

ts/WoltLabSuite/Core/Notification/Handler.ts

@@ -12,7 +12,7 @@ import * as Ajax from "../Ajax";
 import { AjaxCallbackSetup } from "../Ajax/Data";
 import * as Core from "../Core";
 import * as EventHandler from "../Event/Handler";
-import { serviceWorkerSupported } from "./ServiceWorker";
+import { serviceWorkerSupported, updateNotificationLastReadTime } from "./ServiceWorker";
 import { updateCounter } from "WoltLabSuite/Core/Ui/User/Menu/Manager";
 
 interface NotificationHandlerOptions {
@@ -206,6 +206,9 @@ class NotificationHandler {
 
     this.lastRequestTimestamp = data.returnValues.lastRequestTimestamp;
 
+    // Update the last read time for the service worker
+    updateNotificationLastReadTime(this.lastRequestTimestamp);
+
     EventHandler.fire("com.woltlab.wcf.notification", "afterPoll", pollData);
 
     this.showNotification(pollData);
@@ -264,6 +267,10 @@ class NotificationHandler {
       silent: !window.ENABLE_DEBUG_MODE,
     };
   }
+
+  updateLastRequestTimestamp(timestamp: number): void {
+    this.lastRequestTimestamp = Math.max(timestamp, this.lastRequestTimestamp);
+  }
 }
 
 let notificationHandler: NotificationHandler;
@@ -281,6 +288,10 @@ export function enableNotifications(): void {
   notificationHandler!.enableNotifications();
 }
 
+export function updateLastRequestTimestamp(timestamp: number): void {
+  notificationHandler?.updateLastRequestTimestamp(timestamp);
+}
+
 export function poll(): void {
   notificationHandler?.dispatchRequest();
 }

ts/WoltLabSuite/Core/Notification/ServiceWorker.ts

@@ -7,6 +7,7 @@
  */
 
 import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
+import { updateLastRequestTimestamp } from "WoltLabSuite/Core/Notification/Handler";
 
 let _serviceWorker: ServiceWorker | null = null;
 
@@ -24,6 +25,15 @@ class ServiceWorker {
       scope: "/",
     });
     this.#serviceWorkerRegistration = window.navigator.serviceWorker.ready;
+
+    window.navigator.serviceWorker.addEventListener("message", (event) => {
+      // Validate that this is a message from our service worker
+      if (!(event.source instanceof window.ServiceWorker) || event.source.scriptURL !== this.#serviceWorkerJsUrl) {
+        return;
+      }
+
+      updateLastRequestTimestamp(event.data.time);
+    });
   }
 
   async register(): Promise<void> {

ts/WoltLabSuite/WebComponent/woltlab-core-file-upload.ts

@@ -21,6 +21,7 @@
         }
 
         for (const file of files) {
+          /** @deprecated 6.1 No longer supported */
           const event = new CustomEvent<File>("shouldUpload", {
             cancelable: true,
             detail: file,
@@ -31,12 +32,20 @@
             continue;
           }
 
+          /** @deprecated 6.1 Use `upload:files` instead */
           const uploadEvent = new CustomEvent<File>("upload", {
             detail: file,
           });
           this.dispatchEvent(uploadEvent);
         }
 
+        const event = new CustomEvent<{ files: File[] }>("upload:files", {
+          detail: {
+            files: Array.from(files),
+          },
+        });
+        this.dispatchEvent(event);
+
         // Reset the selected file.
         this.#element.value = "";
       });