Migrate UserActivityEventAction::load() to an RPC endpoint

ts/WoltLabSuite/Core/Api/Users/ActivityEvents/RenderUserActivityEvents.ts

@@ -0,0 +1,41 @@
+/**
+ * Loads a paginated list of recent user activity events.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
+import { ApiResult, apiResultFromError, apiResultFromValue } from "../../Result";
+
+type Response = {
+  lastEventID: number;
+  lastEventTime: number;
+  template: string;
+};
+
+export async function renderUserActivityEvents(
+  lastEventTime: number,
+  lastEventID: number = 0,
+  userID: number = 0,
+  boxID: number = 0,
+  filteredByFollowedUsers: boolean = false,
+): Promise<ApiResult<Response | Record<string, never>>> {
+  const url = new URL(`${window.WSC_RPC_API_URL}core/users/activity-events/render`);
+  url.searchParams.set("lastEventTime", lastEventTime.toString());
+  url.searchParams.set("lastEventID", lastEventID.toString());
+  url.searchParams.set("userID", userID.toString());
+  url.searchParams.set("boxID", boxID.toString());
+  url.searchParams.set("filteredByFollowedUsers", filteredByFollowedUsers ? "1" : "0");
+
+  let response: Response | Record<string, never>;
+  try {
+    response = (await prepareRequest(url).get().fetchAsJson()) as Response | Record<string, never>;
+  } catch (e) {
+    return apiResultFromError(e);
+  }
+
+  return apiResultFromValue(response);
+}

ts/WoltLabSuite/Core/Component/User/RecentActivity/Loader.ts

@@ -8,29 +8,23 @@
  */
 
 import { dboAction } from "WoltLabSuite/Core/Ajax";
+import { renderUserActivityEvents } from "WoltLabSuite/Core/Api/Users/ActivityEvents/RenderUserActivityEvents";
 import { stringToBool } from "WoltLabSuite/Core/Core";
 import DomUtil from "WoltLabSuite/Core/Dom/Util";
 import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
 import { getPhrase } from "WoltLabSuite/Core/Language";
 
-type ResponseLoadMore = {
-  lastEventID: number;
-  lastEventTime: number;
-  template: string;
-};
-
 async function loadMore(container: HTMLElement): Promise<void> {
-  const response = (await dboAction("load", "wcf\\data\\user\\activity\\event\\UserActivityEventAction")
-    .payload({
-      lastEventTime: container.dataset.lastEventTime,
-      lastEventID: container.dataset.lastEventId || 0,
-      userID: container.dataset.userId || 0,
-      boxID: container.dataset.boxId || 0,
-      filteredByFollowedUsers: stringToBool(container.dataset.filteredByFollowedUsers || ""),
-    })
-    .dispatch()) as ResponseLoadMore;
+  const result = await renderUserActivityEvents(
+    parseInt(container.dataset.lastEventTime || "0"),
+    parseInt(container.dataset.lastEventId || "0"),
+    parseInt(container.dataset.userId || "0"),
+    parseInt(container.dataset.boxId || "0"),
+    stringToBool(container.dataset.filteredByFollowedUsers || ""),
+  );
+  const response = result.unwrap();
 
-  if (response.template) {
+  if ("template" in response) {
     container.dataset.lastEventTime = response.lastEventTime.toString();
     container.dataset.lastEventId = response.lastEventID.toString();
 

wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php

@@ -238,6 +238,7 @@ static function (\wcf\event\endpoint\ControllerCollecting $event) {
                 $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignments\DeleteAssignment());
                 $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignments\EnableAssignment());
                 $event->register(new \wcf\system\endpoint\controller\core\users\groups\assignments\DisableAssignment());
+                $event->register(new \wcf\system\endpoint\controller\core\users\activityEvents\RenderUserActivityEvents());
                 $event->register(new \wcf\system\endpoint\controller\core\users\groups\DeleteGroup());
                 $event->register(new \wcf\system\endpoint\controller\core\menus\DeleteMenu());
                 $event->register(new \wcf\system\endpoint\controller\core\trophies\EnableTrophy());

wcfsetup/install/files/lib/data/user/activity/event/UserActivityEventAction.class.php

@@ -37,6 +37,7 @@ class UserActivityEventAction extends AbstractDatabaseObjectAction
      * Validates parameters to load recent activity entries.
      *
      * @return void
+     * @deprecated 6.3
      */
     public function validateLoad()
     {
@@ -70,6 +71,7 @@ public function validateLoad()
      *  lastEventTime: int,
      *  template: string,
      * }|array{}
+     * @deprecated 6.3 Use `RenderUserActivityEvents` endpoint instead.
      */
     public function load()
     {

wcfsetup/install/files/lib/system/endpoint/controller/core/users/activityEvents/RenderUserActivityEvents.class.php

@@ -0,0 +1,149 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\users\activityEvents;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\data\box\Box;
+use wcf\data\user\activity\event\ViewableUserActivityEventList;
+use wcf\http\Helper;
+use wcf\system\box\RecentActivityListBoxController;
+use wcf\system\endpoint\GetRequest;
+use wcf\system\endpoint\IController;
+use wcf\system\exception\UserInputException;
+use wcf\system\user\activity\event\UserActivityEventHandler;
+use wcf\system\user\UserProfileHandler;
+use wcf\system\WCF;
+
+/**
+ * Retrieves the HTML code for the rendering of recent user activity events.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[GetRequest('/core/users/activity-events/render')]
+final class RenderUserActivityEvents implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $parameters = Helper::mapApiParameters($request, RenderUserActivityEventsParameters::class);
+
+        $boxController = null;
+        if ($parameters->boxID !== 0) {
+            $box = new Box($parameters->boxID);
+            if (!$box->boxID) {
+                throw new UserInputException('boxID');
+            }
+
+            $controller = $box->getController();
+            if (!$controller instanceof RecentActivityListBoxController) {
+                throw new UserInputException('boxID');
+            }
+
+            $boxController = $controller;
+        }
+
+        return new JsonResponse($this->render(
+            $parameters->lastEventTime,
+            $parameters->lastEventID,
+            $parameters->userID,
+            $parameters->filteredByFollowedUsers,
+            $boxController,
+        ));
+    }
+
+    /**
+     * @return array{
+     *  lastEventID: int,
+     *  lastEventTime: int,
+     *  template: string,
+     * }|array{}
+     */
+    private function render(
+        int $lastEventTime,
+        int $lastEventID = 0,
+        int $userID = 0,
+        bool $filteredByFollowedUsers = false,
+        ?RecentActivityListBoxController $boxController = null,
+    ): array {
+        if ($boxController !== null) {
+            $eventList = $boxController->getFilteredList();
+        } else {
+            $eventList = new ViewableUserActivityEventList();
+
+            if ($userID) {
+                $eventList->getConditionBuilder()->add(
+                    "user_activity_event.userID = ?",
+                    [$userID]
+                );
+            } elseif (
+                $filteredByFollowedUsers
+                && \count(UserProfileHandler::getInstance()->getFollowingUsers())
+            ) {
+                $eventList->getConditionBuilder()->add(
+                    'user_activity_event.userID IN (?)',
+                    [UserProfileHandler::getInstance()->getFollowingUsers()]
+                );
+            }
+        }
+
+        if ($lastEventID) {
+            $eventList->getConditionBuilder()->add(
+                "user_activity_event.time <= ?",
+                [$lastEventTime]
+            );
+            $eventList->getConditionBuilder()->add(
+                "user_activity_event.eventID < ?",
+                [$lastEventID]
+            );
+        } else {
+            $eventList->getConditionBuilder()->add(
+                "user_activity_event.time < ?",
+                [$lastEventTime]
+            );
+        }
+
+        $eventList->readObjects();
+        $lastEventTime = $eventList->getLastEventTime();
+
+        if (!$lastEventTime) {
+            return [];
+        }
+
+        UserActivityEventHandler::validateEvents($eventList);
+
+        if ($boxController !== null) {
+            $eventList->truncate($boxController->getBox()->limit);
+        }
+
+        if (!\count($eventList)) {
+            return [];
+        }
+
+        $events = $eventList->getObjects();
+
+        return [
+            'lastEventID' => \end($events)->eventID,
+            'lastEventTime' => $lastEventTime,
+            'template' => WCF::getTPL()->render('wcf', 'recentActivityListItem', [
+                'eventList' => $eventList,
+            ]),
+        ];
+    }
+}
+
+/** @internal */
+final class RenderUserActivityEventsParameters
+{
+    public function __construct(
+        public readonly int $lastEventTime,
+        public readonly int $lastEventID = 0,
+        public readonly int $userID = 0,
+        public readonly int $boxID = 0,
+        public readonly bool $filteredByFollowedUsers = false,
+    ) {}
+}