Fix a few inconsistencies

Author: dtdesign

com.woltlab.wcf/templates/moderationContentHeader.tpl

@@ -12,18 +12,16 @@
 
 		<li title="{lang}wcf.moderation.assignedUser{/lang}">
 			{icon name='user'}
-			<span id="moderationAssignedUser">
-				{if $queue->assignedUserID}
-					<a href="{link controller='User' id=$queue->assignedUserID}{/link}" class="userLink" data-object-id="{$queue->assignedUserID}">{$queue->assignedUsername}</a>
-				{else}
-					{lang}wcf.moderation.assignedUser.nobody{/lang}
-				{/if}
-			</span>
+			{if $queue->assignedUserID}
+				<a href="{link controller='User' id=$queue->assignedUserID}{/link}" class="userLink" data-object-id="{$queue->assignedUserID}">{$queue->assignedUsername}</a>
+			{else}
+				{lang}wcf.moderation.assignedUser.nobody{/lang}
+			{/if}
 		</li>
 
 		<li title="{lang}wcf.moderation.status{/lang}">
 			{icon name='arrows-rotate'}
-			<span id="moderationQueueStatus">{$queue->getStatus()}</span>
+			{$queue->getStatus()}
 		</li>
 
 		{event name='afterMetaData'}

ts/WoltLabSuite/Core/Api/ModerationQueues/GetModerationUserMenuItems.ts

@@ -1,7 +1,7 @@
 /**
  * Retrieves the user menu items for the moderation queues.
  *
- * @author olaf Braun
+ * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3

…ues/MarkAllModerationQueueItemsAsRead.ts …nQueues/MarkAllModerationQueuesAsRead.tsts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueueItemsAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead.ts ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueueItemsAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead.ts

@@ -1,5 +1,5 @@
 /**
- * Mark all moderation queue items as read.
+ * Mark all moderation queue as read.
  *
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
@@ -11,7 +11,7 @@
 import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
 import { ApiResult, apiResultFromError, apiResultFromValue } from "../Result";
 
-export async function markAllModerationQueueItemsAsRead(): Promise<ApiResult<[]>> {
+export async function markAllModerationQueuesAsRead(): Promise<ApiResult<[]>> {
   try {
     await prepareRequest(`${window.WSC_RPC_API_URL}core/moderation-queues/mark-all-as-read`).post().fetchAsJson();
   } catch (e) {

…nQueues/MarkModerationQueueItemAsRead.ts …ationQueues/MarkModerationQueueAsRead.tsts/WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueItemAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueAsRead.ts ts/WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueItemAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueAsRead.ts

@@ -1,5 +1,5 @@
 /**
- * Mark a moderation queue item as read.
+ * Mark a moderation queue as read.
  *
  * @author Olaf Braun
  * @copyright 2001-2025 WoltLab GmbH
@@ -15,7 +15,7 @@ type Response = {
   unreadModerationItems: number;
 };
 
-export async function markModerationQueueItemAsRead(queueId: number): Promise<ApiResult<number>> {
+export async function markModerationQueueAsRead(queueId: number): Promise<ApiResult<Response>> {
   let response: Response;
 
   try {
@@ -26,5 +26,5 @@ export async function markModerationQueueItemAsRead(queueId: number): Promise<Ap
     return apiResultFromError(e);
   }
 
-  return apiResultFromValue(response.unreadModerationItems);
+  return apiResultFromValue(response);
 }

ts/WoltLabSuite/Core/Ui/Moderation/MarkAllAsRead.ts

@@ -8,10 +8,10 @@
  */
 
 import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar";
-import { markAllModerationQueueItemsAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueueItemsAsRead";
+import { markAllModerationQueuesAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead";
 
 async function markAllAsRead(): Promise<void> {
-  await markAllModerationQueueItemsAsRead();
+  await markAllModerationQueuesAsRead();
 
   const gridViewTable = document.getElementById("wcf-system-gridView-user-ModerationQueueGridView_table")!;
   gridViewTable.dispatchEvent(new CustomEvent("interaction:invalidate-all"));

ts/WoltLabSuite/Core/Ui/User/Menu/Data/ModerationQueue.ts

@@ -10,8 +10,8 @@
 import UserMenuView from "../View";
 import { EventUpdateCounter, UserMenuButton, UserMenuData, UserMenuFooter, UserMenuProvider } from "./Provider";
 import { registerProvider } from "../Manager";
-import { markModerationQueueItemAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueItemAsRead";
-import { markAllModerationQueueItemsAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueueItemsAsRead";
+import { markModerationQueueAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueAsRead";
+import { markAllModerationQueuesAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead";
 import { getModerationUserMenuItems } from "WoltLabSuite/Core/Api/ModerationQueues/GetModerationUserMenuItems";
 
 type Options = {
@@ -127,14 +127,13 @@ class UserMenuDataModerationQueue implements UserMenuProvider {
   }
 
   async markAsRead(objectId: number): Promise<void> {
-    const response = await markModerationQueueItemAsRead(objectId);
-    if (response.ok) {
-      this.updateCounter(response.value);
-    }
+    const { unreadModerationItems } = (await markModerationQueueAsRead(objectId)).unwrap();
+
+    this.updateCounter(unreadModerationItems);
   }
 
   async markAllAsRead(): Promise<void> {
-    await markAllModerationQueueItemsAsRead();
+    await markAllModerationQueuesAsRead();
 
     this.updateCounter(0);
   }