Improve the naming of classes and functions

Author: dtdesign

phpstan-baseline.neon

@@ -1,11 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '#^Variable \$this might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: wcfsetup/install/files/acp/update_com.woltlab.wcf_6.1_spider_step1.php
-
 		-
 			message: '#^Property wcf\\acp\\form\\AbstractCategoryAddForm\:\:\$categoryNodeTree \(wcf\\data\\category\\UncachedCategoryNodeTree\) does not accept wcf\\data\\category\\CategoryNodeTree\.$#'
 			identifier: assign.propertyType

…tionQueues/GetModerationUserMenuItems.ts …Api/ModerationQueues/GetUserMenuItems.tsts/WoltLabSuite/Core/Api/ModerationQueues/GetModerationUserMenuItems.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/GetUserMenuItems.ts ts/WoltLabSuite/Core/Api/ModerationQueues/GetModerationUserMenuItems.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/GetUserMenuItems.ts

@@ -17,7 +17,7 @@ type Response = {
   items: UserMenuData[];
 };
 
-export async function getModerationUserMenuItems(): Promise<ApiResult<Response>> {
+export async function getUserMenuItems(): Promise<ApiResult<Response>> {
   let response: Response;
 
   try {

…nQueues/MarkAllModerationQueuesAsRead.ts …re/Api/ModerationQueues/MarkAllAsRead.tsts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllAsRead.ts ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead.ts renamed to ts/WoltLabSuite/Core/Api/ModerationQueues/MarkAllAsRead.ts

@@ -11,7 +11,7 @@
 import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
 import { ApiResult, apiResultFromError, apiResultFromValue } from "../Result";
 
-export async function markAllModerationQueuesAsRead(): Promise<ApiResult<[]>> {
+export async function markAllAsRead(): Promise<ApiResult<[]>> {
   try {
     await prepareRequest(`${window.WSC_RPC_API_URL}core/moderation-queues/mark-all-as-read`).post().fetchAsJson();
   } catch (e) {

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

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

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

@@ -1,5 +1,5 @@
 /**
- * Marks all moderation queue entries as read.
+ * Marks all moderation queues as read.
  *
  * @author  Marcel Werk
  * @copyright  2001-2022 WoltLab GmbH
@@ -8,10 +8,10 @@
  */
 
 import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar";
-import { markAllModerationQueuesAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead";
+import { markAllAsRead as apiMarkAllAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllAsRead";
 
 async function markAllAsRead(): Promise<void> {
-  await markAllModerationQueuesAsRead();
+  (await apiMarkAllAsRead()).unwrap();
 
   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,9 +10,9 @@
 import UserMenuView from "../View";
 import { EventUpdateCounter, UserMenuButton, UserMenuData, UserMenuFooter, UserMenuProvider } from "./Provider";
 import { registerProvider } from "../Manager";
-import { markModerationQueueAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkModerationQueueAsRead";
-import { markAllModerationQueuesAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllModerationQueuesAsRead";
-import { getModerationUserMenuItems } from "WoltLabSuite/Core/Api/ModerationQueues/GetModerationUserMenuItems";
+import { getUserMenuItems } from "WoltLabSuite/Core/Api/ModerationQueues/GetUserMenuItems";
+import { markAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAsRead";
+import { markAllAsRead } from "WoltLabSuite/Core/Api/ModerationQueues/MarkAllAsRead";
 
 type Options = {
   noItems: string;
@@ -64,7 +64,7 @@ class UserMenuDataModerationQueue implements UserMenuProvider {
   }
 
   async getData(): Promise<UserMenuData[]> {
-    const response = await getModerationUserMenuItems();
+    const response = await getUserMenuItems();
     if (!response.ok) {
       throw new Error("Moderation queue items could not be loaded.");
     }
@@ -127,13 +127,13 @@ class UserMenuDataModerationQueue implements UserMenuProvider {
   }
 
   async markAsRead(objectId: number): Promise<void> {
-    const { unreadModerationItems } = (await markModerationQueueAsRead(objectId)).unwrap();
+    const { unreadModerationItems } = (await markAsRead(objectId)).unwrap();
 
     this.updateCounter(unreadModerationItems);
   }
 
   async markAllAsRead(): Promise<void> {
-    await markAllModerationQueuesAsRead();
+    (await markAllAsRead()).unwrap();
 
     this.updateCounter(0);
   }