From 502094d5bbf270ae8ca361e6b7392ddf29b60c50 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 13 Mar 2026 13:52:02 +0100
Subject: [PATCH 01/47] PoC to add object filters

---
 .../acp/templates/userGroupAssignmentAdd.tpl  |  78 ++++++----
 .../ObjectFilterBuilderAction.class.php       | 144 ++++++++++++++++++
 .../object/filter/IObjectFilter.class.php     |  49 ++++++
 .../filter/ObjectFilterHandler.class.php      |  34 +++++
 ...oupAssignmentObjectFilterBuilder.class.php |  31 ++++
 .../user/UserAvatarObjectFilter.class.php     |  66 ++++++++
 .../user/UserLanguageObjectFilter.class.php   |  64 ++++++++
 7 files changed, 435 insertions(+), 31 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php

diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index cfd0d828d14..89f4767cd65 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -4,7 +4,7 @@
 	<div class="contentHeaderTitle">
 		<h1 class="contentTitle">{lang}wcf.acp.group.assignment.{$action}{/lang}</h1>
 	</div>
-	
+
 	<nav class="contentHeaderNavigation">
 		<ul>
 			{if $action == 'edit'}
@@ -19,9 +19,24 @@
 
 {include file='shared_formNotice'}
 
-<form method="post" action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
+<button type="button" id="testButton" class="button">TODO: add object filter</button>
+<script data-relocate="true">
+	require(["WoltLabSuite/Core/Component/Dialog"], ({ dialogFactory }) => {
+		document.getElementById("testButton").addEventListener("click", () => {
+			dialogFactory()
+				.usingFormBuilder()
+				.fromEndpoint('{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}')
+				.then((result) => {
+					console.log(result);
+				});
+		});
+	});
+</script>
+
+<form method="post"
+	action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
 	<div class="section">
-		<dl{if $errorField == 'title'} class="formError"{/if}>
+		<dl{if $errorField == 'title'} class="formError" {/if}>
 			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
 			<dd>
 				<input type="text" id="title" name="title" value="{$title}" class="long">
@@ -35,47 +50,48 @@
 					</small>
 				{/if}
 			</dd>
-		</dl>
-		
-		<dl{if $errorField == 'groupID'} class="formError"{/if}>
-			<dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
-			<dd>
-				{htmlOptions name='groupID' id='groupID' options=$userGroups selected=$groupID}
-				{if $errorField == 'groupID'}
-					{if $errorType == 'noValidSelection'}
-						<small class="innerError">{lang}wcf.global.form.error.noValidSelection{/lang}</small>
-					{else}
-						<small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{$errorType}{/lang}</small>
+			</dl>
+
+			<dl{if $errorField == 'groupID'} class="formError" {/if}>
+				<dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
+				<dd>
+					{htmlOptions name='groupID' id='groupID' options=$userGroups selected=$groupID}
+					{if $errorField == 'groupID'}
+						{if $errorType == 'noValidSelection'}
+							<small class="innerError">{lang}wcf.global.form.error.noValidSelection{/lang}</small>
+						{else}
+							<small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{$errorType}{/lang}</small>
+						{/if}
 					{/if}
-				{/if}
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" id="isDisabled" name="isDisabled"{if $isDisabled} checked{/if}> {lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
-			</dd>
-		</dl>
-		
-		{event name='dataFields'}
+				</dd>
+				</dl>
+
+				<dl>
+					<dt></dt>
+					<dd>
+						<label><input type="checkbox" id="isDisabled" name="isDisabled" {if $isDisabled} checked{/if}>
+							{lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
+					</dd>
+				</dl>
+
+				{event name='dataFields'}
 	</div>
-	
+
 	{event name='sections'}
-	
+
 	<section class="section">
 		<header class="sectionHeader">
 			<h2 class="sectionTitle">{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
 			<p class="sectionDescription">{lang}wcf.acp.group.assignment.conditions.description{/lang}</p>
 		</header>
-		
+
 		{if $errorField == 'conditions'}
 			<woltlab-core-notice type="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</woltlab-core-notice>
 		{/if}
 
 		{include file='shared_userConditions'}
 	</section>
-	
+
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
 		<input type="hidden" name="action" value="{$action}">
@@ -83,4 +99,4 @@
 	</div>
 </form>
 
-{include file='footer'}
+{include file='footer'}
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
new file mode 100644
index 00000000000..2d71cd31ad0
--- /dev/null
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace wcf\action;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use wcf\system\form\builder\container\FormContainer;
+use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\form\builder\Psr15DialogForm;
+use wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder;
+
+final class ObjectFilterBuilderAction implements RequestHandlerInterface
+{
+    #[\Override]
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        /*
+        $parameters = Helper::mapQueryParameters(
+            $request->getQueryParams(),
+            <<<'EOT'
+                array {
+                    gridView: string,
+                    filters: string[],
+                    gridViewParameters: array<string, string|string[]>
+                }
+                EOT
+        );
+
+        if (!\is_subclass_of($parameters['gridView'], AbstractGridView::class)) {
+            throw new UserInputException('gridView', 'invalid');
+        }
+
+        try {
+            /** @var AbstractGridView<DatabaseObject, DatabaseObjectList<DatabaseObject>> $view *//*
+            $view = new $parameters['gridView'](...$parameters['gridViewParameters']);
+            // @phpstan-ignore catch.neverThrown
+        } catch (\ArgumentCountError $e) {
+            if (\ENABLE_DEBUG_MODE) {
+                throw $e;
+            } else {
+                throw new IllegalLinkException();
+            }
+        }
+        */
+
+        /*
+        if (!$view->isAccessible()) {
+            throw new PermissionDeniedException();
+        }
+
+        if (!$view->isFilterable()) {
+            throw new IllegalLinkException();
+        }
+        */
+
+        $form = $this->getForm();
+
+        if ($request->getMethod() === 'GET') {
+            return $form->toResponse();
+        } elseif ($request->getMethod() === 'POST') {
+            $response = $form->validateRequest($request);
+            if ($response !== null) {
+                return $response;
+            }
+
+            $rawData = $form->getData();
+            $data = $rawData['data'];
+
+            $builder = new UserGroupAssignmentObjectFilterBuilder();
+
+            foreach ($builder->getFilters() as $filter) {
+                $id = $filter->getFormField()->getId();
+                if (!isset($rawData[$id])) {
+                    continue;
+                }
+
+                $data[$id] = $filter->serializeValue($rawData[$id]);
+            }
+
+            foreach ($data as $key => $value) {
+                if ($value === '' || $value === null || $value === 0) {
+                    unset($data[$key]);
+                }
+            }
+
+            return new JsonResponse([
+                'result' => $data
+            ]);
+        } else {
+            throw new \LogicException('Unreachable');
+        }
+    }
+
+    private function getForm(): Psr15DialogForm
+    {
+        $form = new Psr15DialogForm(
+            static::class,
+            'TODO: title',
+            //WCF::getLanguage()->get('wcf.global.filter')
+        );
+
+        $container = FormContainer::create('container');
+        $container->addClass('objectFilterBuilder__list');
+        $form->appendChild($container);
+
+        $select = SelectFormField::create('filter')
+            ->label('TODO: type')
+            ->required();
+        $container->appendChild($select);
+
+        $builder = new UserGroupAssignmentObjectFilterBuilder();
+        $selectValues = [];
+        foreach ($builder->getFilters() as $filter) {
+            $formField = $filter->getFormField();
+            $formField->addDependency(
+                ValueFormFieldDependency::create($formField->getId() . 'Dependency')
+                    ->field($select)
+                    ->values([$filter->getIdentifier()])
+            );
+
+            /*
+            if (isset($values[$filter->getID()])) {
+                $value = $filter->unserializeValue($values[$filter->getID()]);
+                $formField->value($value);
+            }
+            */
+
+            $formField->addClass('objectFilterBuilder__list__item');
+            $container->appendChild($formField);
+
+            $selectValues[$filter->getIdentifier()] = $filter->getTitle();
+        }
+
+        $select->options($selectValues);
+
+        $form->markRequiredFields(false);
+        $form->build();
+
+        return $form;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
new file mode 100644
index 00000000000..8040f2b84e0
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\AbstractFormField;
+
+/**
+ * @template-covariant TValueType of mixed
+ */
+interface IObjectFilter
+{
+    // `com.woltlab.wcf.username`
+    public function getIdentifier(): string;
+
+    public function getTitle(): string;
+
+    /**
+     * Returns the form field that the user interacts with when entering a value.
+     *
+     * @param array<string, mixed> $configuration
+     */
+    public function getFormField(): AbstractFormField;
+
+    // -> DB
+    public function serializeValue(mixed $value): string;
+
+    /**
+     * @return TValueType
+     */
+    public function unserializeValue(string $serializedValue): mixed;
+
+    // "In user group <strong>%s</strong>"
+    /**
+     * @param TValueType $value
+     */
+    public function summarizeValue(mixed $value): string;
+
+    /**
+     * @param TValueType $value
+     */
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
+
+    /**
+     * @param TValueType $configuredValue
+     * @param mixed $value
+     */
+    public function testValue(mixed $configuredValue, mixed $value): bool;
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
new file mode 100644
index 00000000000..73c7e8c0b9c
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\WCF;
+
+final class ObjectFilterHandler
+{
+    /**
+     * @param list<IObjectFilter> $filters
+     */
+    public function __construct(
+        private readonly array $filters,
+    ) {}
+
+    public function getFormFields()
+    {
+        $filters = [];
+        foreach ($this->filters as $filter) {
+            $filters[$filter->getIdentifier()] = $filter->getTitle();
+        }
+
+        $collator = new \Collator(WCF::getLanguage()->getLocale());
+        \uasort(
+            $filters,
+            static fn($a, $b) => $collator->compare($a, $b)
+        );
+
+        $selection = SelectFormField::create('filter')
+            ->options($filters)
+            ->required();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
new file mode 100644
index 00000000000..a91c99c9b36
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace wcf\system\object\filter\builder;
+
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\user\UserAvatarObjectFilter;
+use wcf\system\object\filter\user\UserLanguageObjectFilter;
+
+final class UserGroupAssignmentObjectFilterBuilder
+{
+    /**
+     * @var list<IObjectFilter>
+     */
+    private readonly array $filters;
+
+    public function __construct()
+    {
+        $this->filters = [
+            new UserAvatarObjectFilter(),
+            new UserLanguageObjectFilter(),
+        ];
+    }
+
+    /**
+     * @return list<IObjectFilter>
+     */
+    public function getFilters(): array
+    {
+        return $this->filters;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
new file mode 100644
index 00000000000..15cb5dc19e1
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectFilter;
+
+/**
+ * @implements IObjectFilter<bool>
+ */
+final class UserAvatarObjectFilter implements IObjectFilter
+{
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userAvatar';
+    }
+
+    public function getTitle(): string
+    {
+        return 'TODO: user avatar';
+    }
+
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userAvatar')
+            ->label('wcf.user.avatar');
+    }
+
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add("avatarID IS NOT NULL");
+        } else {
+            $conditions->add("avatarID IS NULL");
+        }
+    }
+
+    public function serializeValue(mixed $value): string
+    {
+        if ($value) {
+            return '1';
+        }
+
+        return '0';
+    }
+
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return 'TODO: has an avatar';
+        }
+
+        return 'TODO: does not have an avatar';
+    }
+
+    public function testValue(mixed $configuredValue, mixed $value): bool
+    {
+        return (bool)$value;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
new file mode 100644
index 00000000000..3fe5979b6e4
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\AbstractFormField;
+use wcf\system\form\builder\field\MultipleSelectionFormField;
+use wcf\system\language\LanguageFactory;
+use wcf\system\object\filter\IObjectFilter;
+
+final class UserLanguageObjectFilter implements IObjectFilter
+{
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userLanguage';
+    }
+
+    public function getTitle(): string
+    {
+        return 'TODO: user language';
+    }
+
+    public function getFormField(): AbstractFormField
+    {
+        return MultipleSelectionFormField::create('userLanguage')
+            ->label('TODO: user language')
+            ->options(LanguageFactory::getInstance()->getLanguages())
+            ->required();
+    }
+
+    public function serializeValue(mixed $value): string
+    {
+        return \json_encode($value, \JSON_THROW_ON_ERROR);
+    }
+
+    public function unserializeValue(string $serializedValue): mixed
+    {
+        return \json_decode($serializedValue, true, flags: \JSON_THROW_ON_ERROR);
+    }
+
+    public function summarizeValue(mixed $value): string
+    {
+        return \sprintf(
+            'TODO: has language %s',
+            \implode(
+                ', ',
+                \array_map(
+                    static fn(int $languageID) => LanguageFactory::getInstance()->getLanguage($languageID)->__toString(),
+                    $value,
+                )
+            )
+        );
+    }
+
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add('languageID IN (?)', [$value]);
+    }
+
+    public function testValue(mixed $configuredValue, mixed $value): bool
+    {
+        return \in_array($value, $configuredValue);
+    }
+}

From 982f9db1caa41cb10f44f0a0ffa5c73e235d9b7d Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 Mar 2026 16:38:58 +0200
Subject: [PATCH 02/47] Clean up the code a bit

---
 .../acp/templates/userGroupAssignmentAdd.tpl  | 15 ++++-
 .../ObjectFilterBuilderAction.class.php       | 66 +++----------------
 .../object/filter/IObjectFilter.class.php     |  4 +-
 .../filter/ObjectFilterHandler.class.php      |  4 +-
 ...oupAssignmentObjectFilterBuilder.class.php |  4 +-
 .../user/UserAvatarObjectFilter.class.php     |  8 +++
 .../user/UserLanguageObjectFilter.class.php   | 34 +++++-----
 7 files changed, 55 insertions(+), 80 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 89f4767cd65..a7833b58a6a 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -26,13 +26,24 @@
 			dialogFactory()
 				.usingFormBuilder()
 				.fromEndpoint('{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}')
-				.then((result) => {
-					console.log(result);
+				.then((response) => {
+					if (response.ok) {
+						addCondition(response.result);
+					}
 				});
 		});
+
+		function addCondition(result) {
+			const li = document.createElement("li");
+			li.textContent = result.summary;
+
+			document.getElementById("conditions").append(li);
+		}
 	});
 </script>
 
+<ul id="conditions"></ul>
+
 <form method="post"
 	action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
 	<div class="section">
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index 2d71cd31ad0..fd504724f10 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -17,45 +17,6 @@ final class ObjectFilterBuilderAction implements RequestHandlerInterface
     #[\Override]
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        /*
-        $parameters = Helper::mapQueryParameters(
-            $request->getQueryParams(),
-            <<<'EOT'
-                array {
-                    gridView: string,
-                    filters: string[],
-                    gridViewParameters: array<string, string|string[]>
-                }
-                EOT
-        );
-
-        if (!\is_subclass_of($parameters['gridView'], AbstractGridView::class)) {
-            throw new UserInputException('gridView', 'invalid');
-        }
-
-        try {
-            /** @var AbstractGridView<DatabaseObject, DatabaseObjectList<DatabaseObject>> $view *//*
-            $view = new $parameters['gridView'](...$parameters['gridViewParameters']);
-            // @phpstan-ignore catch.neverThrown
-        } catch (\ArgumentCountError $e) {
-            if (\ENABLE_DEBUG_MODE) {
-                throw $e;
-            } else {
-                throw new IllegalLinkException();
-            }
-        }
-        */
-
-        /*
-        if (!$view->isAccessible()) {
-            throw new PermissionDeniedException();
-        }
-
-        if (!$view->isFilterable()) {
-            throw new IllegalLinkException();
-        }
-        */
-
         $form = $this->getForm();
 
         if ($request->getMethod() === 'GET') {
@@ -71,23 +32,24 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
             $builder = new UserGroupAssignmentObjectFilterBuilder();
 
+            $result = [];
             foreach ($builder->getFilters() as $filter) {
-                $id = $filter->getFormField()->getId();
-                if (!isset($rawData[$id])) {
+                if ($data['filter'] !== $filter->getIdentifier()) {
                     continue;
                 }
 
-                $data[$id] = $filter->serializeValue($rawData[$id]);
-            }
+                $id = $filter->getFormField()->getId();
+                $value = $data[$id] ?? $rawData[$id];
 
-            foreach ($data as $key => $value) {
-                if ($value === '' || $value === null || $value === 0) {
-                    unset($data[$key]);
-                }
+                $result = [
+                    'identifier' => $filter->getIdentifier(),
+                    'summary' => $filter->summarizeValue($value),
+                    'value' => $filter->serializeValue($value),
+                ];
             }
 
             return new JsonResponse([
-                'result' => $data
+                'result' => $result,
             ]);
         } else {
             throw new \LogicException('Unreachable');
@@ -99,7 +61,6 @@ private function getForm(): Psr15DialogForm
         $form = new Psr15DialogForm(
             static::class,
             'TODO: title',
-            //WCF::getLanguage()->get('wcf.global.filter')
         );
 
         $container = FormContainer::create('container');
@@ -121,13 +82,6 @@ private function getForm(): Psr15DialogForm
                     ->values([$filter->getIdentifier()])
             );
 
-            /*
-            if (isset($values[$filter->getID()])) {
-                $value = $filter->unserializeValue($values[$filter->getID()]);
-                $formField->value($value);
-            }
-            */
-
             $formField->addClass('objectFilterBuilder__list__item');
             $container->appendChild($formField);
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 8040f2b84e0..89a88cede3b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -6,7 +6,7 @@
 use wcf\system\form\builder\field\AbstractFormField;
 
 /**
- * @template-covariant TValueType of mixed
+ * @template TValueType of mixed
  */
 interface IObjectFilter
 {
@@ -17,8 +17,6 @@ public function getTitle(): string;
 
     /**
      * Returns the form field that the user interacts with when entering a value.
-     *
-     * @param array<string, mixed> $configuration
      */
     public function getFormField(): AbstractFormField;
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 73c7e8c0b9c..ffe1393786a 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -8,13 +8,13 @@
 final class ObjectFilterHandler
 {
     /**
-     * @param list<IObjectFilter> $filters
+     * @param list<IObjectFilter<mixed>> $filters
      */
     public function __construct(
         private readonly array $filters,
     ) {}
 
-    public function getFormFields()
+    public function getFormFields(): void
     {
         $filters = [];
         foreach ($this->filters as $filter) {
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index a91c99c9b36..380a60043f9 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -9,7 +9,7 @@
 final class UserGroupAssignmentObjectFilterBuilder
 {
     /**
-     * @var list<IObjectFilter>
+     * @var list<IObjectFilter<mixed>>
      */
     private readonly array $filters;
 
@@ -22,7 +22,7 @@ public function __construct()
     }
 
     /**
-     * @return list<IObjectFilter>
+     * @return list<IObjectFilter<mixed>>
      */
     public function getFilters(): array
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 15cb5dc19e1..77aaf4ece46 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -11,22 +11,26 @@
  */
 final class UserAvatarObjectFilter implements IObjectFilter
 {
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'com.woltlab.wcf.userAvatar';
     }
 
+    #[\Override]
     public function getTitle(): string
     {
         return 'TODO: user avatar';
     }
 
+    #[\Override]
     public function getFormField(): BooleanFormField
     {
         return BooleanFormField::create('userAvatar')
             ->label('wcf.user.avatar');
     }
 
+    #[\Override]
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
     {
         if ($value) {
@@ -36,6 +40,7 @@ public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed
         }
     }
 
+    #[\Override]
     public function serializeValue(mixed $value): string
     {
         if ($value) {
@@ -45,11 +50,13 @@ public function serializeValue(mixed $value): string
         return '0';
     }
 
+    #[\Override]
     public function unserializeValue(string $serializedValue): bool
     {
         return (bool)$serializedValue;
     }
 
+    #[\Override]
     public function summarizeValue(mixed $value): string
     {
         if ($value) {
@@ -59,6 +66,7 @@ public function summarizeValue(mixed $value): string
         return 'TODO: does not have an avatar';
     }
 
+    #[\Override]
     public function testValue(mixed $configuredValue, mixed $value): bool
     {
         return (bool)$value;
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index 3fe5979b6e4..5a112620179 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -3,62 +3,66 @@
 namespace wcf\system\object\filter\user;
 
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\AbstractFormField;
-use wcf\system\form\builder\field\MultipleSelectionFormField;
+use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\language\LanguageFactory;
 use wcf\system\object\filter\IObjectFilter;
 
+/**
+ * @implements IObjectFilter<int>
+ */
 final class UserLanguageObjectFilter implements IObjectFilter
 {
+    #[\Override]
     public function getIdentifier(): string
     {
         return 'com.woltlab.wcf.userLanguage';
     }
 
+    #[\Override]
     public function getTitle(): string
     {
         return 'TODO: user language';
     }
 
-    public function getFormField(): AbstractFormField
+    #[\Override]
+    public function getFormField(): SelectFormField
     {
-        return MultipleSelectionFormField::create('userLanguage')
+        return SelectFormField::create('userLanguage')
             ->label('TODO: user language')
             ->options(LanguageFactory::getInstance()->getLanguages())
             ->required();
     }
 
+    #[\Override]
     public function serializeValue(mixed $value): string
     {
-        return \json_encode($value, \JSON_THROW_ON_ERROR);
+        return (string)$value;
     }
 
+    #[\Override]
     public function unserializeValue(string $serializedValue): mixed
     {
-        return \json_decode($serializedValue, true, flags: \JSON_THROW_ON_ERROR);
+        return (int)$serializedValue;
     }
 
+    #[\Override]
     public function summarizeValue(mixed $value): string
     {
         return \sprintf(
             'TODO: has language %s',
-            \implode(
-                ', ',
-                \array_map(
-                    static fn(int $languageID) => LanguageFactory::getInstance()->getLanguage($languageID)->__toString(),
-                    $value,
-                )
-            )
+            LanguageFactory::getInstance()->getLanguage($value)->__toString()
         );
     }
 
+    #[\Override]
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
     {
-        $conditions->add('languageID IN (?)', [$value]);
+        $conditions->add('languageID = ?', [$value]);
     }
 
+    #[\Override]
     public function testValue(mixed $configuredValue, mixed $value): bool
     {
-        return \in_array($value, $configuredValue);
+        return $configuredValue === $value;
     }
 }

From 9d607c25cd30481879c9300ed469adb6e047fc37 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 Mar 2026 18:57:16 +0200
Subject: [PATCH 03/47] Move the JS logic into a separate component

---
 .../Core/Component/Object/Filter/Builder.ts   | 61 +++++++++++++++++++
 .../acp/templates/userGroupAssignmentAdd.tpl  | 24 ++------
 .../Core/Component/Object/Filter/Builder.js   | 43 +++++++++++++
 3 files changed, 108 insertions(+), 20 deletions(-)
 create mode 100644 ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
 create mode 100644 wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
new file mode 100644
index 00000000000..92b3b0419e1
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -0,0 +1,61 @@
+import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
+import { dialogFactory } from "../../Dialog";
+import { getPhrase } from "WoltLabSuite/Core/Language";
+
+type Response = {
+  identifier: string;
+  summary: string;
+  value: string;
+};
+
+class ObjectFilterBuilder {
+  readonly #conditions: Map<HTMLElement, Response> = new Map();
+  readonly #container: HTMLElement;
+  readonly #endpoint: string;
+
+  constructor(container: HTMLElement, button: HTMLElement) {
+    this.#container = container;
+    this.#endpoint = button.dataset.endpoint!;
+
+    button.addEventListener(
+      "click",
+      promiseMutex(() => this.#addFilter()),
+    );
+  }
+
+  async #addFilter(): Promise<void> {
+    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(this.#endpoint);
+    if (response.ok) {
+      this.#createCondition(response.result);
+    }
+  }
+
+  #createCondition(data: Response): void {
+    const item = document.createElement("div");
+    item.textContent = data.summary;
+
+    const deleteButton = document.createElement("button");
+    deleteButton.type = "button";
+    deleteButton.classList.add("button", "small", "jsTooltip");
+    deleteButton.title = getPhrase("wcf.global.button.delete");
+    deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
+    deleteButton.addEventListener("click", () => {
+      this.#deleteCondition(item);
+    });
+
+    item.append(deleteButton);
+
+    this.#container.append(item);
+
+    this.#conditions.set(item, data);
+  }
+
+  #deleteCondition(element: HTMLElement): void {
+    element.remove();
+    this.#conditions.delete(element);
+  }
+}
+
+export function setup(container: HTMLElement, button: HTMLButtonElement): void {
+  new ObjectFilterBuilder(container, button);
+}
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index a7833b58a6a..4f5a8091b38 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -19,30 +19,14 @@
 
 {include file='shared_formNotice'}
 
-<button type="button" id="testButton" class="button">TODO: add object filter</button>
+<button type="button" id="testButton" class="button" data-endpoint="{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}">TODO: add object filter</button>
 <script data-relocate="true">
-	require(["WoltLabSuite/Core/Component/Dialog"], ({ dialogFactory }) => {
-		document.getElementById("testButton").addEventListener("click", () => {
-			dialogFactory()
-				.usingFormBuilder()
-				.fromEndpoint('{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}')
-				.then((response) => {
-					if (response.ok) {
-						addCondition(response.result);
-					}
-				});
-		});
-
-		function addCondition(result) {
-			const li = document.createElement("li");
-			li.textContent = result.summary;
-
-			document.getElementById("conditions").append(li);
-		}
+	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
+		setup(document.getElementById("conditions"), document.getElementById("testButton"));
 	});
 </script>
 
-<ul id="conditions"></ul>
+<div id="conditions"></div>
 
 <form method="post"
 	action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
new file mode 100644
index 00000000000..4f946333ce0
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -0,0 +1,43 @@
+define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Dialog", "WoltLabSuite/Core/Language"], function (require, exports, PromiseMutex_1, Dialog_1, Language_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.setup = setup;
+    class ObjectFilterBuilder {
+        #conditions = new Map();
+        #container;
+        #endpoint;
+        constructor(container, button) {
+            this.#container = container;
+            this.#endpoint = button.dataset.endpoint;
+            button.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#addFilter()));
+        }
+        async #addFilter() {
+            const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(this.#endpoint);
+            if (response.ok) {
+                this.#createCondition(response.result);
+            }
+        }
+        #createCondition(data) {
+            const item = document.createElement("div");
+            item.textContent = data.summary;
+            const deleteButton = document.createElement("button");
+            deleteButton.type = "button";
+            deleteButton.classList.add("button", "small", "jsTooltip");
+            deleteButton.title = (0, Language_1.getPhrase)("wcf.global.button.delete");
+            deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
+            deleteButton.addEventListener("click", () => {
+                this.#deleteCondition(item);
+            });
+            item.append(deleteButton);
+            this.#container.append(item);
+            this.#conditions.set(item, data);
+        }
+        #deleteCondition(element) {
+            element.remove();
+            this.#conditions.delete(element);
+        }
+    }
+    function setup(container, button) {
+        new ObjectFilterBuilder(container, button);
+    }
+});

From 91d62876c2bd9f0c4695ca6e212b973e599aa765 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 Mar 2026 20:08:48 +0200
Subject: [PATCH 04/47] Migrate to form builder

---
 .../shared_objectFilterFormField.tpl          |  11 ++
 .../acp/templates/userGroupAssignmentAdd.tpl  |  77 +-----------
 .../form/UserGroupAssignmentAddForm.class.php | 112 +++++++-----------
 .../lib/data/user/group/UserGroup.class.php   |   7 +-
 .../field/ObjectFilterFormField.class.php     |  16 +++
 5 files changed, 77 insertions(+), 146 deletions(-)
 create mode 100644 com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
 create mode 100644 wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
new file mode 100644
index 00000000000..7421c6816c2
--- /dev/null
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -0,0 +1,11 @@
+<button type="button" id="{$field->getPrefixedId()}_addFilter" class="button" data-endpoint="{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}">TODO: add object filter</button>
+<div id="{$field->getPrefixedId()}"></div>
+
+<script data-relocate="true">
+	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
+		setup(
+			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
+			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}_addFilter')
+		);
+	});
+</script>
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index 4f5a8091b38..f48eb72b87e 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -7,7 +7,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $action == 'edit'}
+			{if $action === 'edit'}
 				<li>
 					{unsafe:$interactionContextMenu->render()}
 				</li>
@@ -19,79 +19,6 @@
 
 {include file='shared_formNotice'}
 
-<button type="button" id="testButton" class="button" data-endpoint="{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}">TODO: add object filter</button>
-<script data-relocate="true">
-	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
-		setup(document.getElementById("conditions"), document.getElementById("testButton"));
-	});
-</script>
-
-<div id="conditions"></div>
-
-<form method="post"
-	action="{if $action == 'add'}{link controller='UserGroupAssignmentAdd'}{/link}{else}{link controller='UserGroupAssignmentEdit' object=$assignment}{/link}{/if}">
-	<div class="section">
-		<dl{if $errorField == 'title'} class="formError" {/if}>
-			<dt><label for="title">{lang}wcf.global.name{/lang}</label></dt>
-			<dd>
-				<input type="text" id="title" name="title" value="{$title}" class="long">
-				{if $errorField == 'title'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{else}
-							{lang}wcf.acp.group.assignment.title.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-			</dl>
-
-			<dl{if $errorField == 'groupID'} class="formError" {/if}>
-				<dt><label for="groupID">{lang}wcf.user.group{/lang}</label></dt>
-				<dd>
-					{htmlOptions name='groupID' id='groupID' options=$userGroups selected=$groupID}
-					{if $errorField == 'groupID'}
-						{if $errorType == 'noValidSelection'}
-							<small class="innerError">{lang}wcf.global.form.error.noValidSelection{/lang}</small>
-						{else}
-							<small class="innerError">{lang}wcf.acp.group.assignment.groupID.error.{$errorType}{/lang}</small>
-						{/if}
-					{/if}
-				</dd>
-				</dl>
-
-				<dl>
-					<dt></dt>
-					<dd>
-						<label><input type="checkbox" id="isDisabled" name="isDisabled" {if $isDisabled} checked{/if}>
-							{lang}wcf.acp.group.assignment.isDisabled{/lang}</label>
-					</dd>
-				</dl>
-
-				{event name='dataFields'}
-	</div>
-
-	{event name='sections'}
-
-	<section class="section">
-		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.acp.group.assignment.conditions{/lang}</h2>
-			<p class="sectionDescription">{lang}wcf.acp.group.assignment.conditions.description{/lang}</p>
-		</header>
-
-		{if $errorField == 'conditions'}
-			<woltlab-core-notice type="error">{lang}wcf.acp.group.assignment.error.noConditions{/lang}</woltlab-core-notice>
-		{/if}
-
-		{include file='shared_userConditions'}
-	</section>
-
-	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		<input type="hidden" name="action" value="{$action}">
-		{csrfToken}
-	</div>
-</form>
+{unsafe:$form->getHTML()}
 
 {include file='footer'}
\ No newline at end of file
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 1aedeb4baf7..b20a70a3bd5 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -3,11 +3,17 @@
 namespace wcf\acp\form;
 
 use wcf\data\object\type\ObjectType;
+use wcf\data\user\group\assignment\UserGroupAssignment;
 use wcf\data\user\group\assignment\UserGroupAssignmentAction;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractForm;
+use wcf\form\AbstractFormBuilderForm;
 use wcf\system\condition\ConditionHandler;
 use wcf\system\exception\UserInputException;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\ObjectFilterFormField;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\form\builder\field\TitleFormField;
 use wcf\system\request\LinkHandler;
 use wcf\system\user\group\assignment\UserGroupAssignmentHandler;
 use wcf\system\WCF;
@@ -16,11 +22,12 @@
 /**
  * Shows the form to create a new automatic user group assignment.
  *
- * @author  Matthias Schmidt
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Alexander Ebert, Matthias Schmidt
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @implements  AbstractFormBuilderForm<UserGroupAssignment>
  */
-class UserGroupAssignmentAddForm extends AbstractForm
+class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
 {
     /**
      * @inheritDoc
@@ -33,34 +40,46 @@ class UserGroupAssignmentAddForm extends AbstractForm
      */
     public $conditions = [];
 
-    /**
-     * id of the selected user group
-     * @var int
-     */
-    public $groupID = 0;
-
-    /**
-     * true if the automatic assignment is disabled
-     * @var int
-     */
-    public $isDisabled = 0;
-
     /**
      * @inheritDoc
      */
     public $neededPermissions = ['admin.user.canManageGroupAssignment'];
 
-    /**
-     * title of the user group assignment
-     * @var string
-     */
-    public $title = '';
+    #[\Override]
+    protected function createForm()
+    {
+        parent::createForm();
+
+        $this->form->appendChildren([
+            TitleFormField::create('title')
+                ->label('wcf.global.name')
+                ->maximumLength(255)
+                ->required(),
+            SelectFormField::create('groupID')
+                ->label('wcf.user.group')
+                ->options($this->getAvailableUserGroups())
+                ->required(),
+            BooleanFormField::create('isDisabled')
+                ->label('wcf.acp.group.assignment.isDisabled'),
+            ObjectFilterFormField::create('conditions')
+        ]);
+    }
 
     /**
-     * list of selectable user groups
-     * @var UserGroup[]
+     * @return array<int, UserGroup>
      */
-    public $userGroups = [];
+    private function getAvailableUserGroups(): array
+    {
+        return \array_filter(
+            UserGroup::getSortedGroupsByType([], [
+                UserGroup::EVERYONE,
+                UserGroup::GUESTS,
+                UserGroup::OWNER,
+                UserGroup::USERS,
+            ]),
+            static fn(UserGroup $userGroup) => $userGroup->isAccessible(),
+        );
+    }
 
     #[\Override]
     public function assignVariables()
@@ -70,28 +89,12 @@ public function assignVariables()
         WCF::getTPL()->assign([
             'action' => 'add',
             'groupedObjectTypes' => $this->conditions,
-            'groupID' => $this->groupID,
-            'isDisabled' => $this->isDisabled,
-            'title' => $this->title,
-            'userGroups' => $this->userGroups,
         ]);
     }
 
     #[\Override]
     public function readData()
     {
-        $this->userGroups = UserGroup::getSortedGroupsByType([], [
-            UserGroup::EVERYONE,
-            UserGroup::GUESTS,
-            UserGroup::OWNER,
-            UserGroup::USERS,
-        ]);
-        foreach ($this->userGroups as $key => $userGroup) {
-            if (!$userGroup->isAccessible()) {
-                unset($this->userGroups[$key]);
-            }
-        }
-
         $this->conditions = UserGroupAssignmentHandler::getInstance()->getGroupedObjectTypes();
 
         parent::readData();
@@ -102,16 +105,6 @@ public function readFormParameters()
     {
         parent::readFormParameters();
 
-        if (isset($_POST['groupID'])) {
-            $this->groupID = \intval($_POST['groupID']);
-        }
-        if (isset($_POST['isDisabled'])) {
-            $this->isDisabled = 1;
-        }
-        if (isset($_POST['title'])) {
-            $this->title = StringUtil::trim($_POST['title']);
-        }
-
         foreach ($this->conditions as $conditions) {
             /** @var ObjectType $condition */
             foreach ($conditions as $condition) {
@@ -127,10 +120,11 @@ public function save()
 
         $this->objectAction = new UserGroupAssignmentAction([], 'create', [
             'data' => \array_merge($this->additionalFields, [
+                /*
                 'groupID' => $this->groupID,
                 'isDisabled' => $this->isDisabled,
                 'title' => $this->title,
-            ]),
+                */]),
         ]);
         $returnValues = $this->objectAction->executeAction();
 
@@ -144,11 +138,6 @@ public function save()
 
         $this->saved();
 
-        // reset values
-        $this->groupID = 0;
-        $this->isDisabled = 0;
-        $this->title = '';
-
         foreach ($this->conditions as $conditions) {
             foreach ($conditions as $condition) {
                 $condition->getProcessor()->reset();
@@ -169,17 +158,6 @@ public function validate()
     {
         parent::validate();
 
-        if (empty($this->title)) {
-            throw new UserInputException('title');
-        }
-        if (\strlen($this->title) > 255) {
-            throw new UserInputException('title', 'tooLong');
-        }
-
-        if (!isset($this->userGroups[$this->groupID])) {
-            throw new UserInputException('groupID', 'noValidSelection');
-        }
-
         $hasData = false;
         foreach ($this->conditions as $conditions) {
             foreach ($conditions as $condition) {
diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
index 6284e82ec1d..d56c270641a 100644
--- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php
@@ -133,10 +133,9 @@ public static function getGroupsByType(array $types = [], array $invalidGroupTyp
     /**
      * Returns a sorted list of groups filtered by given type.
      *
-     * @param int[] $types
-     * @param int[] $invalidGroupTypes
-     * @return  UserGroup[]
-     * @since       5.3
+     * @param list<int> $types
+     * @param list<int> $invalidGroupTypes
+     * @return array<int, UserGroup>
      */
     public static function getSortedGroupsByType(array $types = [], array $invalidGroupTypes = [])
     {
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
new file mode 100644
index 00000000000..c7c0b9dbd78
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace wcf\system\form\builder\field;
+
+use Override;
+
+final class ObjectFilterFormField extends AbstractFormField
+{
+    protected $templateName = 'shared_objectFilterFormField';
+
+    #[Override]
+    public function readValue()
+    {
+        throw new \Exception('Not implemented');
+    }
+}

From 30165d18d8ebb8ebb8309915ffb7dc6c20a0c9cc Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 29 Mar 2026 22:20:53 +0200
Subject: [PATCH 05/47] Basic roundtrip of the data

---
 .../shared_objectFilterFormField.tpl          |  4 +-
 .../Core/Component/Object/Filter/Builder.ts   | 51 ++++++++++++--
 .../acp/templates/userGroupAssignmentAdd.tpl  |  2 -
 .../Core/Component/Object/Filter/Builder.js   | 41 ++++++++++--
 .../form/UserGroupAssignmentAddForm.class.php | 66 +------------------
 .../field/ObjectFilterFormField.class.php     | 18 ++++-
 6 files changed, 104 insertions(+), 78 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index 7421c6816c2..5b371141090 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -1,11 +1,11 @@
-<button type="button" id="{$field->getPrefixedId()}_addFilter" class="button" data-endpoint="{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}">TODO: add object filter</button>
 <div id="{$field->getPrefixedId()}"></div>
 
 <script data-relocate="true">
 	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
 		setup(
 			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
-			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}_addFilter')
+			'{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}',
+			{unsafe:$field->getValue()},
 		);
 	});
 </script>
diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index 92b3b0419e1..3ad14af1290 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -8,19 +8,53 @@ type Response = {
   value: string;
 };
 
+type SerializedData = [string, string][];
+
 class ObjectFilterBuilder {
   readonly #conditions: Map<HTMLElement, Response> = new Map();
   readonly #container: HTMLElement;
   readonly #endpoint: string;
 
-  constructor(container: HTMLElement, button: HTMLElement) {
+  constructor(container: HTMLElement, endpoint: string, values: SerializedData) {
     this.#container = container;
-    this.#endpoint = button.dataset.endpoint!;
+    this.#endpoint = endpoint;
 
+    const button = document.createElement("button");
+    button.type = "button";
+    button.classList.add("button");
+    button.textContent = "TODO: add object filter";
     button.addEventListener(
       "click",
       promiseMutex(() => this.#addFilter()),
     );
+
+    this.#container.insertAdjacentElement("beforebegin", button);
+
+    const form = this.#container.closest("form");
+    let shadow: HTMLInputElement | undefined = undefined;
+    form?.addEventListener("submit", () => {
+      if (shadow === undefined) {
+        shadow = document.createElement("input");
+        shadow.type = "hidden";
+        shadow.name = this.#container.id;
+
+        this.#container.insertAdjacentElement("afterend", shadow);
+      }
+
+      shadow.value = this.#serializeConditions();
+    });
+
+    this.#fromSerializedData(values);
+  }
+
+  #fromSerializedData(values: SerializedData): void {
+    for (const [identifier, value] of values) {
+      this.#createCondition({
+        identifier,
+        summary: "TODO: missing summary!",
+        value,
+      });
+    }
   }
 
   async #addFilter(): Promise<void> {
@@ -54,8 +88,17 @@ class ObjectFilterBuilder {
     element.remove();
     this.#conditions.delete(element);
   }
+
+  #serializeConditions(): string {
+    const values: [string, string][] = [];
+    this.#conditions.forEach((condition) => {
+      values.push([condition.identifier, condition.value]);
+    });
+
+    return JSON.stringify(values);
+  }
 }
 
-export function setup(container: HTMLElement, button: HTMLButtonElement): void {
-  new ObjectFilterBuilder(container, button);
+export function setup(container: HTMLElement, endpoint: string, values: SerializedData): void {
+  new ObjectFilterBuilder(container, endpoint, values);
 }
diff --git a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
index f48eb72b87e..8d0b99f820a 100644
--- a/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAssignmentAdd.tpl
@@ -17,8 +17,6 @@
 	</nav>
 </header>
 
-{include file='shared_formNotice'}
-
 {unsafe:$form->getHTML()}
 
 {include file='footer'}
\ No newline at end of file
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 4f946333ce0..6a36d303c27 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -6,10 +6,36 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
         #conditions = new Map();
         #container;
         #endpoint;
-        constructor(container, button) {
+        constructor(container, endpoint, values) {
             this.#container = container;
-            this.#endpoint = button.dataset.endpoint;
+            this.#endpoint = endpoint;
+            const button = document.createElement("button");
+            button.type = "button";
+            button.classList.add("button");
+            button.textContent = "TODO: add object filter";
             button.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#addFilter()));
+            this.#container.insertAdjacentElement("beforebegin", button);
+            const form = this.#container.closest("form");
+            let shadow = undefined;
+            form?.addEventListener("submit", () => {
+                if (shadow === undefined) {
+                    shadow = document.createElement("input");
+                    shadow.type = "hidden";
+                    shadow.name = this.#container.id;
+                    this.#container.insertAdjacentElement("afterend", shadow);
+                }
+                shadow.value = this.#serializeConditions();
+            });
+            this.#fromSerializedData(values);
+        }
+        #fromSerializedData(values) {
+            for (const [identifier, value] of values) {
+                this.#createCondition({
+                    identifier,
+                    summary: "TODO: missing summary!",
+                    value,
+                });
+            }
         }
         async #addFilter() {
             const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(this.#endpoint);
@@ -36,8 +62,15 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             element.remove();
             this.#conditions.delete(element);
         }
+        #serializeConditions() {
+            const values = [];
+            this.#conditions.forEach((condition) => {
+                values.push([condition.identifier, condition.value]);
+            });
+            return JSON.stringify(values);
+        }
     }
-    function setup(container, button) {
-        new ObjectFilterBuilder(container, button);
+    function setup(container, endpoint, values) {
+        new ObjectFilterBuilder(container, endpoint, values);
     }
 });
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index b20a70a3bd5..33fe19c3062 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -2,22 +2,17 @@
 
 namespace wcf\acp\form;
 
-use wcf\data\object\type\ObjectType;
 use wcf\data\user\group\assignment\UserGroupAssignment;
 use wcf\data\user\group\assignment\UserGroupAssignmentAction;
 use wcf\data\user\group\UserGroup;
-use wcf\form\AbstractForm;
 use wcf\form\AbstractFormBuilderForm;
 use wcf\system\condition\ConditionHandler;
-use wcf\system\exception\UserInputException;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\ObjectFilterFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\field\TitleFormField;
 use wcf\system\request\LinkHandler;
-use wcf\system\user\group\assignment\UserGroupAssignmentHandler;
 use wcf\system\WCF;
-use wcf\util\StringUtil;
 
 /**
  * Shows the form to create a new automatic user group assignment.
@@ -34,12 +29,6 @@ class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
      */
     public $activeMenuItem = 'wcf.acp.menu.link.group.assignment.add';
 
-    /**
-     * list of grouped user group assignment condition object types
-     * @var ObjectType[][]
-     */
-    public $conditions = [];
-
     /**
      * @inheritDoc
      */
@@ -81,41 +70,11 @@ private function getAvailableUserGroups(): array
         );
     }
 
-    #[\Override]
-    public function assignVariables()
-    {
-        parent::assignVariables();
-
-        WCF::getTPL()->assign([
-            'action' => 'add',
-            'groupedObjectTypes' => $this->conditions,
-        ]);
-    }
-
-    #[\Override]
-    public function readData()
-    {
-        $this->conditions = UserGroupAssignmentHandler::getInstance()->getGroupedObjectTypes();
-
-        parent::readData();
-    }
-
-    #[\Override]
-    public function readFormParameters()
-    {
-        parent::readFormParameters();
-
-        foreach ($this->conditions as $conditions) {
-            /** @var ObjectType $condition */
-            foreach ($conditions as $condition) {
-                $condition->getProcessor()->readFormParameters();
-            }
-        }
-    }
-
     #[\Override]
     public function save()
     {
+        \wcfDebug($this->form->getData());
+
         parent::save();
 
         $this->objectAction = new UserGroupAssignmentAction([], 'create', [
@@ -152,25 +111,4 @@ public function save()
             ),
         ]);
     }
-
-    #[\Override]
-    public function validate()
-    {
-        parent::validate();
-
-        $hasData = false;
-        foreach ($this->conditions as $conditions) {
-            foreach ($conditions as $condition) {
-                $condition->getProcessor()->validate();
-
-                if (!$hasData && $condition->getProcessor()->getData() !== null) {
-                    $hasData = true;
-                }
-            }
-        }
-
-        if (!$hasData) {
-            throw new UserInputException('conditions');
-        }
-    }
 }
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index c7c0b9dbd78..ac083dd2745 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -3,14 +3,28 @@
 namespace wcf\system\form\builder\field;
 
 use Override;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
 
 final class ObjectFilterFormField extends AbstractFormField
 {
     protected $templateName = 'shared_objectFilterFormField';
 
     #[Override]
-    public function readValue()
+    public function readValue(): ObjectFilterFormField
     {
-        throw new \Exception('Not implemented');
+        if ($this->getDocument()->hasRequestData($this->getPrefixedId())) {
+            $this->value = $this->getDocument()->getRequestData($this->getPrefixedId());
+        }
+
+        return $this;
+    }
+
+    #[Override]
+    public function validate(): void
+    {
+        // TODO: This error only exists for development purposes!
+        $this->addValidationError(
+            new FormFieldValidationError('empty')
+        );
     }
 }

From 7063e556346195d0b309189a0de39485f0629266 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 30 Mar 2026 17:33:00 +0200
Subject: [PATCH 06/47] Register object filters through object types,
 serialization support

---
 com.woltlab.wcf/objectTypeDefinition.xml      |  4 +
 .../shared_objectFilterFormField.tpl          |  2 +-
 .../Core/Component/Object/Filter/Builder.ts   | 16 ++--
 .../Core/Component/Object/Filter/Builder.js   |  8 +-
 .../form/UserGroupAssignmentAddForm.class.php |  2 +
 .../field/ObjectFilterFormField.class.php     | 92 ++++++++++++++++++-
 .../builder/IObjectFilterBuilder.class.php    | 13 +++
 ...oupAssignmentObjectFilterBuilder.class.php |  7 +-
 8 files changed, 125 insertions(+), 19 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php

diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index f3bd5c6159b..f6d75a94f5b 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -229,5 +229,9 @@
 			<name>com.woltlab.wcf.file</name>
 			<interfacename>wcf\system\file\processor\IFileProcessor</interfacename>
 		</definition>
+		<definition>
+			<name>com.woltlab.wcf.objectFilter</name>
+			<interfacename>wcf\system\object\filter\builder\IObjectFilterBuilder</interfacename>
+		</definition>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index 5b371141090..53367946ae5 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -5,7 +5,7 @@
 		setup(
 			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
 			'{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}',
-			{unsafe:$field->getValue()},
+			{unsafe:$field->toJson()},
 		);
 	});
 </script>
diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index 3ad14af1290..553a6c5c315 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -8,7 +8,13 @@ type Response = {
   value: string;
 };
 
-type SerializedData = [string, string][];
+type Filter = {
+  identifier: string;
+  summary: string;
+  value: string;
+};
+
+type SerializedData = Filter[];
 
 class ObjectFilterBuilder {
   readonly #conditions: Map<HTMLElement, Response> = new Map();
@@ -48,12 +54,8 @@ class ObjectFilterBuilder {
   }
 
   #fromSerializedData(values: SerializedData): void {
-    for (const [identifier, value] of values) {
-      this.#createCondition({
-        identifier,
-        summary: "TODO: missing summary!",
-        value,
-      });
+    for (const filter of values) {
+      this.#createCondition(filter);
     }
   }
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 6a36d303c27..610f75a7b34 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -29,12 +29,8 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             this.#fromSerializedData(values);
         }
         #fromSerializedData(values) {
-            for (const [identifier, value] of values) {
-                this.#createCondition({
-                    identifier,
-                    summary: "TODO: missing summary!",
-                    value,
-                });
+            for (const filter of values) {
+                this.#createCondition(filter);
             }
         }
         async #addFilter() {
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 33fe19c3062..f9d1292d374 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -51,6 +51,8 @@ protected function createForm()
             BooleanFormField::create('isDisabled')
                 ->label('wcf.acp.group.assignment.isDisabled'),
             ObjectFilterFormField::create('conditions')
+                ->objectType('com.woltlab.wcf.userGroupAssignment')
+                ->required()
         ]);
     }
 
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index ac083dd2745..854eb553c2a 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -2,11 +2,18 @@
 
 namespace wcf\system\form\builder\field;
 
+use CuyZ\Valinor\Mapper\MappingError;
+use CuyZ\Valinor\Mapper\Source\Source;
+use CuyZ\Valinor\MapperBuilder;
 use Override;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\form\builder\TObjectTypeFormNode;
+use wcf\system\object\filter\builder\IObjectFilterBuilder;
 
 final class ObjectFilterFormField extends AbstractFormField
 {
+    use TObjectTypeFormNode;
+
     protected $templateName = 'shared_objectFilterFormField';
 
     #[Override]
@@ -22,9 +29,92 @@ public function readValue(): ObjectFilterFormField
     #[Override]
     public function validate(): void
     {
-        // TODO: This error only exists for development purposes!
+        try {
+            $values = $this->unserializeFilters($this->getValue());
+        } catch (MappingError) {
+            $this->addValidationError(
+                new FormFieldValidationError('malformedJson')
+            );
+
+            return;
+        }
+
+        if ($this->isRequired() && $values === []) {
+            $this->addValidationError(
+                new FormFieldValidationError('empty')
+            );
+        }
+
+        // TODO: debug only
         $this->addValidationError(
             new FormFieldValidationError('empty')
         );
     }
+
+    #[Override]
+    public function getObjectTypeDefinition(): string
+    {
+        return 'com.woltlab.wcf.objectFilter';
+    }
+
+    public function toJson(): string
+    {
+        return \json_encode(
+            $this->unserializeFilters($this->getValue()),
+            \JSON_THROW_ON_ERROR,
+        );
+    }
+
+    /**
+     * @return list<array{
+     *  identifier: string,
+     *  summary: string,
+     *  value: string,
+     * }>
+     * @throws MappingError
+     */
+    private function unserializeFilters(?string $json): array
+    {
+        if ($json === null) {
+            return [];
+        }
+
+        /** @var list<array{0: string, 1: string}> $values */
+        $values = (new MapperBuilder())->mapper()->map(
+            <<<'EOT'
+                list<array{0: string, 1: string}>
+                EOT,
+            Source::json($json)
+        );
+
+        if ($values === []) {
+            return $values;
+        }
+
+        /** @var IObjectFilterBuilder $builder */
+        $builder = $this->getObjectType()->getProcessor();
+        $filters = [];
+        foreach ($builder->getFilters() as $filter) {
+            $filters[$filter->getIdentifier()] = $filter;
+        }
+
+        return \array_map(
+            function (array $value) use ($filters): array {
+                [$identifier, $serializedValue] = $value;
+                $filter = $filters[$identifier];
+
+                return [
+                    'identifier' => $identifier,
+                    'summary' => $filter->summarizeValue(
+                        $filter->unserializeValue($serializedValue),
+                    ),
+                    'value' => $serializedValue,
+                ];
+            },
+            \array_filter(
+                $values,
+                static fn($value) => isset($filters[$value[0]]),
+            ),
+        );
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
new file mode 100644
index 00000000000..6a4083fe077
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace wcf\system\object\filter\builder;
+
+use wcf\system\object\filter\IObjectFilter;
+
+interface IObjectFilterBuilder
+{
+    /**
+     * @return list<IObjectFilter<mixed>>
+     */
+    public function getFilters(): array;
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 380a60043f9..b1ead8a3146 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -2,11 +2,12 @@
 
 namespace wcf\system\object\filter\builder;
 
+use Override;
 use wcf\system\object\filter\IObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 
-final class UserGroupAssignmentObjectFilterBuilder
+final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuilder
 {
     /**
      * @var list<IObjectFilter<mixed>>
@@ -21,9 +22,7 @@ public function __construct()
         ];
     }
 
-    /**
-     * @return list<IObjectFilter<mixed>>
-     */
+    #[Override]
     public function getFilters(): array
     {
         return $this->filters;

From d0db381fd31547081d235238056144cf11ee7067 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 30 Mar 2026 19:01:08 +0200
Subject: [PATCH 07/47] Use the object type to fetch the builder

---
 .../shared_objectFilterFormField.tpl          |  2 +-
 .../ObjectFilterBuilderAction.class.php       | 32 +++++++++++++++----
 .../field/ObjectFilterFormField.class.php     | 12 +++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index 53367946ae5..f8765021b02 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -4,7 +4,7 @@
 	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
 		setup(
 			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
-			'{link controller='ObjectFilterBuilder' forceFrontend=true}{/link}',
+			'{unsafe:$field->getEndpoint()|encodeJS}',
 			{unsafe:$field->toJson()},
 		);
 	});
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index fd504724f10..7b7190db461 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -6,18 +6,41 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\http\Helper;
+use wcf\system\exception\IllegalLinkException;
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\Psr15DialogForm;
-use wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder;
+use wcf\system\object\filter\builder\IObjectFilterBuilder;
 
 final class ObjectFilterBuilderAction implements RequestHandlerInterface
 {
     #[\Override]
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $form = $this->getForm();
+        $parameters = Helper::mapQueryParameters(
+            $request->getQueryParams(),
+            <<<'EOT'
+                array {
+                    objectType: string,
+                }
+                EOT
+        );
+        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
+            'com.woltlab.wcf.objectFilter',
+            $parameters['objectType'],
+        );
+
+        if ($objectType === null) {
+            throw new IllegalLinkException();
+        }
+
+        $builder = $objectType->getProcessor();
+        \assert($builder instanceof IObjectFilterBuilder);
+
+        $form = $this->getForm($builder);
 
         if ($request->getMethod() === 'GET') {
             return $form->toResponse();
@@ -30,8 +53,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $rawData = $form->getData();
             $data = $rawData['data'];
 
-            $builder = new UserGroupAssignmentObjectFilterBuilder();
-
             $result = [];
             foreach ($builder->getFilters() as $filter) {
                 if ($data['filter'] !== $filter->getIdentifier()) {
@@ -56,7 +77,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
     }
 
-    private function getForm(): Psr15DialogForm
+    private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
     {
         $form = new Psr15DialogForm(
             static::class,
@@ -72,7 +93,6 @@ private function getForm(): Psr15DialogForm
             ->required();
         $container->appendChild($select);
 
-        $builder = new UserGroupAssignmentObjectFilterBuilder();
         $selectValues = [];
         foreach ($builder->getFilters() as $filter) {
             $formField = $filter->getFormField();
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 854eb553c2a..996a9383f6f 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -6,9 +6,11 @@
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
 use Override;
+use wcf\action\ObjectFilterBuilderAction;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
+use wcf\system\request\LinkHandler;
 
 final class ObjectFilterFormField extends AbstractFormField
 {
@@ -65,6 +67,16 @@ public function toJson(): string
         );
     }
 
+    public function getEndpoint(): string
+    {
+        return LinkHandler::getInstance()->getControllerLink(
+            ObjectFilterBuilderAction::class,
+            [
+                'objectType' => $this->getObjectType()->objectType,
+            ],
+        );
+    }
+
     /**
      * @return list<array{
      *  identifier: string,

From f81a876d1e5a51906b09c7d1ebcb8574c9208acc Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 23 Apr 2026 18:59:58 +0200
Subject: [PATCH 08/47] PoC to filter a query for users by conditions

---
 .../form/UserGroupAssignmentAddForm.class.php | 49 +-----------
 .../UserGroupAssignmentEditForm.class.php     | 75 +++----------------
 .../assignment/UserGroupAssignment.class.php  |  1 +
 .../form/AbstractFormBuilderForm.class.php    |  1 -
 .../field/ObjectFilterFormField.class.php     |  5 --
 .../filter/ObjectFilterHandler.class.php      | 66 ++++++++++++++++
 .../user/UserAvatarObjectFilter.class.php     |  4 +-
 .../UserGroupAssignmentHandler.class.php      | 15 +++-
 wcfsetup/setup/db/install_com.woltlab.wcf.php |  1 +
 9 files changed, 96 insertions(+), 121 deletions(-)

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index f9d1292d374..66f150e991e 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -6,13 +6,10 @@
 use wcf\data\user\group\assignment\UserGroupAssignmentAction;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractFormBuilderForm;
-use wcf\system\condition\ConditionHandler;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\ObjectFilterFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\field\TitleFormField;
-use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
 
 /**
  * Shows the form to create a new automatic user group assignment.
@@ -34,6 +31,10 @@ class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
      */
     public $neededPermissions = ['admin.user.canManageGroupAssignment'];
 
+    public $objectActionClass = UserGroupAssignmentAction::class;
+
+    public $objectEditLinkController = UserGroupAssignmentEditForm::class;
+
     #[\Override]
     protected function createForm()
     {
@@ -71,46 +72,4 @@ private function getAvailableUserGroups(): array
             static fn(UserGroup $userGroup) => $userGroup->isAccessible(),
         );
     }
-
-    #[\Override]
-    public function save()
-    {
-        \wcfDebug($this->form->getData());
-
-        parent::save();
-
-        $this->objectAction = new UserGroupAssignmentAction([], 'create', [
-            'data' => \array_merge($this->additionalFields, [
-                /*
-                'groupID' => $this->groupID,
-                'isDisabled' => $this->isDisabled,
-                'title' => $this->title,
-                */]),
-        ]);
-        $returnValues = $this->objectAction->executeAction();
-
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->conditions as $groupedObjectTypes) {
-            $conditions = \array_merge($conditions, $groupedObjectTypes);
-        }
-
-        ConditionHandler::getInstance()->createConditions($returnValues['returnValues']->assignmentID, $conditions);
-
-        $this->saved();
-
-        foreach ($this->conditions as $conditions) {
-            foreach ($conditions as $condition) {
-                $condition->getProcessor()->reset();
-            }
-        }
-
-        WCF::getTPL()->assign([
-            'success' => true,
-            'objectEditLink' => LinkHandler::getInstance()->getControllerLink(
-                UserGroupAssignmentEditForm::class,
-                ['id' => $returnValues['returnValues']->assignmentID]
-            ),
-        ]);
-    }
 }
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
index c6ae97eee42..ed4e72ce8a8 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
@@ -4,10 +4,7 @@
 
 use wcf\acp\page\UserGroupAssignmentListPage;
 use wcf\data\user\group\assignment\UserGroupAssignment;
-use wcf\data\user\group\assignment\UserGroupAssignmentAction;
-use wcf\form\AbstractForm;
 use wcf\http\Helper;
-use wcf\system\condition\ConditionHandler;
 use wcf\system\interaction\admin\UserGroupAssignmentInteractions;
 use wcf\system\interaction\StandaloneInteractionContextMenuComponent;
 use wcf\system\request\LinkHandler;
@@ -28,79 +25,29 @@ class UserGroupAssignmentEditForm extends UserGroupAssignmentAddForm
     public $activeMenuItem = 'wcf.acp.menu.link.group.assignment';
 
     /**
-     * edited automatic user group assignment
-     * @var ?UserGroupAssignment
+     * @inheritDoc
      */
-    public $assignment;
-
-    #[\Override]
-    public function assignVariables()
-    {
-        parent::assignVariables();
-
-        WCF::getTPL()->assign([
-            'action' => 'edit',
-            'assignment' => $this->assignment,
-            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
-                new UserGroupAssignmentInteractions(),
-                $this->assignment,
-                LinkHandler::getInstance()->getControllerLink(UserGroupAssignmentListPage::class)
-            ),
-        ]);
-    }
-
-    #[\Override]
-    public function readData()
-    {
-        parent::readData();
-
-        if ($_POST === []) {
-            $this->groupID = $this->assignment->groupID;
-            $this->title = $this->assignment->title;
-
-            $conditions = $this->assignment->getConditions();
-            foreach ($conditions as $condition) {
-                $this->conditions[$condition->getObjectType()->conditiongroup][$condition->objectTypeID]->getProcessor()->setData($condition);
-            }
-        }
-    }
+    public $formAction = 'edit';
 
     #[\Override]
     public function readParameters()
     {
         parent::readParameters();
 
-        $this->assignment = Helper::fetchObjectFromQueryParameter(UserGroupAssignment::class);
+        $this->formObject = Helper::fetchObjectFromQueryParameter(UserGroupAssignment::class);
     }
 
     #[\Override]
-    public function save()
+    public function assignVariables()
     {
-        AbstractForm::save();
+        parent::assignVariables();
 
-        $this->objectAction = new UserGroupAssignmentAction([$this->assignment], 'update', [
-            'data' => \array_merge($this->additionalFields, [
-                'groupID' => $this->groupID,
-                'isDisabled' => $this->isDisabled,
-                'title' => $this->title,
-            ]),
+        WCF::getTPL()->assign([
+            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
+                new UserGroupAssignmentInteractions(),
+                $this->formObject,
+                LinkHandler::getInstance()->getControllerLink(UserGroupAssignmentListPage::class)
+            ),
         ]);
-        $this->objectAction->executeAction();
-
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->conditions as $groupedObjectTypes) {
-            $conditions = \array_merge($conditions, $groupedObjectTypes);
-        }
-
-        ConditionHandler::getInstance()->updateConditions(
-            $this->assignment->assignmentID,
-            $this->assignment->getConditions(),
-            $conditions
-        );
-
-        $this->saved();
-
-        WCF::getTPL()->assign('success', true);
     }
 }
diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
index d4164d45747..bbe9fc9820e 100644
--- a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
@@ -19,6 +19,7 @@
  * @property-read   int     $groupID        id of the user group to which users are automatically assigned
  * @property-read   string  $title          title of the automatic user group assignment
  * @property-read   0|1     $isDisabled     is `1` if the user group assignment is disabled and thus not checked for automatic assignments, otherwise `0`
+ * @property-read   string  $conditions
  */
 class UserGroupAssignment extends DatabaseObject implements IRouteController
 {
diff --git a/wcfsetup/install/files/lib/form/AbstractFormBuilderForm.class.php b/wcfsetup/install/files/lib/form/AbstractFormBuilderForm.class.php
index a52b933ada1..94f5b310eca 100644
--- a/wcfsetup/install/files/lib/form/AbstractFormBuilderForm.class.php
+++ b/wcfsetup/install/files/lib/form/AbstractFormBuilderForm.class.php
@@ -179,7 +179,6 @@ public function save()
             $formData['data'] = [];
         }
         $formData['data'] = \array_merge($this->additionalFields, $formData['data']);
-
         $this->objectAction = new $this->objectActionClass(
             \array_filter([$this->formObject]),
             $action,
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 996a9383f6f..57500db1ee2 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -46,11 +46,6 @@ public function validate(): void
                 new FormFieldValidationError('empty')
             );
         }
-
-        // TODO: debug only
-        $this->addValidationError(
-            new FormFieldValidationError('empty')
-        );
     }
 
     #[Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index ffe1393786a..1df82e411d1 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -2,7 +2,14 @@
 
 namespace wcf\system\object\filter;
 
+use CuyZ\Valinor\Mapper\MappingError;
+use CuyZ\Valinor\Mapper\Source\Source;
+use CuyZ\Valinor\MapperBuilder;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\exception\InvalidObjectTypeException;
 use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\builder\IObjectFilterBuilder;
 use wcf\system\WCF;
 
 final class ObjectFilterHandler
@@ -31,4 +38,63 @@ public function getFormFields(): void
             ->options($filters)
             ->required();
     }
+
+    /**
+     * @throws MappingError
+     */
+    public function applyFilters(PreparedStatementConditionBuilder $conditions, string $objectTypeName, ?string $json): void
+    {
+        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
+            'com.woltlab.wcf.objectFilter',
+            $objectTypeName,
+        );
+        if ($objectType === null) {
+            throw new InvalidObjectTypeException($objectTypeName, 'com.woltlab.wcf.objectFilter');
+        }
+
+        if ($json === null) {
+            $conditions->add('1=0');
+
+            return;
+        }
+
+        /** @var list<array{0: string, 1: string}> $values */
+        $values = (new MapperBuilder())->mapper()->map(
+            <<<'EOT'
+                list<array{0: string, 1: string}>
+                EOT,
+            Source::json($json)
+        );
+
+        if ($values === []) {
+            $conditions->add('1=0');
+
+            return;
+        }
+
+        /** @var IObjectFilterBuilder $builder */
+        $builder = $objectType->getProcessor();
+        $filters = [];
+        foreach ($builder->getFilters() as $filter) {
+            $filters[$filter->getIdentifier()] = $filter;
+        }
+
+        $hasActiveFilters = false;
+        foreach ($values as [$identifier, $serializedValue]) {
+            $filter = $filters[$identifier] ?? null;
+            if ($filter === null) {
+                continue;
+            }
+
+            $filter->applyFilter(
+                $conditions,
+                $filter->unserializeValue($serializedValue),
+            );
+            $hasActiveFilters = true;
+        }
+
+        if (!$hasActiveFilters) {
+            $conditions->add('1=0');
+        }
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 77aaf4ece46..746694fe524 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -34,9 +34,9 @@ public function getFormField(): BooleanFormField
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
     {
         if ($value) {
-            $conditions->add("avatarID IS NOT NULL");
+            $conditions->add("avatarFileID IS NOT NULL");
         } else {
-            $conditions->add("avatarID IS NULL");
+            $conditions->add("avatarFileID IS NULL");
         }
     }
 
diff --git a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
index 396395078b3..5f61282bc4a 100644
--- a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
@@ -9,6 +9,8 @@
 use wcf\data\user\UserAction;
 use wcf\data\user\UserList;
 use wcf\system\cache\builder\UserGroupAssignmentCacheBuilder;
+use wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder;
+use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\SingletonFactory;
 
 /**
@@ -114,10 +116,15 @@ public function getUsers(UserGroupAssignment $assignment, ?int $maxUsers = null)
             $userList->sqlLimit = $maxUsers;
         }
 
-        $conditions = $assignment->getConditions();
-        foreach ($conditions as $condition) {
-            $condition->getObjectType()->getProcessor()->addUserCondition($condition, $userList);
-        }
+        // TODO: this is a bit too verbose
+        $builder = new UserGroupAssignmentObjectFilterBuilder();
+        $handler = new ObjectFilterHandler($builder->getFilters());
+        $handler->applyFilters(
+            $userList->getConditionBuilder(),
+            'com.woltlab.wcf.userGroupAssignment',
+            $assignment->conditions,
+        );
+
         $userList->readObjects();
 
         return $userList->getObjects();
diff --git a/wcfsetup/setup/db/install_com.woltlab.wcf.php b/wcfsetup/setup/db/install_com.woltlab.wcf.php
index ca3b7fe0713..945685fbd04 100644
--- a/wcfsetup/setup/db/install_com.woltlab.wcf.php
+++ b/wcfsetup/setup/db/install_com.woltlab.wcf.php
@@ -4145,6 +4145,7 @@
             NotNullInt10DatabaseTableColumn::create('groupID'),
             NotNullVarchar255DatabaseTableColumn::create('title'),
             DefaultFalseBooleanDatabaseTableColumn::create('isDisabled'),
+            JsonDatabaseTableColumn::create('conditions'),
         ])
         ->indices([
             DatabaseTablePrimaryIndex::create()

From 641f71938ef88b6febcb5cf5587850b9752e29d2 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 24 Apr 2026 17:16:13 +0200
Subject: [PATCH 09/47] Add the ability to test conditions against a user

---
 .../form/UserGroupAssignmentAddForm.class.php |  3 +-
 .../filter/ObjectFilterHandler.class.php      | 57 ++++++++++++++++++-
 .../filter/user/IUserObjectFilter.class.php   | 18 ++++++
 .../user/UserAvatarObjectFilter.class.php     | 16 +++++-
 .../user/UserLanguageObjectFilter.class.php   | 13 ++++-
 .../UserGroupAssignmentHandler.class.php      | 25 ++++----
 6 files changed, 113 insertions(+), 19 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 66f150e991e..8c2db1d145d 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -17,7 +17,8 @@
  * @author      Alexander Ebert, Matthias Schmidt
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @implements  AbstractFormBuilderForm<UserGroupAssignment>
+ *
+ * @extends AbstractFormBuilderForm<UserGroupAssignment>
  */
 class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
 {
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 1df82e411d1..b6708a14ef1 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -6,16 +6,18 @@
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
 use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\InvalidObjectTypeException;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
+use wcf\system\object\filter\user\IUserObjectFilter;
 use wcf\system\WCF;
 
 final class ObjectFilterHandler
 {
     /**
-     * @param list<IObjectFilter<mixed>> $filters
+     * @param list<IUserObjectFilter<mixed>> $filters
      */
     public function __construct(
         private readonly array $filters,
@@ -97,4 +99,57 @@ public function applyFilters(PreparedStatementConditionBuilder $conditions, stri
             $conditions->add('1=0');
         }
     }
+
+    public function testUser(User $user, string $objectTypeName, ?string $json): bool
+    {
+        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
+            'com.woltlab.wcf.objectFilter',
+            $objectTypeName,
+        );
+        if ($objectType === null) {
+            throw new InvalidObjectTypeException($objectTypeName, 'com.woltlab.wcf.objectFilter');
+        }
+
+        if ($json === null) {
+            return false;
+        }
+
+        /** @var list<array{0: string, 1: string}> $values */
+        $values = (new MapperBuilder())->mapper()->map(
+            <<<'EOT'
+                list<array{0: string, 1: string}>
+                EOT,
+            Source::json($json)
+        );
+
+        if ($values === []) {
+            return false;
+        }
+
+        /** @var IObjectFilterBuilder $builder */
+        $builder = $objectType->getProcessor();
+        $filters = [];
+        foreach ($builder->getFilters() as $filter) {
+            $filters[$filter->getIdentifier()] = $filter;
+        }
+
+        $hasActiveFilters = false;
+        foreach ($values as [$identifier, $serializedValue]) {
+            $filter = $filters[$identifier] ?? null;
+            if ($filter === null) {
+                continue;
+            }
+
+            \assert($filter instanceof IUserObjectFilter);
+
+            $hasActiveFilters = true;
+            if (!$filter->testUser($user, $filter->unserializeValue($serializedValue))) {
+                return false;
+            }
+        }
+
+        // Returns true if there are active filters because any negative test
+        // would have returned early.
+        return $hasActiveFilters;
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php
new file mode 100644
index 00000000000..b4031021ee8
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\user\User;
+use wcf\system\object\filter\IObjectFilter;
+
+/**
+ * @template TValueType of mixed
+ * @extends IObjectFilter<TValueType>
+ */
+interface IUserObjectFilter extends IObjectFilter
+{
+    /**
+     * @param TValueType $configuredValue
+     */
+    public function testUser(User $user, mixed $configuredValue): bool;
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 746694fe524..d2cd7fdbfbf 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -2,14 +2,15 @@
 
 namespace wcf\system\object\filter\user;
 
+use wcf\data\user\User;
+use Override;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\BooleanFormField;
-use wcf\system\object\filter\IObjectFilter;
 
 /**
- * @implements IObjectFilter<bool>
+ * @implements IUserObjectFilter<bool>
  */
-final class UserAvatarObjectFilter implements IObjectFilter
+final class UserAvatarObjectFilter implements IUserObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -71,4 +72,13 @@ public function testValue(mixed $configuredValue, mixed $value): bool
     {
         return (bool)$value;
     }
+
+    #[Override]
+    public function testUser(User $user, mixed $unserializedValue): bool
+    {
+        return match ($unserializedValue) {
+            true => $user->avatarFileID !== null,
+            false => $user->avatarFileID === null,
+        };
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index 5a112620179..bb2aff49d49 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -2,15 +2,16 @@
 
 namespace wcf\system\object\filter\user;
 
+use wcf\data\user\User;
+use Override;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\language\LanguageFactory;
-use wcf\system\object\filter\IObjectFilter;
 
 /**
- * @implements IObjectFilter<int>
+ * @implements IUserObjectFilter<int>
  */
-final class UserLanguageObjectFilter implements IObjectFilter
+final class UserLanguageObjectFilter implements IUserObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -65,4 +66,10 @@ public function testValue(mixed $configuredValue, mixed $value): bool
     {
         return $configuredValue === $value;
     }
+
+    #[Override]
+    public function testUser(User $user, mixed $configuredValue): bool
+    {
+        return $user->languageID === $configuredValue;
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
index 5f61282bc4a..e30abf44068 100644
--- a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
@@ -50,25 +50,28 @@ public function checkUsers(array $userIDs)
 
         /** @var UserGroupAssignment[] $assignments */
         $assignments = UserGroupAssignmentCacheBuilder::getInstance()->getData();
+
+        // TODO: this is a bit too verbose
+        $builder = new UserGroupAssignmentObjectFilterBuilder();
+        $handler = new ObjectFilterHandler($builder->getFilters());
+
         foreach ($userList as $user) {
             $groupIDs = $user->getGroupIDs();
             $newGroupIDs = [];
 
             foreach ($assignments as $assignment) {
-                if (\in_array($assignment->groupID, $groupIDs, true) || \in_array($assignment->groupID, $newGroupIDs, true)) {
+                if (
+                    \in_array($assignment->groupID, $groupIDs, true)
+                    || \in_array($assignment->groupID, $newGroupIDs, true)
+                ) {
                     continue;
                 }
 
-                $checkFailed = false;
-                $conditions = $assignment->getConditions();
-                foreach ($conditions as $condition) {
-                    if (!$condition->getObjectType()->getProcessor()->checkUser($condition, $user)) {
-                        $checkFailed = true;
-                        break;
-                    }
-                }
-
-                if (!$checkFailed) {
+                if ($handler->testUser(
+                    $user,
+                    'com.woltlab.wcf.userGroupAssignment',
+                    $assignment->conditions
+                )) {
                     $newGroupIDs[] = $assignment->groupID;
                 }
             }

From 47a889a66e5f9bb579b58dd24ce3cd150430c013 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sun, 26 Apr 2026 13:03:44 +0200
Subject: [PATCH 10/47] Simplify the calls to apply the conditions

---
 .../builder/IObjectFilterBuilder.class.php    |  2 +
 ...oupAssignmentObjectFilterBuilder.class.php | 39 +++++++++++++++++++
 .../UserGroupAssignmentHandler.class.php      | 18 +--------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
index 6a4083fe077..0bd998381a0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -10,4 +10,6 @@ interface IObjectFilterBuilder
      * @return list<IObjectFilter<mixed>>
      */
     public function getFilters(): array;
+
+    public function getObjectTypeName(): string;
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index b1ead8a3146..5b2c5a0f9d4 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -3,7 +3,11 @@
 namespace wcf\system\object\filter\builder;
 
 use Override;
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 
@@ -14,6 +18,8 @@ final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuild
      */
     private readonly array $filters;
 
+    private ObjectFilterHandler $handler;
+
     public function __construct()
     {
         $this->filters = [
@@ -27,4 +33,37 @@ public function getFilters(): array
     {
         return $this->filters;
     }
+
+    #[Override]
+    public function getObjectTypeName(): string
+    {
+        return 'com.woltlab.wcf.userGroupAssignment';
+    }
+
+    public function applyFilters(UserGroupAssignment $assignment, PreparedStatementConditionBuilder $conditions): void
+    {
+        $this->getHandler()->applyFilters(
+            $conditions,
+            $this->getObjectTypeName(),
+            $assignment->conditions,
+        );
+    }
+
+    public function testUser(UserGroupAssignment $assignment, User $user): bool
+    {
+        return $this->getHandler()->testUser(
+            $user,
+            $this->getObjectTypeName(),
+            $assignment->conditions,
+        );
+    }
+
+    private function getHandler(): ObjectFilterHandler
+    {
+        if (!isset($this->handler)) {
+            $this->handler = new ObjectFilterHandler($this->getFilters());
+        }
+
+        return $this->handler;
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
index e30abf44068..cffc8e5d1b0 100644
--- a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
@@ -50,10 +50,7 @@ public function checkUsers(array $userIDs)
 
         /** @var UserGroupAssignment[] $assignments */
         $assignments = UserGroupAssignmentCacheBuilder::getInstance()->getData();
-
-        // TODO: this is a bit too verbose
         $builder = new UserGroupAssignmentObjectFilterBuilder();
-        $handler = new ObjectFilterHandler($builder->getFilters());
 
         foreach ($userList as $user) {
             $groupIDs = $user->getGroupIDs();
@@ -67,11 +64,7 @@ public function checkUsers(array $userIDs)
                     continue;
                 }
 
-                if ($handler->testUser(
-                    $user,
-                    'com.woltlab.wcf.userGroupAssignment',
-                    $assignment->conditions
-                )) {
+                if ($builder->testUser($assignment, $user)) {
                     $newGroupIDs[] = $assignment->groupID;
                 }
             }
@@ -119,14 +112,7 @@ public function getUsers(UserGroupAssignment $assignment, ?int $maxUsers = null)
             $userList->sqlLimit = $maxUsers;
         }
 
-        // TODO: this is a bit too verbose
-        $builder = new UserGroupAssignmentObjectFilterBuilder();
-        $handler = new ObjectFilterHandler($builder->getFilters());
-        $handler->applyFilters(
-            $userList->getConditionBuilder(),
-            'com.woltlab.wcf.userGroupAssignment',
-            $assignment->conditions,
-        );
+        (new UserGroupAssignmentObjectFilterBuilder())->applyFilters($assignment, $userList->getConditionBuilder());
 
         $userList->readObjects();
 

From 05d3bd0ab76b3a840f82c75567c685aea0f3b538 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 23 Sep 2026 11:19:41 +0200
Subject: [PATCH 11/47] Add missing column to update script

---
 .../files/acp/database/update_com.woltlab.wcf_6.3_step1.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
index e701d90f026..4d30d82949b 100644
--- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
+++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
@@ -120,4 +120,8 @@
                 ->onDelete('SET NULL')
                 ->onUpdate('NO ACTION'),
         ]),
+    PartialDatabaseTable::create('wcf1_user_group_assignment')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ])
 ];

From 7cd8551e221abe8e20f863e7a329fb072f794815 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 23 Sep 2026 11:19:50 +0200
Subject: [PATCH 12/47] Fix some minor issues

---
 phpstan-baseline.neon                                    | 6 ------
 .../form/builder/field/ObjectFilterFormField.class.php   | 7 +++----
 .../lib/system/object/filter/IObjectFilter.class.php     | 4 +++-
 .../UserGroupAssignmentObjectFilterBuilder.class.php     | 5 ++---
 .../object/filter/user/UserAvatarObjectFilter.class.php  | 9 ++-------
 .../filter/user/UserLanguageObjectFilter.class.php       | 3 +--
 6 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 758a2757bba..a22b87a553c 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -204,12 +204,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 1
-			path: wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 57500db1ee2..3c3fe52f3c6 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -5,7 +5,6 @@
 use CuyZ\Valinor\Mapper\MappingError;
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
-use Override;
 use wcf\action\ObjectFilterBuilderAction;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
 use wcf\system\form\builder\TObjectTypeFormNode;
@@ -18,7 +17,7 @@ final class ObjectFilterFormField extends AbstractFormField
 
     protected $templateName = 'shared_objectFilterFormField';
 
-    #[Override]
+    #[\Override]
     public function readValue(): ObjectFilterFormField
     {
         if ($this->getDocument()->hasRequestData($this->getPrefixedId())) {
@@ -28,7 +27,7 @@ public function readValue(): ObjectFilterFormField
         return $this;
     }
 
-    #[Override]
+    #[\Override]
     public function validate(): void
     {
         try {
@@ -48,7 +47,7 @@ public function validate(): void
         }
     }
 
-    #[Override]
+    #[\Override]
     public function getObjectTypeDefinition(): string
     {
         return 'com.woltlab.wcf.objectFilter';
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 89a88cede3b..ac83ab58420 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -20,7 +20,9 @@ public function getTitle(): string;
      */
     public function getFormField(): AbstractFormField;
 
-    // -> DB
+    /**
+     * @param TValueType $value
+     */
     public function serializeValue(mixed $value): string;
 
     /**
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 5b2c5a0f9d4..0cc19e140da 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -2,7 +2,6 @@
 
 namespace wcf\system\object\filter\builder;
 
-use Override;
 use wcf\data\user\group\assignment\UserGroupAssignment;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
@@ -28,13 +27,13 @@ public function __construct()
         ];
     }
 
-    #[Override]
+    #[\Override]
     public function getFilters(): array
     {
         return $this->filters;
     }
 
-    #[Override]
+    #[\Override]
     public function getObjectTypeName(): string
     {
         return 'com.woltlab.wcf.userGroupAssignment';
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index d2cd7fdbfbf..50f4f7bff6d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -3,7 +3,6 @@
 namespace wcf\system\object\filter\user;
 
 use wcf\data\user\User;
-use Override;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\BooleanFormField;
 
@@ -44,11 +43,7 @@ public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed
     #[\Override]
     public function serializeValue(mixed $value): string
     {
-        if ($value) {
-            return '1';
-        }
-
-        return '0';
+        return $value ? '1' : '0';
     }
 
     #[\Override]
@@ -73,7 +68,7 @@ public function testValue(mixed $configuredValue, mixed $value): bool
         return (bool)$value;
     }
 
-    #[Override]
+    #[\Override]
     public function testUser(User $user, mixed $unserializedValue): bool
     {
         return match ($unserializedValue) {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index bb2aff49d49..c7fcbb1a4ac 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -3,7 +3,6 @@
 namespace wcf\system\object\filter\user;
 
 use wcf\data\user\User;
-use Override;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\language\LanguageFactory;
@@ -67,7 +66,7 @@ public function testValue(mixed $configuredValue, mixed $value): bool
         return $configuredValue === $value;
     }
 
-    #[Override]
+    #[\Override]
     public function testUser(User $user, mixed $configuredValue): bool
     {
         return $user->languageID === $configuredValue;

From bbef390b1d826c8945d5d2f35db6f99be00cc45d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 23 Sep 2026 12:39:17 +0200
Subject: [PATCH 13/47] Remove object type

---
 com.woltlab.wcf/objectTypeDefinition.xml      |   4 -
 .../form/UserGroupAssignmentAddForm.class.php |   3 +-
 .../ObjectFilterBuilderAction.class.php       |  21 ++--
 .../files/lib/bootstrap/com.woltlab.wcf.php   |  11 ++
 .../ObjectFilterBuilderCollecting.class.php   |  38 +++++++
 .../field/ObjectFilterFormField.class.php     |  43 ++++---
 .../filter/ObjectFilterHandler.class.php      | 107 ++++++++----------
 .../builder/IObjectFilterBuilder.class.php    |   8 +-
 ...oupAssignmentObjectFilterBuilder.class.php |  11 +-
 .../UserGroupAssignmentHandler.class.php      |   1 -
 10 files changed, 152 insertions(+), 95 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php

diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index f6d75a94f5b..f3bd5c6159b 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -229,9 +229,5 @@
 			<name>com.woltlab.wcf.file</name>
 			<interfacename>wcf\system\file\processor\IFileProcessor</interfacename>
 		</definition>
-		<definition>
-			<name>com.woltlab.wcf.objectFilter</name>
-			<interfacename>wcf\system\object\filter\builder\IObjectFilterBuilder</interfacename>
-		</definition>
 	</import>
 </data>
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 8c2db1d145d..2b9ae25f90c 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -10,6 +10,7 @@
 use wcf\system\form\builder\field\ObjectFilterFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\field\TitleFormField;
+use wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder;
 
 /**
  * Shows the form to create a new automatic user group assignment.
@@ -53,7 +54,7 @@ protected function createForm()
             BooleanFormField::create('isDisabled')
                 ->label('wcf.acp.group.assignment.isDisabled'),
             ObjectFilterFormField::create('conditions')
-                ->objectType('com.woltlab.wcf.userGroupAssignment')
+                ->builder(new UserGroupAssignmentObjectFilterBuilder())
                 ->required()
         ]);
     }
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index 7b7190db461..a66b156c110 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -6,9 +6,11 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use wcf\data\object\type\ObjectTypeCache;
+use wcf\event\object\filter\ObjectFilterBuilderCollecting;
 use wcf\http\Helper;
+use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
 use wcf\system\form\builder\field\SelectFormField;
@@ -24,21 +26,22 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $request->getQueryParams(),
             <<<'EOT'
                 array {
-                    objectType: string,
+                    identifier: string,
                 }
                 EOT
         );
-        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
-            'com.woltlab.wcf.objectFilter',
-            $parameters['objectType'],
-        );
 
-        if ($objectType === null) {
+        $event = new ObjectFilterBuilderCollecting();
+        EventHandler::getInstance()->fire($event);
+
+        $builder = $event->getBuilders()[$parameters['identifier']] ?? null;
+        if ($builder === null) {
             throw new IllegalLinkException();
         }
 
-        $builder = $objectType->getProcessor();
-        \assert($builder instanceof IObjectFilterBuilder);
+        if (!$builder->isAccessible()) {
+            throw new PermissionDeniedException();
+        }
 
         $form = $this->getForm($builder);
 
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index 93441da6eea..ed0b8df7668 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -16,6 +16,7 @@ public function __invoke(): void
         $this->initSitemapObjects();
         $this->initACPMenuItems();
         $this->initACPSearchProviders();
+        $this->initObjectFilters();
         $this->initLicenseData();
     }
 
@@ -175,6 +176,16 @@ private function initACPSearchProviders(): void
         );
     }
 
+    private function initObjectFilters(): void
+    {
+        EventHandler::getInstance()->register(
+            \wcf\event\object\filter\ObjectFilterBuilderCollecting::class,
+            static function (\wcf\event\object\filter\ObjectFilterBuilderCollecting $event) {
+                $event->register(new \wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder());
+            }
+        );
+    }
+
     private function initLicenseData(): void
     {
         try {
diff --git a/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php b/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php
new file mode 100644
index 00000000000..43f36bb95d5
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace wcf\event\object\filter;
+
+use wcf\event\IPsr14Event;
+use wcf\system\object\filter\builder\IObjectFilterBuilder;
+
+/**
+ * Requests the collection of the available object filter builders.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class ObjectFilterBuilderCollecting implements IPsr14Event
+{
+    /**
+     * @var array<string, IObjectFilterBuilder>
+     */
+    private array $builders = [];
+
+    /**
+     * Registers a new object filter builder.
+     */
+    public function register(IObjectFilterBuilder $builder): void
+    {
+        $this->builders[$builder->getIdentifier()] = $builder;
+    }
+
+    /**
+     * @return array<string, IObjectFilterBuilder>
+     */
+    public function getBuilders(): array
+    {
+        return $this->builders;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 3c3fe52f3c6..190e0a1ee89 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -7,16 +7,37 @@
 use CuyZ\Valinor\MapperBuilder;
 use wcf\action\ObjectFilterBuilderAction;
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
-use wcf\system\form\builder\TObjectTypeFormNode;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
 use wcf\system\request\LinkHandler;
 
 final class ObjectFilterFormField extends AbstractFormField
 {
-    use TObjectTypeFormNode;
-
     protected $templateName = 'shared_objectFilterFormField';
 
+    private IObjectFilterBuilder $builder;
+
+    /**
+     * Sets the builder that provides the available filters.
+     */
+    public function builder(IObjectFilterBuilder $builder): static
+    {
+        $this->builder = $builder;
+
+        return $this;
+    }
+
+    /**
+     * @throws \BadMethodCallException if no builder has been set
+     */
+    public function getBuilder(): IObjectFilterBuilder
+    {
+        if (!isset($this->builder)) {
+            throw new \BadMethodCallException("Builder has not been set for field '{$this->getId()}'.");
+        }
+
+        return $this->builder;
+    }
+
     #[\Override]
     public function readValue(): ObjectFilterFormField
     {
@@ -47,12 +68,6 @@ public function validate(): void
         }
     }
 
-    #[\Override]
-    public function getObjectTypeDefinition(): string
-    {
-        return 'com.woltlab.wcf.objectFilter';
-    }
-
     public function toJson(): string
     {
         return \json_encode(
@@ -66,7 +81,7 @@ public function getEndpoint(): string
         return LinkHandler::getInstance()->getControllerLink(
             ObjectFilterBuilderAction::class,
             [
-                'objectType' => $this->getObjectType()->objectType,
+                'identifier' => $this->getBuilder()->getIdentifier(),
             ],
         );
     }
@@ -97,10 +112,8 @@ private function unserializeFilters(?string $json): array
             return $values;
         }
 
-        /** @var IObjectFilterBuilder $builder */
-        $builder = $this->getObjectType()->getProcessor();
         $filters = [];
-        foreach ($builder->getFilters() as $filter) {
+        foreach ($this->getBuilder()->getFilters() as $filter) {
             $filters[$filter->getIdentifier()] = $filter;
         }
 
@@ -117,10 +130,10 @@ function (array $value) use ($filters): array {
                     'value' => $serializedValue,
                 ];
             },
-            \array_filter(
+            \array_values(\array_filter(
                 $values,
                 static fn($value) => isset($filters[$value[0]]),
-            ),
+            )),
         );
     }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index b6708a14ef1..602297f4f15 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -5,12 +5,9 @@
 use CuyZ\Valinor\Mapper\MappingError;
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
-use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\exception\InvalidObjectTypeException;
 use wcf\system\form\builder\field\SelectFormField;
-use wcf\system\object\filter\builder\IObjectFilterBuilder;
 use wcf\system\object\filter\user\IUserObjectFilter;
 use wcf\system\WCF;
 
@@ -23,6 +20,9 @@ public function __construct(
         private readonly array $filters,
     ) {}
 
+    /**
+     * This method is intended to eventually take over the generation of the form in `ObjectFilterBuilderAction`.
+     */
     public function getFormFields(): void
     {
         $filters = [];
@@ -44,42 +44,16 @@ public function getFormFields(): void
     /**
      * @throws MappingError
      */
-    public function applyFilters(PreparedStatementConditionBuilder $conditions, string $objectTypeName, ?string $json): void
+    public function applyFilters(PreparedStatementConditionBuilder $conditions, ?string $json): void
     {
-        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
-            'com.woltlab.wcf.objectFilter',
-            $objectTypeName,
-        );
-        if ($objectType === null) {
-            throw new InvalidObjectTypeException($objectTypeName, 'com.woltlab.wcf.objectFilter');
-        }
-
-        if ($json === null) {
-            $conditions->add('1=0');
-
-            return;
-        }
-
-        /** @var list<array{0: string, 1: string}> $values */
-        $values = (new MapperBuilder())->mapper()->map(
-            <<<'EOT'
-                list<array{0: string, 1: string}>
-                EOT,
-            Source::json($json)
-        );
-
+        $values = $this->unserializeValues($json);
         if ($values === []) {
             $conditions->add('1=0');
 
             return;
         }
 
-        /** @var IObjectFilterBuilder $builder */
-        $builder = $objectType->getProcessor();
-        $filters = [];
-        foreach ($builder->getFilters() as $filter) {
-            $filters[$filter->getIdentifier()] = $filter;
-        }
+        $filters = $this->getFiltersByIdentifier();
 
         $hasActiveFilters = false;
         foreach ($values as [$identifier, $serializedValue]) {
@@ -100,38 +74,17 @@ public function applyFilters(PreparedStatementConditionBuilder $conditions, stri
         }
     }
 
-    public function testUser(User $user, string $objectTypeName, ?string $json): bool
+    /**
+     * @throws MappingError
+     */
+    public function testUser(User $user, ?string $json): bool
     {
-        $objectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
-            'com.woltlab.wcf.objectFilter',
-            $objectTypeName,
-        );
-        if ($objectType === null) {
-            throw new InvalidObjectTypeException($objectTypeName, 'com.woltlab.wcf.objectFilter');
-        }
-
-        if ($json === null) {
-            return false;
-        }
-
-        /** @var list<array{0: string, 1: string}> $values */
-        $values = (new MapperBuilder())->mapper()->map(
-            <<<'EOT'
-                list<array{0: string, 1: string}>
-                EOT,
-            Source::json($json)
-        );
-
+        $values = $this->unserializeValues($json);
         if ($values === []) {
             return false;
         }
 
-        /** @var IObjectFilterBuilder $builder */
-        $builder = $objectType->getProcessor();
-        $filters = [];
-        foreach ($builder->getFilters() as $filter) {
-            $filters[$filter->getIdentifier()] = $filter;
-        }
+        $filters = $this->getFiltersByIdentifier();
 
         $hasActiveFilters = false;
         foreach ($values as [$identifier, $serializedValue]) {
@@ -140,8 +93,6 @@ public function testUser(User $user, string $objectTypeName, ?string $json): boo
                 continue;
             }
 
-            \assert($filter instanceof IUserObjectFilter);
-
             $hasActiveFilters = true;
             if (!$filter->testUser($user, $filter->unserializeValue($serializedValue))) {
                 return false;
@@ -152,4 +103,38 @@ public function testUser(User $user, string $objectTypeName, ?string $json): boo
         // would have returned early.
         return $hasActiveFilters;
     }
+
+    /**
+     * @return array<string, IUserObjectFilter<mixed>>
+     */
+    private function getFiltersByIdentifier(): array
+    {
+        $filters = [];
+        foreach ($this->filters as $filter) {
+            $filters[$filter->getIdentifier()] = $filter;
+        }
+
+        return $filters;
+    }
+
+    /**
+     * @return list<array{0: string, 1: string}>
+     * @throws MappingError
+     */
+    private function unserializeValues(?string $json): array
+    {
+        if ($json === null) {
+            return [];
+        }
+
+        /** @var list<array{0: string, 1: string}> $values */
+        $values = (new MapperBuilder())->mapper()->map(
+            <<<'EOT'
+                list<array{0: string, 1: string}>
+                EOT,
+            Source::json($json)
+        );
+
+        return $values;
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
index 0bd998381a0..a716fa9bdba 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -11,5 +11,11 @@ interface IObjectFilterBuilder
      */
     public function getFilters(): array;
 
-    public function getObjectTypeName(): string;
+    // `com.woltlab.wcf.userGroupAssignment`
+    public function getIdentifier(): string;
+
+    /**
+     * Returns true if this builder is accessible for the active user.
+     */
+    public function isAccessible(): bool;
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 0cc19e140da..c319124056a 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -9,6 +9,7 @@
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
+use wcf\system\WCF;
 
 final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuilder
 {
@@ -34,7 +35,7 @@ public function getFilters(): array
     }
 
     #[\Override]
-    public function getObjectTypeName(): string
+    public function getIdentifier(): string
     {
         return 'com.woltlab.wcf.userGroupAssignment';
     }
@@ -43,7 +44,6 @@ public function applyFilters(UserGroupAssignment $assignment, PreparedStatementC
     {
         $this->getHandler()->applyFilters(
             $conditions,
-            $this->getObjectTypeName(),
             $assignment->conditions,
         );
     }
@@ -52,7 +52,6 @@ public function testUser(UserGroupAssignment $assignment, User $user): bool
     {
         return $this->getHandler()->testUser(
             $user,
-            $this->getObjectTypeName(),
             $assignment->conditions,
         );
     }
@@ -65,4 +64,10 @@ private function getHandler(): ObjectFilterHandler
 
         return $this->handler;
     }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return WCF::getSession()->hasPermission('admin.user.canManageGroupAssignment');
+    }
 }
diff --git a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
index cffc8e5d1b0..a6548f3cf08 100644
--- a/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
+++ b/wcfsetup/install/files/lib/system/user/group/assignment/UserGroupAssignmentHandler.class.php
@@ -10,7 +10,6 @@
 use wcf\data\user\UserList;
 use wcf\system\cache\builder\UserGroupAssignmentCacheBuilder;
 use wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder;
-use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\SingletonFactory;
 
 /**

From da191f222c6d2db00b4d755a2a832ded386a87eb Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 23 Sep 2026 13:11:13 +0200
Subject: [PATCH 14/47] Migrate user group assignments to the
 DatabaseObjectBuilder API

---
 .../form/UserGroupAssignmentAddForm.class.php | 57 ++++++++++---
 .../UserGroupAssignmentEditForm.class.php     |  2 +-
 .../CreateUserGroupAssignment.class.php       | 34 ++++++++
 .../DeleteUserGroupAssignment.class.php       | 32 ++++++++
 .../DisableUserGroupAssignment.class.php      | 13 ++-
 .../EnableUserGroupAssignment.class.php       | 13 ++-
 .../UpdateUserGroupAssignment.class.php       | 34 ++++++++
 .../UserGroupAssignmentAction.class.php       |  1 +
 .../UserGroupAssignmentBuilder.class.php      | 81 +++++++++++++++++++
 .../UserGroupAssignmentEditor.class.php       |  1 +
 .../UserGroupAssignmentCreated.class.php      | 23 ++++++
 .../UserGroupAssignmentDeleted.class.php      | 21 +++++
 .../UserGroupAssignmentUpdated.class.php      | 23 ++++++
 .../assignments/DeleteAssignment.class.php    |  4 +-
 14 files changed, 311 insertions(+), 28 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/command/user/group/assignment/CreateUserGroupAssignment.class.php
 create mode 100644 wcfsetup/install/files/lib/command/user/group/assignment/DeleteUserGroupAssignment.class.php
 create mode 100644 wcfsetup/install/files/lib/command/user/group/assignment/UpdateUserGroupAssignment.class.php
 create mode 100644 wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentBuilder.class.php
 create mode 100644 wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentCreated.class.php
 create mode 100644 wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentDeleted.class.php
 create mode 100644 wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentUpdated.class.php

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 2b9ae25f90c..33098517561 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -2,11 +2,15 @@
 
 namespace wcf\acp\form;
 
+use wcf\command\user\group\assignment\CreateUserGroupAssignment;
+use wcf\command\user\group\assignment\UpdateUserGroupAssignment;
+use wcf\data\DatabaseObjectBuilder;
 use wcf\data\user\group\assignment\UserGroupAssignment;
-use wcf\data\user\group\assignment\UserGroupAssignmentAction;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
 use wcf\data\user\group\UserGroup;
-use wcf\form\AbstractFormBuilderForm;
+use wcf\form\AbstractDatabaseObjectBuilderForm;
 use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\IFormField;
 use wcf\system\form\builder\field\ObjectFilterFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\field\TitleFormField;
@@ -19,9 +23,9 @@
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
- * @extends AbstractFormBuilderForm<UserGroupAssignment>
+ * @extends AbstractDatabaseObjectBuilderForm<UserGroupAssignment, UserGroupAssignmentBuilder>
  */
-class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
+class UserGroupAssignmentAddForm extends AbstractDatabaseObjectBuilderForm
 {
     /**
      * @inheritDoc
@@ -33,29 +37,60 @@ class UserGroupAssignmentAddForm extends AbstractFormBuilderForm
      */
     public $neededPermissions = ['admin.user.canManageGroupAssignment'];
 
-    public $objectActionClass = UserGroupAssignmentAction::class;
+    /**
+     * @inheritDoc
+     */
+    public string $objectEditLinkController = UserGroupAssignmentEditForm::class;
 
-    public $objectEditLinkController = UserGroupAssignmentEditForm::class;
+    #[\Override]
+    protected function getDatabaseObjectBuilder(): UserGroupAssignmentBuilder
+    {
+        if ($this->formObject !== null) {
+            return UserGroupAssignmentBuilder::forUpdate($this->formObject);
+        }
+
+        return UserGroupAssignmentBuilder::forCreate();
+    }
 
     #[\Override]
-    protected function createForm()
+    protected function getCommand(DatabaseObjectBuilder $builder): callable
     {
-        parent::createForm();
+        if ($this->formObject !== null) {
+            return new UpdateUserGroupAssignment($builder);
+        }
 
+        return new CreateUserGroupAssignment($builder);
+    }
+
+    #[\Override]
+    protected function createForm(): void
+    {
         $this->form->appendChildren([
             TitleFormField::create('title')
                 ->label('wcf.global.name')
                 ->maximumLength(255)
-                ->required(),
+                ->required()
+                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                    $builder->setTitle($field->getSaveValue());
+                }),
             SelectFormField::create('groupID')
                 ->label('wcf.user.group')
                 ->options($this->getAvailableUserGroups())
-                ->required(),
+                ->required()
+                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                    $builder->setGroupID((int)$field->getSaveValue());
+                }),
             BooleanFormField::create('isDisabled')
-                ->label('wcf.acp.group.assignment.isDisabled'),
+                ->label('wcf.acp.group.assignment.isDisabled')
+                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                    $builder->setIsDisabled((bool)$field->getSaveValue());
+                }),
             ObjectFilterFormField::create('conditions')
                 ->builder(new UserGroupAssignmentObjectFilterBuilder())
                 ->required()
+                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                    $builder->setConditions($field->getSaveValue());
+                }),
         ]);
     }
 
diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
index ed4e72ce8a8..3a28be492cd 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentEditForm.class.php
@@ -27,7 +27,7 @@ class UserGroupAssignmentEditForm extends UserGroupAssignmentAddForm
     /**
      * @inheritDoc
      */
-    public $formAction = 'edit';
+    public string $formAction = 'edit';
 
     #[\Override]
     public function readParameters()
diff --git a/wcfsetup/install/files/lib/command/user/group/assignment/CreateUserGroupAssignment.class.php b/wcfsetup/install/files/lib/command/user/group/assignment/CreateUserGroupAssignment.class.php
new file mode 100644
index 00000000000..12ef74976ca
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/user/group/assignment/CreateUserGroupAssignment.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
+use wcf\event\user\group\assignment\UserGroupAssignmentCreated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Creates a new automatic user group assignment.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class CreateUserGroupAssignment
+{
+    public function __construct(
+        private readonly UserGroupAssignmentBuilder $builder,
+    ) {}
+
+    public function __invoke(): UserGroupAssignment
+    {
+        $assignment = $this->builder->create();
+
+        UserGroupAssignmentBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new UserGroupAssignmentCreated($assignment, $this->builder));
+
+        return $assignment;
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/user/group/assignment/DeleteUserGroupAssignment.class.php b/wcfsetup/install/files/lib/command/user/group/assignment/DeleteUserGroupAssignment.class.php
new file mode 100644
index 00000000000..aa887a380f9
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/user/group/assignment/DeleteUserGroupAssignment.class.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
+use wcf\event\user\group\assignment\UserGroupAssignmentDeleted;
+use wcf\system\event\EventHandler;
+
+/**
+ * Deletes an automatic user group assignment.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class DeleteUserGroupAssignment
+{
+    public function __construct(
+        private readonly UserGroupAssignment $assignment,
+    ) {}
+
+    public function __invoke(): void
+    {
+        UserGroupAssignmentBuilder::delete($this->assignment);
+
+        UserGroupAssignmentBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new UserGroupAssignmentDeleted($this->assignment));
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/user/group/assignment/DisableUserGroupAssignment.class.php b/wcfsetup/install/files/lib/command/user/group/assignment/DisableUserGroupAssignment.class.php
index f91c4c99706..b22769542a1 100644
--- a/wcfsetup/install/files/lib/command/user/group/assignment/DisableUserGroupAssignment.class.php
+++ b/wcfsetup/install/files/lib/command/user/group/assignment/DisableUserGroupAssignment.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\user\group\assignment;
 
 use wcf\data\user\group\assignment\UserGroupAssignment;
-use wcf\data\user\group\assignment\UserGroupAssignmentEditor;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
 use wcf\event\user\group\assignment\UserGroupAssignmentDisabled;
 use wcf\system\event\EventHandler;
 
@@ -21,13 +21,12 @@ public function __construct(private readonly UserGroupAssignment $assignment) {}
 
     public function __invoke(): void
     {
-        (new UserGroupAssignmentEditor($this->assignment))->update([
-            'isDisabled' => 1,
-        ]);
+        UserGroupAssignmentBuilder::forUpdate($this->assignment)
+            ->setIsDisabled(true)
+            ->update();
 
-        UserGroupAssignmentEditor::resetCache();
+        UserGroupAssignmentBuilder::resetCache();
 
-        $event = new UserGroupAssignmentDisabled($this->assignment);
-        EventHandler::getInstance()->fire($event);
+        EventHandler::getInstance()->fire(new UserGroupAssignmentDisabled($this->assignment));
     }
 }
diff --git a/wcfsetup/install/files/lib/command/user/group/assignment/EnableUserGroupAssignment.class.php b/wcfsetup/install/files/lib/command/user/group/assignment/EnableUserGroupAssignment.class.php
index 8ffd4949c06..00acd41115d 100644
--- a/wcfsetup/install/files/lib/command/user/group/assignment/EnableUserGroupAssignment.class.php
+++ b/wcfsetup/install/files/lib/command/user/group/assignment/EnableUserGroupAssignment.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\user\group\assignment;
 
 use wcf\data\user\group\assignment\UserGroupAssignment;
-use wcf\data\user\group\assignment\UserGroupAssignmentEditor;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
 use wcf\event\user\group\assignment\UserGroupAssignmentEnabled;
 use wcf\system\event\EventHandler;
 
@@ -21,13 +21,12 @@ public function __construct(private readonly UserGroupAssignment $assignment) {}
 
     public function __invoke(): void
     {
-        (new UserGroupAssignmentEditor($this->assignment))->update([
-            'isDisabled' => 0,
-        ]);
+        UserGroupAssignmentBuilder::forUpdate($this->assignment)
+            ->setIsDisabled(false)
+            ->update();
 
-        UserGroupAssignmentEditor::resetCache();
+        UserGroupAssignmentBuilder::resetCache();
 
-        $event = new UserGroupAssignmentEnabled($this->assignment);
-        EventHandler::getInstance()->fire($event);
+        EventHandler::getInstance()->fire(new UserGroupAssignmentEnabled($this->assignment));
     }
 }
diff --git a/wcfsetup/install/files/lib/command/user/group/assignment/UpdateUserGroupAssignment.class.php b/wcfsetup/install/files/lib/command/user/group/assignment/UpdateUserGroupAssignment.class.php
new file mode 100644
index 00000000000..c92fd5fbb6d
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/user/group/assignment/UpdateUserGroupAssignment.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
+use wcf\event\user\group\assignment\UserGroupAssignmentUpdated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Updates an automatic user group assignment.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UpdateUserGroupAssignment
+{
+    public function __construct(
+        private readonly UserGroupAssignmentBuilder $builder,
+    ) {}
+
+    public function __invoke(): UserGroupAssignment
+    {
+        $assignment = $this->builder->update();
+
+        UserGroupAssignmentBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new UserGroupAssignmentUpdated($assignment, $this->builder));
+
+        return $assignment;
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentAction.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentAction.class.php
index 2e27da6153e..dc0df966b84 100644
--- a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentAction.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentAction.class.php
@@ -16,6 +16,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @extends AbstractDatabaseObjectAction<UserGroupAssignment, UserGroupAssignmentEditor>
+ * @deprecated 6.3 use `UserGroupAssignmentBuilder` instead.
  */
 class UserGroupAssignmentAction extends AbstractDatabaseObjectAction implements IToggleAction
 {
diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentBuilder.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentBuilder.class.php
new file mode 100644
index 00000000000..da580ac86cc
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentBuilder.class.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace wcf\data\user\group\assignment;
+
+use wcf\data\DatabaseObjectBuilder;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\cache\builder\ConditionCacheBuilder;
+use wcf\system\cache\builder\UserGroupAssignmentCacheBuilder;
+use wcf\system\condition\ConditionHandler;
+
+/**
+ * Builder for creating, updating and deleting automatic user group assignments.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectBuilder<UserGroupAssignment>
+ */
+final class UserGroupAssignmentBuilder extends DatabaseObjectBuilder
+{
+    public function setTitle(string $title): static
+    {
+        $this->properties['title'] = $title;
+
+        return $this;
+    }
+
+    /**
+     * Sets the user group to which the users are automatically assigned.
+     */
+    public function setGroupID(int $groupID): static
+    {
+        $this->properties['groupID'] = $groupID;
+
+        return $this;
+    }
+
+    public function setIsDisabled(bool $isDisabled): static
+    {
+        $this->properties['isDisabled'] = (int)$isDisabled;
+
+        return $this;
+    }
+
+    /**
+     * Sets the serialized object filters that a user must match.
+     */
+    public function setConditions(?string $conditions): static
+    {
+        $this->properties['conditions'] = $conditions;
+
+        return $this;
+    }
+
+    #[\Override]
+    protected function getRequiredProperties(): array
+    {
+        return ['groupID', 'title'];
+    }
+
+    #[\Override]
+    protected static function beforeDeleteAll(array $objectIDs): void
+    {
+        ConditionHandler::getInstance()->deleteConditions(
+            'com.woltlab.wcf.condition.userGroupAssignment',
+            $objectIDs
+        );
+    }
+
+    public static function resetCache(): void
+    {
+        UserGroupAssignmentCacheBuilder::getInstance()->reset();
+        ConditionCacheBuilder::getInstance()->reset([
+            'definitionID' => ObjectTypeCache::getInstance()
+                ->getDefinitionByName('com.woltlab.wcf.condition.userGroupAssignment')
+                ->definitionID,
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentEditor.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentEditor.class.php
index ba29be98677..2ef837e16ee 100644
--- a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentEditor.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignmentEditor.class.php
@@ -18,6 +18,7 @@
  * @mixin       UserGroupAssignment
  * @extends DatabaseObjectEditor<UserGroupAssignment>
  * @implements IEditableCachedObject<UserGroupAssignment>
+ * @deprecated 6.3 use `UserGroupAssignmentBuilder` instead.
  */
 class UserGroupAssignmentEditor extends DatabaseObjectEditor implements IEditableCachedObject
 {
diff --git a/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentCreated.class.php b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentCreated.class.php
new file mode 100644
index 00000000000..dfb7d1dd401
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentCreated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a user group assignment has been created.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UserGroupAssignmentCreated implements IPsr14Event
+{
+    public function __construct(
+        public readonly UserGroupAssignment $assignment,
+        public readonly UserGroupAssignmentBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentDeleted.class.php b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentDeleted.class.php
new file mode 100644
index 00000000000..7e01af2ccd8
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentDeleted.class.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace wcf\event\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a user group assignment has been deleted.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UserGroupAssignmentDeleted implements IPsr14Event
+{
+    public function __construct(
+        public readonly UserGroupAssignment $assignment,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentUpdated.class.php b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentUpdated.class.php
new file mode 100644
index 00000000000..7b7e1660cc7
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentUpdated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\user\group\assignment;
+
+use wcf\data\user\group\assignment\UserGroupAssignment;
+use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a user group assignment has been updated.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UserGroupAssignmentUpdated implements IPsr14Event
+{
+    public function __construct(
+        public readonly UserGroupAssignment $assignment,
+        public readonly UserGroupAssignmentBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/groups/assignments/DeleteAssignment.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/groups/assignments/DeleteAssignment.class.php
index 947ea3f6605..a531b52da51 100644
--- a/wcfsetup/install/files/lib/system/endpoint/controller/core/users/groups/assignments/DeleteAssignment.class.php
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/users/groups/assignments/DeleteAssignment.class.php
@@ -5,8 +5,8 @@
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\user\group\assignment\DeleteUserGroupAssignment;
 use wcf\data\user\group\assignment\UserGroupAssignment;
-use wcf\data\user\group\assignment\UserGroupAssignmentAction;
 use wcf\http\Helper;
 use wcf\system\endpoint\DeleteRequest;
 use wcf\system\endpoint\IController;
@@ -30,7 +30,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
 
         $assignment = Helper::fetchObjectFromRequestParameter($variables['id'], UserGroupAssignment::class);
 
-        (new UserGroupAssignmentAction([$assignment], 'delete'))->executeAction();
+        new DeleteUserGroupAssignment($assignment)();
 
         return new JsonResponse([]);
     }

From 59446b8e157f4e50bcdaf4ce59cd759dbd77e9e2 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 13:20:02 +0200
Subject: [PATCH 15/47] Migrate notices to the DatabaseObjectBuilder API + new
 conditions API

---
 phpstan-baseline.neon                         |   6 -
 .../update_com.woltlab.wcf_6.3_step1.php      |   4 +
 .../templates/__noticeCssClassNameExample.tpl |  32 ++
 .../install/files/acp/templates/noticeAdd.tpl | 195 +--------
 .../lib/acp/form/NoticeAddForm.class.php      | 398 +++++++-----------
 .../lib/acp/form/NoticeEditForm.class.php     | 188 ++-------
 .../files/lib/bootstrap/com.woltlab.wcf.php   |   1 +
 .../lib/command/notice/CreateNotice.class.php |  34 ++
 .../lib/command/notice/DeleteNotice.class.php |  32 ++
 .../command/notice/DisableNotice.class.php    |  10 +-
 .../lib/command/notice/EnableNotice.class.php |  10 +-
 .../lib/command/notice/UpdateNotice.class.php |  34 ++
 .../files/lib/data/notice/Notice.class.php    |   1 +
 .../lib/data/notice/NoticeAction.class.php    |   1 +
 .../lib/data/notice/NoticeBuilder.class.php   | 269 ++++++++++++
 .../lib/data/notice/NoticeEditor.class.php    |   1 +
 .../lib/event/notice/NoticeCreated.class.php  |  23 +
 .../lib/event/notice/NoticeDeleted.class.php  |  21 +
 .../lib/event/notice/NoticeUpdated.class.php  |  23 +
 .../core/notices/DeleteNotice.class.php       |   4 +-
 .../lib/system/notice/NoticeHandler.class.php |  11 +-
 .../NoticeObjectFilterBuilder.class.php       |  70 +++
 wcfsetup/install/lang/de.xml                  |   2 +
 wcfsetup/install/lang/en.xml                  |   2 +
 wcfsetup/setup/db/install_com.woltlab.wcf.php |   1 +
 25 files changed, 767 insertions(+), 606 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/templates/__noticeCssClassNameExample.tpl
 create mode 100644 wcfsetup/install/files/lib/command/notice/CreateNotice.class.php
 create mode 100644 wcfsetup/install/files/lib/command/notice/DeleteNotice.class.php
 create mode 100644 wcfsetup/install/files/lib/command/notice/UpdateNotice.class.php
 create mode 100644 wcfsetup/install/files/lib/data/notice/NoticeBuilder.class.php
 create mode 100644 wcfsetup/install/files/lib/event/notice/NoticeCreated.class.php
 create mode 100644 wcfsetup/install/files/lib/event/notice/NoticeDeleted.class.php
 create mode 100644 wcfsetup/install/files/lib/event/notice/NoticeUpdated.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a22b87a553c..5fca153539f 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -102,12 +102,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 3
-			path: wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
index 4d30d82949b..a41f51127f5 100644
--- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
+++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
@@ -121,6 +121,10 @@
                 ->onUpdate('NO ACTION'),
         ]),
     PartialDatabaseTable::create('wcf1_user_group_assignment')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ]),
+    PartialDatabaseTable::create('wcf1_notice')
         ->columns([
             JsonDatabaseTableColumn::create('conditions'),
         ])
diff --git a/wcfsetup/install/files/acp/templates/__noticeCssClassNameExample.tpl b/wcfsetup/install/files/acp/templates/__noticeCssClassNameExample.tpl
new file mode 100644
index 00000000000..6e0110394e0
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/__noticeCssClassNameExample.tpl
@@ -0,0 +1,32 @@
+<dl>
+	<dt></dt>
+	<dd>
+		<woltlab-core-notice type="info" id="cssClassNameExample">{lang}wcf.acp.notice.example{/lang}</woltlab-core-notice>
+	</dd>
+</dl>
+
+<script data-relocate="true">
+	{
+		const example = document.getElementById('cssClassNameExample');
+		const updateExample = (cssClassName) => {
+			if (cssClassName === 'custom') {
+				example.hidden = true;
+			}
+			else {
+				example.type = cssClassName;
+				example.hidden = false;
+			}
+		};
+
+		document.querySelectorAll('input[name=cssClassName]').forEach((element) => {
+			element.addEventListener('change', () => {
+				updateExample(element.value);
+			});
+		});
+
+		const checked = document.querySelector('input[name=cssClassName]:checked');
+		if (checked !== null) {
+			updateExample(checked.value);
+		}
+	}
+</script>
diff --git a/wcfsetup/install/files/acp/templates/noticeAdd.tpl b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
index 2df7895077e..73a9303006e 100644
--- a/wcfsetup/install/files/acp/templates/noticeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/noticeAdd.tpl
@@ -4,10 +4,10 @@
 	<div class="contentHeaderTitle">
 		<h1 class="contentTitle">{lang}wcf.acp.notice.{$action}{/lang}</h1>
 	</div>
-	
+
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $action == 'edit'}
+			{if $action === 'edit'}
 				<li>
 					{unsafe:$interactionContextMenu->render()}
 				</li>
@@ -17,195 +17,6 @@
 	</nav>
 </header>
 
-{include file='shared_formNotice'}
-
-<form id="formContainer" method="post" action="{if $action == 'add'}{link controller='NoticeAdd'}{/link}{else}{link controller='NoticeEdit' object=$notice}{/link}{/if}">
-	<div class="section">
-		<dl{if $errorField == 'noticeName'} class="formError"{/if}>
-			<dt><label for="noticeName">{lang}wcf.global.name{/lang}</label></dt>
-			<dd>
-				<input type="text" id="noticeName" name="noticeName" value="{$noticeName}" required autofocus class="long">
-				{if $errorField == 'noticeName'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{else}
-							{lang}wcf.acp.notice.noticeName.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
-		
-		<dl{if $errorField == 'notice'} class="formError"{/if}>
-			<dt><label for="notice">{lang}wcf.acp.notice.notice{/lang}</label></dt>
-			<dd>
-				<textarea id="notice" name="notice" cols="40" rows="10">{$i18nPlainValues['notice']}</textarea>
-				{if $errorField == 'notice'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{elseif $errorType == 'multilingual'}
-							{lang}wcf.global.form.error.multilingual{/lang}
-						{else}
-							{lang}wcf.acp.notice.notice.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
-		{include file='shared_multipleLanguageInputJavascript' elementIdentifier='notice' forceSelection=false}
-		
-		<dl>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" id="noticeUseHtml" name="noticeUseHtml" value="1"{if $noticeUseHtml} checked{/if}> {lang}wcf.acp.notice.noticeUseHtml{/lang}</label>
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
-			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
-				<small>{lang}wcf.acp.notice.showOrder.description{/lang}</small>
-			</dd>
-		</dl>
-		
-		{event name='dataFields'}
-	</div>
-	
-	<section class="section">
-		<h2 class="sectionTitle">{lang}wcf.global.settings{/lang}</h2>
-		
-		<dl>
-			<dt><label for="cssClassName">{lang}wcf.acp.notice.cssClassName{/lang}</label></dt>
-			<dd>
-				{foreach from=$availableCssClassNames item=className}
-					<label><input type="radio" name="cssClassName" value="{$className}"{if $cssClassName == $className} checked{/if}> <span>{lang}wcf.acp.notice.cssClassName.{$className}{/lang}</span></label>
-				{/foreach}
-
-				<label><input type="radio" name="cssClassName" value="custom"{if $cssClassName == 'custom'} checked{/if}> <span><input type="text" id="customCssClassName" name="customCssClassName" value="{$customCssClassName}" class="medium"></span></label>
-				
-				{if $errorField == 'cssClassName'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{else}
-							{lang}wcf.acp.notice.cssClassName.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-				<small>{lang}wcf.acp.notice.cssClassName.description{/lang}</small>
-				
-				<woltlab-core-notice type="info" id="cssClassNameExample">{lang}wcf.acp.notice.example{/lang}</woltlab-core-notice>
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.notice.isDisabled{/lang}</label>
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" name="isDismissible" value="1"{if $isDismissible} checked{/if}> {lang}wcf.acp.notice.isDismissible{/lang}</label>
-				<small>{lang}wcf.acp.notice.isDismissible.description{/lang}</small>
-			</dd>
-		</dl>
-		
-		{if $action == 'edit' && $notice->isDismissible}
-			<dl>
-				<dt></dt>
-				<dd>
-					<label><input type="checkbox" name="resetIsDismissed" value="1"{if $resetIsDismissed} checked{/if}> {lang}wcf.acp.notice.resetIsDismissed{/lang}</label>
-					<small>{lang}wcf.acp.notice.resetIsDismissed.description{/lang}</small>
-				</dd>
-			</dl>
-		{/if}
-		
-		{event name='settingsFields'}
-	</section>
-	
-	{event name='sections'}
-	
-	<section class="section">
-		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.acp.notice.conditions{/lang}</h2>
-			<p class="sectionDescription">{lang}wcf.acp.notice.conditions.description{/lang}</p>
-		</header>
-		
-		<section class="section">
-			<header class="sectionHeader">
-				<h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.page{/lang}</h2>
-				<p class="sectionDescription">{lang}wcf.acp.notice.conditions.page.description{/lang}</p>
-			</header>
-			
-			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
-				{unsafe:$pageConditionObjectType->getProcessor()->getHtml()}
-			{/foreach}
-		</section>
-		
-		<section class="section">
-			<header class="sectionHeader">
-				<h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.pointInTime{/lang}</h2>
-				<p class="sectionDescription">{lang}wcf.acp.notice.conditions.pointInTime.description{/lang}</p>
-			</header>
-			
-			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
-				{unsafe:$pointInTimeConditionObjectType->getProcessor()->getHtml()}
-			{/foreach}
-		</section>
-		
-		{event name='conditionTypeSections'}
-	</section>
-	
-	<section class="section">
-		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.acp.notice.conditions.user{/lang}</h2>
-			<p class="sectionDescription">{lang}wcf.acp.notice.conditions.user.description{/lang}</p>
-		</header>
-
-		{include file='shared_userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
-	</section>
-	
-	{event name='conditionContainers'}
-	
-	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		{csrfToken}
-	</div>
-</form>
-
-
-<script data-relocate="true">
-	{
-		const example = document.getElementById('cssClassNameExample');
-		const updateExample = (cssClassName) => {
-			if (cssClassName == 'custom') {
-				example.hidden = true;
-			}
-			else {
-				example.type = cssClassName;
-				example.hidden = false;
-			}
-		};
-		
-		document.querySelectorAll('input[name=cssClassName]').forEach((element) => {
-			element.addEventListener('change', () => {
-				updateExample(element.value);
-			});
-		});
-
-		updateExample(document.querySelector('input[name=cssClassName]:checked').value);
-
-		document.getElementById('customCssClassName').addEventListener('focus', function () {
-			this.closest('label').querySelector('input[type=radio]').checked = true;
-			updateExample('custom');
-		});
-	}
-</script>
+{unsafe:$form->getHTML()}
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
index 4c0bfb4a3a5..94dff3f3693 100644
--- a/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
@@ -2,298 +2,198 @@
 
 namespace wcf\acp\form;
 
+use wcf\command\notice\CreateNotice;
+use wcf\command\notice\UpdateNotice;
+use wcf\data\DatabaseObjectBuilder;
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeAction;
-use wcf\data\notice\NoticeEditor;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\form\AbstractForm;
-use wcf\system\condition\ConditionHandler;
-use wcf\system\exception\UserInputException;
-use wcf\system\language\I18nHandler;
+use wcf\data\notice\NoticeBuilder;
+use wcf\form\AbstractDatabaseObjectBuilderForm;
+use wcf\system\form\builder\container\FormContainer;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
+use wcf\system\form\builder\field\IFormField;
+use wcf\system\form\builder\field\IntegerFormField;
+use wcf\system\form\builder\field\MultilineTextFormField;
+use wcf\system\form\builder\field\ObjectFilterFormField;
+use wcf\system\form\builder\field\RadioButtonFormField;
+use wcf\system\form\builder\field\TextFormField;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\form\builder\field\validation\FormFieldValidator;
+use wcf\system\form\builder\TemplateFormNode;
+use wcf\system\object\filter\builder\NoticeObjectFilterBuilder;
 use wcf\system\Regex;
-use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
-use wcf\util\StringUtil;
 
 /**
  * Shows the form to create a new notice.
  *
- * @author  Matthias Schmidt
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Matthias Schmidt, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ *
+ * @extends AbstractDatabaseObjectBuilderForm<Notice, NoticeBuilder>
  */
-class NoticeAddForm extends AbstractForm
+class NoticeAddForm extends AbstractDatabaseObjectBuilderForm
 {
     /**
      * @inheritDoc
      */
     public $activeMenuItem = 'wcf.acp.menu.link.notice.add';
 
-    /**
-     * name of the chosen CSS class name
-     * @var string
-     */
-    public $cssClassName = 'info';
-
-    /**
-     * custom CSS class name
-     * @var string
-     */
-    public $customCssClassName = '';
-
-    /**
-     * grouped notice condition object types
-     * @var (ObjectType|ObjectType[])[][]
-     */
-    public $groupedConditionObjectTypes = [];
-
-    /**
-     * 1 if the notice is disabled
-     * @var int
-     */
-    public $isDisabled = 0;
-
-    /**
-     * 1 if the notice is dismissible
-     * @var int
-     */
-    public $isDismissible = 0;
-
     /**
      * @inheritDoc
      */
     public $neededPermissions = ['admin.notice.canManageNotice'];
 
     /**
-     * name of the notice
-     * @var string
-     */
-    public $noticeName = '';
-
-    /**
-     * 1 if html is used in the notice text
-     * @var int
-     */
-    public $noticeUseHtml = 0;
-
-    /**
-     * order used to the show the notices
-     * @var int
+     * @inheritDoc
      */
-    public $showOrder = 0;
+    public string $objectEditLinkController = NoticeEditForm::class;
 
     #[\Override]
-    public function assignVariables()
+    protected function getDatabaseObjectBuilder(): NoticeBuilder
     {
-        parent::assignVariables();
-
-        I18nHandler::getInstance()->assignVariables();
-
-        WCF::getTPL()->assign([
-            'action' => 'add',
-            'availableCssClassNames' => Notice::TYPES,
-            'cssClassName' => $this->cssClassName,
-            'customCssClassName' => $this->customCssClassName,
-            'isDisabled' => $this->isDisabled,
-            'isDismissible' => $this->isDismissible,
-            'groupedConditionObjectTypes' => $this->groupedConditionObjectTypes,
-            'noticeName' => $this->noticeName,
-            'noticeUseHtml' => $this->noticeUseHtml,
-            'showOrder' => $this->showOrder,
-        ]);
-    }
-
-    #[\Override]
-    public function readData()
-    {
-        $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.condition.notice');
-        foreach ($objectTypes as $objectType) {
-            if ($objectType->conditionobject === null) {
-                continue;
-            }
-
-            if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject])) {
-                $this->groupedConditionObjectTypes[$objectType->conditionobject] = [];
-            }
-
-            if ($objectType->conditiongroup !== null) {
-                if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup])) {
-                    $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup] = [];
-                }
-
-                $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup][$objectType->objectTypeID] = $objectType;
-            } else {
-                $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->objectTypeID] = $objectType;
-            }
+        if ($this->formObject !== null) {
+            return NoticeBuilder::forUpdate($this->formObject);
         }
 
-        parent::readData();
+        return NoticeBuilder::forCreate();
     }
 
     #[\Override]
-    public function readFormParameters()
+    protected function getCommand(DatabaseObjectBuilder $builder): callable
     {
-        parent::readFormParameters();
-
-        I18nHandler::getInstance()->readValues();
-
-        if (isset($_POST['cssClassName'])) {
-            $this->cssClassName = StringUtil::trim($_POST['cssClassName']);
-        }
-        if (isset($_POST['customCssClassName'])) {
-            $this->customCssClassName = StringUtil::trim($_POST['customCssClassName']);
-        }
-        if (isset($_POST['isDisabled'])) {
-            $this->isDisabled = 1;
-        }
-        if (isset($_POST['isDismissible'])) {
-            $this->isDismissible = 1;
-        }
-        if (isset($_POST['noticeName'])) {
-            $this->noticeName = StringUtil::trim($_POST['noticeName']);
-        }
-        if (isset($_POST['noticeUseHtml'])) {
-            $this->noticeUseHtml = 1;
-        }
-        if (isset($_POST['showOrder'])) {
-            $this->showOrder = \intval($_POST['showOrder']);
+        if ($this->formObject !== null) {
+            return new UpdateNotice($builder);
         }
 
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    foreach ($objectTypes as $objectType) {
-                        $objectType->getProcessor()->readFormParameters();
-                    }
-                } else {
-                    $objectTypes->getProcessor()->readFormParameters();
-                }
-            }
-        }
+        return new CreateNotice($builder);
     }
 
     #[\Override]
-    public function readParameters()
+    protected function createForm(): void
     {
-        parent::readParameters();
-
-        I18nHandler::getInstance()->register('notice');
+        $this->form->appendChildren([
+            FormContainer::create('data')
+                ->appendChildren([
+                    TextFormField::create('noticeName')
+                        ->label('wcf.global.name')
+                        ->maximumLength(255)
+                        ->required()
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setNoticeName($field->getSaveValue());
+                        }),
+                    MultilineTextFormField::create('notice')
+                        ->label('wcf.acp.notice.notice')
+                        ->description('wcf.acp.notice.notice.description')
+                        ->i18n()
+                        ->languageItemPattern('wcf.notice.notice.notice\d+')
+                        ->required()
+                        ->rows(10)
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setNotice($field->getSaveValue());
+                        }),
+                    BooleanFormField::create('noticeUseHtml')
+                        ->label('wcf.acp.notice.noticeUseHtml')
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setNoticeUseHtml((bool)$field->getSaveValue());
+                        }),
+                    IntegerFormField::create('showOrder')
+                        ->label('wcf.global.showOrder')
+                        ->description('wcf.acp.notice.showOrder.description')
+                        ->minimum(0)
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setShowOrder($field->getSaveValue());
+                        }),
+                ]),
+            FormContainer::create('settings')
+                ->label('wcf.global.settings')
+                ->appendChildren([
+                    RadioButtonFormField::create('cssClassName')
+                        ->label('wcf.acp.notice.cssClassName')
+                        ->description('wcf.acp.notice.cssClassName.description')
+                        ->options($this->getAvailableCssClassNames())
+                        ->value('info')
+                        ->required()
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $cssClassName = $field->getSaveValue();
+                            if ($cssClassName === 'custom') {
+                                $cssClassName = $field->getDocument()
+                                    ->getFormField('customCssClassName')
+                                    ->getSaveValue();
+                            }
+
+                            $builder->setCssClassName($cssClassName);
+                        })
+                        ->loadValueCallback(static function (Notice $object, IFormField $field) {
+                            $field->value($object->isCustom() ? 'custom' : $object->cssClassName);
+                        }),
+                    TextFormField::create('customCssClassName')
+                        ->label('wcf.acp.notice.customCssClassName')
+                        ->maximumLength(255)
+                        ->required()
+                        ->addValidator(
+                            new FormFieldValidator('cssClassName', static function (TextFormField $field) {
+                                if (Regex::compile('^-?[_a-zA-Z]+[_a-zA-Z0-9-]+$')->match($field->getValue()) === 0) {
+                                    $field->addValidationError(
+                                        new FormFieldValidationError(
+                                            'invalid',
+                                            'wcf.acp.notice.cssClassName.error.invalid'
+                                        )
+                                    );
+                                }
+                            })
+                        )
+                        ->loadValueCallback(static function (Notice $object, IFormField $field) {
+                            $field->value($object->isCustom() ? $object->cssClassName : '');
+                        }),
+                    TemplateFormNode::create('cssClassNameExample')
+                        ->templateName('__noticeCssClassNameExample'),
+                    BooleanFormField::create('isDisabled')
+                        ->label('wcf.acp.notice.isDisabled')
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setIsDisabled((bool)$field->getSaveValue());
+                        }),
+                    BooleanFormField::create('isDismissible')
+                        ->label('wcf.acp.notice.isDismissible')
+                        ->description('wcf.acp.notice.isDismissible.description')
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setIsDismissible((bool)$field->getSaveValue());
+                        }),
+                ]),
+            FormContainer::create('conditionsContainer')
+                ->label('wcf.acp.notice.conditions')
+                ->description('wcf.acp.notice.conditions.description')
+                ->appendChild(
+                    ObjectFilterFormField::create('conditions')
+                        ->builder(new NoticeObjectFilterBuilder())
+                        ->saveValueCallback(static function (NoticeBuilder $builder, IFormField $field) {
+                            $builder->setConditions($field->getSaveValue());
+                        })
+                ),
+        ]);
     }
 
     #[\Override]
-    public function save()
+    protected function finalizeForm(): void
     {
-        parent::save();
-
-        $this->objectAction = new NoticeAction([], 'create', [
-            'data' => \array_merge($this->additionalFields, [
-                'cssClassName' => $this->cssClassName === 'custom' ? $this->customCssClassName : $this->cssClassName,
-                'isDisabled' => $this->isDisabled,
-                'isDismissible' => $this->isDismissible,
-                'notice' => I18nHandler::getInstance()->isPlainValue('notice') ? I18nHandler::getInstance()->getValue('notice') : '',
-                'noticeName' => $this->noticeName,
-                'noticeUseHtml' => $this->noticeUseHtml,
-                'showOrder' => $this->showOrder,
-            ]),
-        ]);
-        $returnValues = $this->objectAction->executeAction();
-
-        if (!I18nHandler::getInstance()->isPlainValue('notice')) {
-            I18nHandler::getInstance()->save(
-                'notice',
-                'wcf.notice.notice.notice' . $returnValues['returnValues']->noticeID,
-                'wcf.notice',
-                1
-            );
-
-            // update notice name
-            $noticeEditor = new NoticeEditor($returnValues['returnValues']);
-            $noticeEditor->update([
-                'notice' => 'wcf.notice.notice.notice' . $returnValues['returnValues']->noticeID,
-            ]);
-        }
-
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    $conditions = \array_merge($conditions, $objectTypes);
-                } else {
-                    $conditions[] = $objectTypes;
-                }
-            }
-        }
-
-        ConditionHandler::getInstance()->createConditions($returnValues['returnValues']->noticeID, $conditions);
-
-        $this->saved();
-
-        // reset values
-        $this->cssClassName = '';
-        $this->customCssClassName = '';
-        $this->isDisabled = 0;
-        $this->isDismissible = 0;
-        $this->noticeName = '';
-        $this->noticeUseHtml = 0;
-        $this->showOrder = 0;
-        I18nHandler::getInstance()->reset();
-
-        foreach ($conditions as $condition) {
-            $condition->getProcessor()->reset();
-        }
-
-        WCF::getTPL()->assign([
-            'success' => true,
-            'objectEditLink' => LinkHandler::getInstance()->getControllerLink(
-                NoticeEditForm::class,
-                ['id' => $returnValues['returnValues']->noticeID]
-            ),
-        ]);
+        $this->form->getNodeById('customCssClassName')->addDependency(
+            ValueFormFieldDependency::create('cssClassName')
+                ->field($this->form->getFormField('cssClassName'))
+                ->values(['custom'])
+        );
     }
 
-    #[\Override]
-    public function validate()
+    /**
+     * @return array<string, string>
+     */
+    private function getAvailableCssClassNames(): array
     {
-        parent::validate();
-
-        if (empty($this->noticeName)) {
-            throw new UserInputException('noticeName');
-        }
-
-        if (!I18nHandler::getInstance()->validateValue('notice')) {
-            if (I18nHandler::getInstance()->isPlainValue('notice')) {
-                throw new UserInputException('notice');
-            } else {
-                throw new UserInputException('notice', 'multilingual');
-            }
-        }
-
-        // validate class name
-        if (empty($this->cssClassName)) {
-            throw new UserInputException('cssClassName');
-        } elseif ($this->cssClassName === 'custom') {
-            if (empty($this->cssClassName)) {
-                throw new UserInputException('cssClassName');
-            }
-            if (Regex::compile('^-?[_a-zA-Z]+[_a-zA-Z0-9-]+$')->match($this->customCssClassName) === 0) {
-                throw new UserInputException('cssClassName', 'invalid');
-            }
-        } elseif (!\in_array($this->cssClassName, Notice::TYPES, true)) {
-            throw new UserInputException('cssClassName', 'invalid');
+        $options = [];
+        foreach (Notice::TYPES as $type) {
+            $options[$type] = 'wcf.acp.notice.cssClassName.' . $type;
         }
+        $options['custom'] = 'wcf.acp.notice.cssClassName.custom';
 
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    foreach ($objectTypes as $objectType) {
-                        $objectType->getProcessor()->validate();
-                    }
-                } else {
-                    $objectTypes->getProcessor()->validate();
-                }
-            }
-        }
+        return $options;
     }
 }
diff --git a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
index 6f318c07749..9cf0c426783 100644
--- a/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/NoticeEditForm.class.php
@@ -4,13 +4,11 @@
 
 use wcf\acp\page\NoticeListPage;
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeAction;
-use wcf\form\AbstractForm;
 use wcf\http\Helper;
-use wcf\system\condition\ConditionHandler;
+use wcf\system\form\builder\container\IFormContainer;
+use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\interaction\admin\NoticeInteractions;
 use wcf\system\interaction\StandaloneInteractionContextMenuComponent;
-use wcf\system\language\I18nHandler;
 use wcf\system\request\LinkHandler;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\WCF;
@@ -18,9 +16,9 @@
 /**
  * Shows the form to edit an existing notice.
  *
- * @author  Matthias Schmidt
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Matthias Schmidt, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 class NoticeEditForm extends NoticeAddForm
 {
@@ -30,163 +28,69 @@ class NoticeEditForm extends NoticeAddForm
     public $activeMenuItem = 'wcf.acp.menu.link.notice.list';
 
     /**
-     * edited notice object
-     * @var ?Notice
-     */
-    public $notice;
-
-    /**
-     * 1 if the notice will be displayed for all users again
-     * @var int
+     * @inheritDoc
      */
-    public $resetIsDismissed = 0;
+    public string $formAction = 'edit';
 
     #[\Override]
-    public function assignVariables()
+    public function readParameters()
     {
-        parent::assignVariables();
-
-        I18nHandler::getInstance()->assignVariables($_POST !== []);
+        parent::readParameters();
 
-        WCF::getTPL()->assign([
-            'action' => 'edit',
-            'notice' => $this->notice,
-            'resetIsDismissed' => $this->resetIsDismissed,
-            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
-                new NoticeInteractions(),
-                $this->notice,
-                LinkHandler::getInstance()->getControllerLink(NoticeListPage::class)
-            ),
-        ]);
+        $this->formObject = Helper::fetchObjectFromQueryParameter(Notice::class);
     }
 
     #[\Override]
-    public function readData()
+    protected function createForm(): void
     {
-        parent::readData();
-
-        if ($_POST === []) {
-            I18nHandler::getInstance()->setOptions('notice', 1, $this->notice->notice, 'wcf.notice.notice.notice\d+');
-
-            $this->cssClassName = $this->notice->cssClassName;
-            if (!\in_array($this->cssClassName, Notice::TYPES, true)) {
-                $this->customCssClassName = $this->cssClassName;
-                $this->cssClassName = 'custom';
-            }
-
-            $this->isDisabled = $this->notice->isDisabled;
-            $this->isDismissible = $this->notice->isDismissible;
-            $this->noticeName = $this->notice->noticeName;
-            $this->noticeUseHtml = $this->notice->noticeUseHtml;
-            $this->showOrder = $this->notice->showOrder;
-
-            $conditions = $this->notice->getConditions();
-            $conditionsByObjectTypeID = [];
-            foreach ($conditions as $condition) {
-                $conditionsByObjectTypeID[$condition->objectTypeID] = $condition;
-            }
-
-            foreach ($this->groupedConditionObjectTypes as $objectTypes1) {
-                foreach ($objectTypes1 as $objectTypes2) {
-                    if (\is_array($objectTypes2)) {
-                        foreach ($objectTypes2 as $objectType) {
-                            if (isset($conditionsByObjectTypeID[$objectType->objectTypeID])) {
-                                $conditionsByObjectTypeID[$objectType->objectTypeID]->getObjectType()->getProcessor()->setData($conditionsByObjectTypeID[$objectType->objectTypeID]);
-                            }
-                        }
-                    } elseif (isset($conditionsByObjectTypeID[$objectTypes2->objectTypeID])) {
-                        $conditionsByObjectTypeID[$objectTypes2->objectTypeID]->getObjectType()->getProcessor()->setData($conditionsByObjectTypeID[$objectTypes2->objectTypeID]);
-                    }
-                }
-            }
-        }
-    }
+        parent::createForm();
 
-    #[\Override]
-    public function readFormParameters()
-    {
-        parent::readFormParameters();
+        $settings = $this->form->getNodeById('settings');
+        \assert($settings instanceof IFormContainer);
 
-        if (isset($_POST['resetIsDismissed'])) {
-            $this->resetIsDismissed = 1;
-        }
+        $settings->appendChild(
+            BooleanFormField::create('resetIsDismissed')
+                ->label('wcf.acp.notice.resetIsDismissed')
+                ->description('wcf.acp.notice.resetIsDismissed.description')
+                ->available($this->formObject?->isDismissible !== 0)
+        );
     }
 
     #[\Override]
-    public function readParameters()
+    protected function afterSave(): void
     {
-        parent::readParameters();
+        parent::afterSave();
 
-        $this->notice = Helper::fetchObjectFromQueryParameter(Notice::class);
-    }
-
-    #[\Override]
-    public function save()
-    {
-        AbstractForm::save();
-
-        $this->objectAction = new NoticeAction([$this->notice], 'update', [
-            'data' => \array_merge($this->additionalFields, [
-                'cssClassName' => $this->cssClassName === 'custom' ? $this->customCssClassName : $this->cssClassName,
-                'isDisabled' => $this->isDisabled,
-                'isDismissible' => $this->isDismissible,
-                'notice' => I18nHandler::getInstance()->isPlainValue('notice') ? I18nHandler::getInstance()->getValue('notice') : 'wcf.notice.notice.notice' . $this->notice->noticeID,
-                'noticeName' => $this->noticeName,
-                'noticeUseHtml' => $this->noticeUseHtml,
-                'showOrder' => $this->showOrder,
-            ]),
-        ]);
-        $this->objectAction->executeAction();
-
-        if (I18nHandler::getInstance()->isPlainValue('notice')) {
-            if ($this->notice->notice === 'wcf.notice.notice.notice' . $this->notice->noticeID) {
-                I18nHandler::getInstance()->remove($this->notice->notice);
-            }
-        } else {
-            I18nHandler::getInstance()->save(
-                'notice',
-                'wcf.notice.notice.notice' . $this->notice->noticeID,
-                'wcf.notice',
-                1
-            );
+        $resetIsDismissed = $this->form->getFormField('resetIsDismissed');
+        if ($resetIsDismissed === null || !$resetIsDismissed->isAvailable()) {
+            return;
         }
 
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    $conditions = \array_merge($conditions, $objectTypes);
-                } else {
-                    $conditions[] = $objectTypes;
-                }
-            }
+        if ($resetIsDismissed->getSaveValue() === 0) {
+            return;
         }
 
-        ConditionHandler::getInstance()->updateConditions(
-            $this->notice->noticeID,
-            $this->notice->getConditions(),
-            $conditions
-        );
-
-        if ($this->resetIsDismissed !== 0) {
-            $sql = "DELETE FROM wcf1_notice_dismissed
-                    WHERE       noticeID = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            $statement->execute([
-                $this->notice->noticeID,
-            ]);
-
-            $this->resetIsDismissed = 0;
-
-            UserStorageHandler::getInstance()->resetAll('dismissedNotices');
-        }
+        $sql = "DELETE FROM wcf1_notice_dismissed
+                WHERE       noticeID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $this->object->noticeID,
+        ]);
 
-        $this->saved();
+        UserStorageHandler::getInstance()->resetAll('dismissedNotices');
+    }
 
-        // reload notice object for proper 'isDismissible' value
-        $this->notice = new Notice($this->notice->noticeID);
+    #[\Override]
+    public function assignVariables()
+    {
+        parent::assignVariables();
 
-        WCF::getTPL()->assign('success', true);
+        WCF::getTPL()->assign([
+            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
+                new NoticeInteractions(),
+                $this->formObject,
+                LinkHandler::getInstance()->getControllerLink(NoticeListPage::class)
+            ),
+        ]);
     }
 }
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index ed0b8df7668..a6a9303a162 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -181,6 +181,7 @@ private function initObjectFilters(): void
         EventHandler::getInstance()->register(
             \wcf\event\object\filter\ObjectFilterBuilderCollecting::class,
             static function (\wcf\event\object\filter\ObjectFilterBuilderCollecting $event) {
+                $event->register(new \wcf\system\object\filter\builder\NoticeObjectFilterBuilder());
                 $event->register(new \wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder());
             }
         );
diff --git a/wcfsetup/install/files/lib/command/notice/CreateNotice.class.php b/wcfsetup/install/files/lib/command/notice/CreateNotice.class.php
new file mode 100644
index 00000000000..df04998b078
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/notice/CreateNotice.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\notice;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeBuilder;
+use wcf\event\notice\NoticeCreated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Creates a new notice.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class CreateNotice
+{
+    public function __construct(
+        private readonly NoticeBuilder $builder,
+    ) {}
+
+    public function __invoke(): Notice
+    {
+        $notice = $this->builder->create();
+
+        NoticeBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new NoticeCreated($notice, $this->builder));
+
+        return $notice;
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/notice/DeleteNotice.class.php b/wcfsetup/install/files/lib/command/notice/DeleteNotice.class.php
new file mode 100644
index 00000000000..f25c7a9c201
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/notice/DeleteNotice.class.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\notice;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeBuilder;
+use wcf\event\notice\NoticeDeleted;
+use wcf\system\event\EventHandler;
+
+/**
+ * Deletes a notice.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class DeleteNotice
+{
+    public function __construct(
+        private readonly Notice $notice,
+    ) {}
+
+    public function __invoke(): void
+    {
+        NoticeBuilder::delete($this->notice);
+
+        NoticeBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new NoticeDeleted($this->notice));
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/notice/DisableNotice.class.php b/wcfsetup/install/files/lib/command/notice/DisableNotice.class.php
index 4444e62d220..e3129f13023 100644
--- a/wcfsetup/install/files/lib/command/notice/DisableNotice.class.php
+++ b/wcfsetup/install/files/lib/command/notice/DisableNotice.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\notice;
 
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeEditor;
+use wcf\data\notice\NoticeBuilder;
 use wcf\event\notice\NoticeDisabled;
 use wcf\system\event\EventHandler;
 
@@ -21,11 +21,11 @@ public function __construct(private readonly Notice $notice) {}
 
     public function __invoke(): void
     {
-        (new NoticeEditor($this->notice))->update([
-            'isDisabled' => 1,
-        ]);
+        NoticeBuilder::forUpdate($this->notice)
+            ->setIsDisabled(true)
+            ->update();
 
-        NoticeEditor::resetCache();
+        NoticeBuilder::resetCache();
 
         $event = new NoticeDisabled($this->notice);
         EventHandler::getInstance()->fire($event);
diff --git a/wcfsetup/install/files/lib/command/notice/EnableNotice.class.php b/wcfsetup/install/files/lib/command/notice/EnableNotice.class.php
index fffcd0790e5..97565895776 100644
--- a/wcfsetup/install/files/lib/command/notice/EnableNotice.class.php
+++ b/wcfsetup/install/files/lib/command/notice/EnableNotice.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\notice;
 
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeEditor;
+use wcf\data\notice\NoticeBuilder;
 use wcf\event\notice\NoticeEnabled;
 use wcf\system\event\EventHandler;
 
@@ -21,11 +21,11 @@ public function __construct(private readonly Notice $notice) {}
 
     public function __invoke(): void
     {
-        (new NoticeEditor($this->notice))->update([
-            'isDisabled' => 0,
-        ]);
+        NoticeBuilder::forUpdate($this->notice)
+            ->setIsDisabled(false)
+            ->update();
 
-        NoticeEditor::resetCache();
+        NoticeBuilder::resetCache();
 
         $event = new NoticeEnabled($this->notice);
         EventHandler::getInstance()->fire($event);
diff --git a/wcfsetup/install/files/lib/command/notice/UpdateNotice.class.php b/wcfsetup/install/files/lib/command/notice/UpdateNotice.class.php
new file mode 100644
index 00000000000..29b120a2c80
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/notice/UpdateNotice.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\notice;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeBuilder;
+use wcf\event\notice\NoticeUpdated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Updates a notice.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UpdateNotice
+{
+    public function __construct(
+        private readonly NoticeBuilder $builder,
+    ) {}
+
+    public function __invoke(): Notice
+    {
+        $notice = $this->builder->update();
+
+        NoticeBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new NoticeUpdated($notice, $this->builder));
+
+        return $notice;
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/notice/Notice.class.php b/wcfsetup/install/files/lib/data/notice/Notice.class.php
index 83d34a0a11d..129a14cf195 100644
--- a/wcfsetup/install/files/lib/data/notice/Notice.class.php
+++ b/wcfsetup/install/files/lib/data/notice/Notice.class.php
@@ -25,6 +25,7 @@
  * @property-read   int     $showOrder      position of the notice in relation to the other notices
  * @property-read   0|1     $isDisabled     is `1` if the notice is disabled and thus not shown, otherwise `0`
  * @property-read   0|1     $isDismissible  is `1` if the notice can be dismissed by users, otherwise `0`
+ * @property-read   ?string $conditions     serialized object filters the active user must match or `null` if the notice has no filters
  */
 class Notice extends DatabaseObject implements IRouteController, \Stringable
 {
diff --git a/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php b/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
index 3378b9658f2..aec9f3def7b 100644
--- a/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
+++ b/wcfsetup/install/files/lib/data/notice/NoticeAction.class.php
@@ -17,6 +17,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @extends AbstractDatabaseObjectAction<Notice, NoticeEditor>
+ * @deprecated 6.3 use `NoticeBuilder` instead.
  */
 class NoticeAction extends AbstractDatabaseObjectAction implements IToggleAction
 {
diff --git a/wcfsetup/install/files/lib/data/notice/NoticeBuilder.class.php b/wcfsetup/install/files/lib/data/notice/NoticeBuilder.class.php
new file mode 100644
index 00000000000..a238a83ffee
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/notice/NoticeBuilder.class.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace wcf\data\notice;
+
+use wcf\data\DatabaseObject;
+use wcf\data\DatabaseObjectBuilder;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\cache\builder\ConditionCacheBuilder;
+use wcf\system\cache\builder\NoticeCacheBuilder;
+use wcf\system\condition\ConditionHandler;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\language\I18nHandler;
+use wcf\system\language\LanguageFactory;
+use wcf\system\WCF;
+
+/**
+ * Builder for creating, updating and deleting notices.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectBuilder<Notice>
+ */
+final class NoticeBuilder extends DatabaseObjectBuilder
+{
+    private const LANGUAGE_CATEGORY = 'wcf.notice';
+
+    private const LANGUAGE_ITEM_PATTERN = 'wcf.notice.notice.notice%d';
+
+    /**
+     * @var ?array<int, string>
+     */
+    private ?array $i18nValues = null;
+
+    private ?int $showOrder = null;
+
+    public function setNoticeName(string $noticeName): static
+    {
+        $this->properties['noticeName'] = $noticeName;
+
+        return $this;
+    }
+
+    /**
+     * Sets the text of the notice.
+     *
+     * Pass an array of language id to text mappings to store the text as a
+     * language item instead of a plain value.
+     *
+     * @param string|array<int, string> $notice
+     */
+    public function setNotice(string|array $notice): static
+    {
+        if (\is_array($notice)) {
+            $this->i18nValues = $notice;
+            // The final value is the name of the language item which is only
+            // known once the notice has been created.
+            $this->properties['notice'] = '';
+        } else {
+            $this->i18nValues = [];
+            $this->properties['notice'] = $notice;
+        }
+
+        return $this;
+    }
+
+    public function setNoticeUseHtml(bool $noticeUseHtml): static
+    {
+        $this->properties['noticeUseHtml'] = (int)$noticeUseHtml;
+
+        return $this;
+    }
+
+    public function setCssClassName(string $cssClassName): static
+    {
+        $this->properties['cssClassName'] = $cssClassName;
+
+        return $this;
+    }
+
+    /**
+     * Sets the position of the notice in relation to the other notices.
+     *
+     * The other notices are shifted accordingly, a value of `0` appends the
+     * notice at the end.
+     */
+    public function setShowOrder(int $showOrder): static
+    {
+        $this->showOrder = $showOrder;
+
+        return $this;
+    }
+
+    public function setIsDisabled(bool $isDisabled): static
+    {
+        $this->properties['isDisabled'] = (int)$isDisabled;
+
+        return $this;
+    }
+
+    public function setIsDismissible(bool $isDismissible): static
+    {
+        $this->properties['isDismissible'] = (int)$isDismissible;
+
+        return $this;
+    }
+
+    /**
+     * Sets the serialized object filters that the active user must match.
+     *
+     * A notice without any filters is visible to everyone, therefore an empty
+     * list of filters is stored as `null`.
+     */
+    public function setConditions(?string $conditions): static
+    {
+        if ($conditions !== null && \json_decode($conditions, true) === []) {
+            $conditions = null;
+        }
+
+        $this->properties['conditions'] = $conditions;
+
+        return $this;
+    }
+
+    #[\Override]
+    protected function getRequiredProperties(): array
+    {
+        return ['noticeName'];
+    }
+
+    #[\Override]
+    protected function afterCreate(DatabaseObject $object): void
+    {
+        $this->saveI18nValues($object);
+
+        if ($this->showOrder !== null) {
+            self::applyShowOrder($object, $this->showOrder);
+        }
+    }
+
+    #[\Override]
+    protected function afterUpdate(DatabaseObject $object): void
+    {
+        $this->saveI18nValues($object);
+
+        if ($this->showOrder !== null && $this->showOrder !== $this->getObject()->showOrder) {
+            self::applyShowOrder($object, $this->showOrder);
+        }
+    }
+
+    #[\Override]
+    protected static function beforeDeleteAll(array $objectIDs): void
+    {
+        ConditionHandler::getInstance()->deleteConditions('com.woltlab.wcf.condition.notice', $objectIDs);
+    }
+
+    /**
+     * Writes the text of the notice into a language item or removes a
+     * previously created language item if a plain value is used.
+     */
+    private function saveI18nValues(Notice $notice): void
+    {
+        if ($this->i18nValues === null) {
+            return;
+        }
+
+        $languageItem = \sprintf(self::LANGUAGE_ITEM_PATTERN, $notice->noticeID);
+
+        if ($this->i18nValues === []) {
+            self::deleteLanguageItems([$languageItem]);
+
+            return;
+        }
+
+        I18nHandler::getInstance()->save(
+            $this->i18nValues,
+            $languageItem,
+            self::LANGUAGE_CATEGORY,
+            \PACKAGE_ID
+        );
+
+        $sql = "UPDATE  wcf1_notice
+                SET     notice = ?
+                WHERE   noticeID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $languageItem,
+            $notice->noticeID,
+        ]);
+    }
+
+    /**
+     * @param list<string> $languageItems
+     */
+    private static function deleteLanguageItems(array $languageItems): void
+    {
+        $sql = "SELECT  languageCategoryID
+                FROM    wcf1_language_category
+                WHERE   languageCategory = ?";
+        $statement = WCF::getDB()->prepare($sql, 1);
+        $statement->execute([self::LANGUAGE_CATEGORY]);
+        $languageCategoryID = $statement->fetchSingleColumn();
+
+        $conditions = new PreparedStatementConditionBuilder();
+        $conditions->add('languageItem IN (?)', [$languageItems]);
+        $conditions->add('packageID = ?', [\PACKAGE_ID]);
+        $conditions->add('languageCategoryID = ?', [$languageCategoryID]);
+
+        $sql = "DELETE FROM wcf1_language_item
+                {$conditions}";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute($conditions->getParameters());
+
+        LanguageFactory::getInstance()->deleteLanguageCache();
+    }
+
+    /**
+     * Moves the notice to the given position, shifting the notices that follow
+     * it. A value of `0` appends the notice at the end.
+     */
+    private static function applyShowOrder(Notice $notice, int $showOrder): void
+    {
+        $sql = "SELECT  MAX(showOrder)
+                FROM    wcf1_notice";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute();
+        $maxShowOrder = $statement->fetchSingleColumn();
+        if ($maxShowOrder === null) {
+            $maxShowOrder = 0;
+        }
+
+        if ($showOrder === 0 || $showOrder > $maxShowOrder) {
+            $newShowOrder = $maxShowOrder + 1;
+        } else {
+            $sql = "UPDATE  wcf1_notice
+                    SET     showOrder = showOrder + 1
+                    WHERE   showOrder >= ?
+                        AND noticeID <> ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([
+                $showOrder,
+                $notice->noticeID,
+            ]);
+
+            $newShowOrder = $showOrder;
+        }
+
+        $sql = "UPDATE  wcf1_notice
+                SET     showOrder = ?
+                WHERE   noticeID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $newShowOrder,
+            $notice->noticeID,
+        ]);
+    }
+
+    public static function resetCache(): void
+    {
+        NoticeCacheBuilder::getInstance()->reset();
+        ConditionCacheBuilder::getInstance()->reset([
+            'definitionID' => ObjectTypeCache::getInstance()
+                ->getDefinitionByName('com.woltlab.wcf.condition.notice')
+                ->definitionID,
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/notice/NoticeEditor.class.php b/wcfsetup/install/files/lib/data/notice/NoticeEditor.class.php
index 5f922a7409e..b84bcb6abc0 100644
--- a/wcfsetup/install/files/lib/data/notice/NoticeEditor.class.php
+++ b/wcfsetup/install/files/lib/data/notice/NoticeEditor.class.php
@@ -19,6 +19,7 @@
  * @mixin       Notice
  * @extends DatabaseObjectEditor<Notice>
  * @implements IEditableCachedObject<Notice>
+ * @deprecated 6.3 use `NoticeBuilder` instead.
  */
 class NoticeEditor extends DatabaseObjectEditor implements IEditableCachedObject
 {
diff --git a/wcfsetup/install/files/lib/event/notice/NoticeCreated.class.php b/wcfsetup/install/files/lib/event/notice/NoticeCreated.class.php
new file mode 100644
index 00000000000..d52d00c9b45
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/notice/NoticeCreated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\notice;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a notice has been created.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class NoticeCreated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Notice $notice,
+        public readonly NoticeBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/notice/NoticeDeleted.class.php b/wcfsetup/install/files/lib/event/notice/NoticeDeleted.class.php
new file mode 100644
index 00000000000..b97fa230555
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/notice/NoticeDeleted.class.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace wcf\event\notice;
+
+use wcf\data\notice\Notice;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a notice has been deleted.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class NoticeDeleted implements IPsr14Event
+{
+    public function __construct(
+        public readonly Notice $notice,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/notice/NoticeUpdated.class.php b/wcfsetup/install/files/lib/event/notice/NoticeUpdated.class.php
new file mode 100644
index 00000000000..6e28fb2173b
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/notice/NoticeUpdated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\notice;
+
+use wcf\data\notice\Notice;
+use wcf\data\notice\NoticeBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a notice has been updated.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class NoticeUpdated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Notice $notice,
+        public readonly NoticeBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/notices/DeleteNotice.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/notices/DeleteNotice.class.php
index e5edb1ee862..8e90bf33583 100644
--- a/wcfsetup/install/files/lib/system/endpoint/controller/core/notices/DeleteNotice.class.php
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/notices/DeleteNotice.class.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use wcf\data\notice\Notice;
-use wcf\data\notice\NoticeAction;
+use wcf\command\notice\DeleteNotice as DeleteNoticeCommand;
 use wcf\http\Helper;
 use wcf\system\endpoint\DeleteRequest;
 use wcf\system\endpoint\IController;
@@ -30,7 +30,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
 
         $notice = Helper::fetchObjectFromRequestParameter($variables['id'], Notice::class);
 
-        (new NoticeAction([$notice], 'delete'))->executeAction();
+        new DeleteNoticeCommand($notice)();
 
         return new JsonResponse([]);
     }
diff --git a/wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php b/wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php
index cf80798b72c..020707f1093 100644
--- a/wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php
+++ b/wcfsetup/install/files/lib/system/notice/NoticeHandler.class.php
@@ -4,7 +4,9 @@
 
 use wcf\data\notice\Notice;
 use wcf\system\cache\builder\NoticeCacheBuilder;
+use wcf\system\object\filter\builder\NoticeObjectFilterBuilder;
 use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 
 /**
  * Handles notice-related matters.
@@ -44,17 +46,16 @@ public function getVisibleNotices()
             return [];
         }
 
+        $filterBuilder = new NoticeObjectFilterBuilder();
+
         $notices = [];
         foreach ($this->notices as $notice) {
             if ($notice->isDismissed()) {
                 continue;
             }
 
-            $conditions = $notice->getConditions();
-            foreach ($conditions as $condition) {
-                if (!$condition->getObjectType()->getProcessor()->showContent($condition)) {
-                    continue 2;
-                }
+            if (!$filterBuilder->testUser($notice, WCF::getUser())) {
+                continue;
             }
 
             $notices[$notice->noticeID] = $notice;
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
new file mode 100644
index 00000000000..4b24edbd679
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace wcf\system\object\filter\builder;
+
+use wcf\data\notice\Notice;
+use wcf\data\user\User;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\ObjectFilterHandler;
+use wcf\system\object\filter\user\UserAvatarObjectFilter;
+use wcf\system\object\filter\user\UserLanguageObjectFilter;
+use wcf\system\WCF;
+
+final class NoticeObjectFilterBuilder implements IObjectFilterBuilder
+{
+    /**
+     * @var list<IObjectFilter<mixed>>
+     */
+    private readonly array $filters;
+
+    private ObjectFilterHandler $handler;
+
+    public function __construct()
+    {
+        $this->filters = [
+            new UserAvatarObjectFilter(),
+            new UserLanguageObjectFilter(),
+        ];
+    }
+
+    #[\Override]
+    public function getFilters(): array
+    {
+        return $this->filters;
+    }
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.notice';
+    }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return WCF::getSession()->hasPermission('admin.notice.canManageNotice');
+    }
+
+    /**
+     * Returns whether the given user matches the filters of the notice.
+     *
+     * A notice without any filters is visible to everyone.
+     */
+    public function testUser(Notice $notice, User $user): bool
+    {
+        if ($notice->conditions === null) {
+            return true;
+        }
+
+        return $this->getHandler()->testUser($user, $notice->conditions);
+    }
+
+    private function getHandler(): ObjectFilterHandler
+    {
+        if (!isset($this->handler)) {
+            $this->handler = new ObjectFilterHandler($this->getFilters());
+        }
+
+        return $this->handler;
+    }
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a1ea5a5e502..143def3fabd 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1264,6 +1264,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.notice.add"><![CDATA[Hinweis hinzufügen]]></item>
 		<item name="wcf.acp.notice.cssClassName"><![CDATA[Darstellung]]></item>
 		<item name="wcf.acp.notice.cssClassName.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} aus den vorgegebenen Darstellungen wählen oder eine eigene Darstellung durch Angabe einer <abbr title="Cascading Style Sheets">CSS</abbr>-Klasse nutzen.]]></item>
+		<item name="wcf.acp.notice.cssClassName.custom"><![CDATA[Eigene CSS-Klasse]]></item>
 		<item name="wcf.acp.notice.cssClassName.error"><![CDATA[Fehlermeldung]]></item>
 		<item name="wcf.acp.notice.cssClassName.error.invalid"><![CDATA[Die gewählte CSS-Klasse ist ungültig.]]></item>
 		<item name="wcf.acp.notice.cssClassName.info"><![CDATA[Information]]></item>
@@ -1277,6 +1278,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Leg{else}Legen Sie{/if} den Zeitpunkt fest, zu dem der Hinweis angezeigt werden soll.]]></item>
 		<item name="wcf.acp.notice.conditions.user"><![CDATA[Aktiver Benutzer]]></item>
 		<item name="wcf.acp.notice.conditions.user.description"><![CDATA[Der aktive Benutzer muss die folgenden Bedingungen erfüllen, damit der Hinweis angezeigt wird.]]></item>
+		<item name="wcf.acp.notice.customCssClassName"><![CDATA[CSS-Klasse]]></item>
 		<item name="wcf.acp.notice.edit"><![CDATA[Hinweis bearbeiten]]></item>
 		<item name="wcf.acp.notice.example"><![CDATA[Beispieltext für einen Hinweis]]></item>
 		<item name="wcf.acp.notice.isDisabled"><![CDATA[Hinweis deaktivieren]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 8d1a93535b5..258713f67e7 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1242,6 +1242,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.notice.add"><![CDATA[Add Notice]]></item>
 		<item name="wcf.acp.notice.cssClassName"><![CDATA[Appearance]]></item>
 		<item name="wcf.acp.notice.cssClassName.description"><![CDATA[You can select a predefined appearance or provide your own <abbr title="Cascading Style Sheets">CSS</abbr> class name.]]></item>
+		<item name="wcf.acp.notice.cssClassName.custom"><![CDATA[Custom CSS class]]></item>
 		<item name="wcf.acp.notice.cssClassName.error"><![CDATA[Error]]></item>
 		<item name="wcf.acp.notice.cssClassName.error.invalid"><![CDATA[The entered CSS class name is invalid.]]></item>
 		<item name="wcf.acp.notice.cssClassName.info"><![CDATA[Information]]></item>
@@ -1255,6 +1256,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the notice is displayed.]]></item>
 		<item name="wcf.acp.notice.conditions.user"><![CDATA[Active user]]></item>
 		<item name="wcf.acp.notice.conditions.user.description"><![CDATA[The active user has to fulfill the following conditions to view the notice.]]></item>
+		<item name="wcf.acp.notice.customCssClassName"><![CDATA[CSS class]]></item>
 		<item name="wcf.acp.notice.edit"><![CDATA[Edit Notice]]></item>
 		<item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
 		<item name="wcf.acp.notice.isDisabled"><![CDATA[Disable notice]]></item>
diff --git a/wcfsetup/setup/db/install_com.woltlab.wcf.php b/wcfsetup/setup/db/install_com.woltlab.wcf.php
index 945685fbd04..fb20cdbc084 100644
--- a/wcfsetup/setup/db/install_com.woltlab.wcf.php
+++ b/wcfsetup/setup/db/install_com.woltlab.wcf.php
@@ -2157,6 +2157,7 @@
                 ->defaultValue(0),
             DefaultFalseBooleanDatabaseTableColumn::create('isDisabled'),
             DefaultFalseBooleanDatabaseTableColumn::create('isDismissible'),
+            JsonDatabaseTableColumn::create('conditions'),
         ])
         ->indices([
             DatabaseTablePrimaryIndex::create()

From f21e90de7a787e37dcb021bfa4df41cdbd3aac64 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 13:30:28 +0200
Subject: [PATCH 16/47] Remove unused `IObjectFilter::testValue()`

---
 .../files/lib/system/object/filter/IObjectFilter.class.php  | 6 ------
 .../object/filter/user/UserAvatarObjectFilter.class.php     | 6 ------
 .../object/filter/user/UserLanguageObjectFilter.class.php   | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index ac83ab58420..6bdb6684630 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -40,10 +40,4 @@ public function summarizeValue(mixed $value): string;
      * @param TValueType $value
      */
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
-
-    /**
-     * @param TValueType $configuredValue
-     * @param mixed $value
-     */
-    public function testValue(mixed $configuredValue, mixed $value): bool;
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 50f4f7bff6d..93d23010901 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -62,12 +62,6 @@ public function summarizeValue(mixed $value): string
         return 'TODO: does not have an avatar';
     }
 
-    #[\Override]
-    public function testValue(mixed $configuredValue, mixed $value): bool
-    {
-        return (bool)$value;
-    }
-
     #[\Override]
     public function testUser(User $user, mixed $unserializedValue): bool
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index c7fcbb1a4ac..00a3cf0d040 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -60,12 +60,6 @@ public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed
         $conditions->add('languageID = ?', [$value]);
     }
 
-    #[\Override]
-    public function testValue(mixed $configuredValue, mixed $value): bool
-    {
-        return $configuredValue === $value;
-    }
-
     #[\Override]
     public function testUser(User $user, mixed $configuredValue): bool
     {

From 0803a732c1dcb63b51d69b923e557fa7c636c81e Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 13:50:39 +0200
Subject: [PATCH 17/47] Generalize object filters to arbitrary DatabaseObjects

---
 .../action/ObjectFilterBuilderAction.class.php |  3 +++
 .../ObjectFilterBuilderCollecting.class.php    |  6 ++++--
 .../field/ObjectFilterFormField.class.php      |  6 ++++++
 .../object/filter/IObjectFilter.class.php      |  8 ++++++++
 .../filter/ObjectFilterHandler.class.php       | 15 +++++++++------
 .../builder/IObjectFilterBuilder.class.php     |  6 +++++-
 .../NoticeObjectFilterBuilder.class.php        | 13 +++++++++++--
 ...roupAssignmentObjectFilterBuilder.class.php | 13 +++++++++++--
 .../filter/user/IUserObjectFilter.class.php    | 18 ------------------
 .../user/UserAvatarObjectFilter.class.php      | 14 ++++++++------
 .../user/UserLanguageObjectFilter.class.php    | 10 ++++++----
 11 files changed, 71 insertions(+), 41 deletions(-)
 delete mode 100644 wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php

diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index a66b156c110..ccf2c792b36 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -80,6 +80,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         }
     }
 
+    /**
+     * @param IObjectFilterBuilder<*> $builder
+     */
     private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
     {
         $form = new Psr15DialogForm(
diff --git a/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php b/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php
index 43f36bb95d5..70563567415 100644
--- a/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php
+++ b/wcfsetup/install/files/lib/event/object/filter/ObjectFilterBuilderCollecting.class.php
@@ -16,12 +16,14 @@
 final class ObjectFilterBuilderCollecting implements IPsr14Event
 {
     /**
-     * @var array<string, IObjectFilterBuilder>
+     * @var array<string, IObjectFilterBuilder<*>>
      */
     private array $builders = [];
 
     /**
      * Registers a new object filter builder.
+     *
+     * @param IObjectFilterBuilder<*> $builder
      */
     public function register(IObjectFilterBuilder $builder): void
     {
@@ -29,7 +31,7 @@ public function register(IObjectFilterBuilder $builder): void
     }
 
     /**
-     * @return array<string, IObjectFilterBuilder>
+     * @return array<string, IObjectFilterBuilder<*>>
      */
     public function getBuilders(): array
     {
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 190e0a1ee89..43aaa3f4efb 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -14,10 +14,15 @@ final class ObjectFilterFormField extends AbstractFormField
 {
     protected $templateName = 'shared_objectFilterFormField';
 
+    /**
+     * @var IObjectFilterBuilder<*>
+     */
     private IObjectFilterBuilder $builder;
 
     /**
      * Sets the builder that provides the available filters.
+     *
+     * @param IObjectFilterBuilder<*> $builder
      */
     public function builder(IObjectFilterBuilder $builder): static
     {
@@ -27,6 +32,7 @@ public function builder(IObjectFilterBuilder $builder): static
     }
 
     /**
+     * @return IObjectFilterBuilder<*>
      * @throws \BadMethodCallException if no builder has been set
      */
     public function getBuilder(): IObjectFilterBuilder
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 6bdb6684630..b4f67c56726 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -2,10 +2,12 @@
 
 namespace wcf\system\object\filter;
 
+use wcf\data\DatabaseObject;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\AbstractFormField;
 
 /**
+ * @template TDatabaseObject of DatabaseObject
  * @template TValueType of mixed
  */
 interface IObjectFilter
@@ -40,4 +42,10 @@ public function summarizeValue(mixed $value): string;
      * @param TValueType $value
      */
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
+
+    /**
+     * @param TDatabaseObject $object
+     * @param TValueType $configuredValue
+     */
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool;
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 602297f4f15..40187aa493e 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -5,16 +5,18 @@
 use CuyZ\Valinor\Mapper\MappingError;
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
-use wcf\data\user\User;
+use wcf\data\DatabaseObject;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
-use wcf\system\object\filter\user\IUserObjectFilter;
 use wcf\system\WCF;
 
+/**
+ * @template TDatabaseObject of DatabaseObject
+ */
 final class ObjectFilterHandler
 {
     /**
-     * @param list<IUserObjectFilter<mixed>> $filters
+     * @param list<IObjectFilter<TDatabaseObject, mixed>> $filters
      */
     public function __construct(
         private readonly array $filters,
@@ -75,9 +77,10 @@ public function applyFilters(PreparedStatementConditionBuilder $conditions, ?str
     }
 
     /**
+     * @param TDatabaseObject $object
      * @throws MappingError
      */
-    public function testUser(User $user, ?string $json): bool
+    public function testObject(DatabaseObject $object, ?string $json): bool
     {
         $values = $this->unserializeValues($json);
         if ($values === []) {
@@ -94,7 +97,7 @@ public function testUser(User $user, ?string $json): bool
             }
 
             $hasActiveFilters = true;
-            if (!$filter->testUser($user, $filter->unserializeValue($serializedValue))) {
+            if (!$filter->testObject($object, $filter->unserializeValue($serializedValue))) {
                 return false;
             }
         }
@@ -105,7 +108,7 @@ public function testUser(User $user, ?string $json): bool
     }
 
     /**
-     * @return array<string, IUserObjectFilter<mixed>>
+     * @return array<string, IObjectFilter<TDatabaseObject, mixed>>
      */
     private function getFiltersByIdentifier(): array
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
index a716fa9bdba..8fceaf9cb0c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -2,12 +2,16 @@
 
 namespace wcf\system\object\filter\builder;
 
+use wcf\data\DatabaseObject;
 use wcf\system\object\filter\IObjectFilter;
 
+/**
+ * @template TDatabaseObject of DatabaseObject
+ */
 interface IObjectFilterBuilder
 {
     /**
-     * @return list<IObjectFilter<mixed>>
+     * @return list<IObjectFilter<TDatabaseObject, mixed>>
      */
     public function getFilters(): array;
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index 4b24edbd679..486f3b820ea 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -10,13 +10,19 @@
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 use wcf\system\WCF;
 
+/**
+ * @implements IObjectFilterBuilder<User>
+ */
 final class NoticeObjectFilterBuilder implements IObjectFilterBuilder
 {
     /**
-     * @var list<IObjectFilter<mixed>>
+     * @var list<IObjectFilter<User, mixed>>
      */
     private readonly array $filters;
 
+    /**
+     * @var ObjectFilterHandler<User>
+     */
     private ObjectFilterHandler $handler;
 
     public function __construct()
@@ -56,9 +62,12 @@ public function testUser(Notice $notice, User $user): bool
             return true;
         }
 
-        return $this->getHandler()->testUser($user, $notice->conditions);
+        return $this->getHandler()->testObject($user, $notice->conditions);
     }
 
+    /**
+     * @return ObjectFilterHandler<User>
+     */
     private function getHandler(): ObjectFilterHandler
     {
         if (!isset($this->handler)) {
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index c319124056a..827742f636e 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -11,13 +11,19 @@
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 use wcf\system\WCF;
 
+/**
+ * @implements IObjectFilterBuilder<User>
+ */
 final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuilder
 {
     /**
-     * @var list<IObjectFilter<mixed>>
+     * @var list<IObjectFilter<User, mixed>>
      */
     private readonly array $filters;
 
+    /**
+     * @var ObjectFilterHandler<User>
+     */
     private ObjectFilterHandler $handler;
 
     public function __construct()
@@ -50,12 +56,15 @@ public function applyFilters(UserGroupAssignment $assignment, PreparedStatementC
 
     public function testUser(UserGroupAssignment $assignment, User $user): bool
     {
-        return $this->getHandler()->testUser(
+        return $this->getHandler()->testObject(
             $user,
             $assignment->conditions,
         );
     }
 
+    /**
+     * @return ObjectFilterHandler<User>
+     */
     private function getHandler(): ObjectFilterHandler
     {
         if (!isset($this->handler)) {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php
deleted file mode 100644
index b4031021ee8..00000000000
--- a/wcfsetup/install/files/lib/system/object/filter/user/IUserObjectFilter.class.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace wcf\system\object\filter\user;
-
-use wcf\data\user\User;
-use wcf\system\object\filter\IObjectFilter;
-
-/**
- * @template TValueType of mixed
- * @extends IObjectFilter<TValueType>
- */
-interface IUserObjectFilter extends IObjectFilter
-{
-    /**
-     * @param TValueType $configuredValue
-     */
-    public function testUser(User $user, mixed $configuredValue): bool;
-}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 93d23010901..96e3f272a7c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -2,14 +2,16 @@
 
 namespace wcf\system\object\filter\user;
 
+use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectFilter;
 
 /**
- * @implements IUserObjectFilter<bool>
+ * @implements IObjectFilter<User, bool>
  */
-final class UserAvatarObjectFilter implements IUserObjectFilter
+final class UserAvatarObjectFilter implements IObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -63,11 +65,11 @@ public function summarizeValue(mixed $value): string
     }
 
     #[\Override]
-    public function testUser(User $user, mixed $unserializedValue): bool
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
-        return match ($unserializedValue) {
-            true => $user->avatarFileID !== null,
-            false => $user->avatarFileID === null,
+        return match ($configuredValue) {
+            true => $object->avatarFileID !== null,
+            false => $object->avatarFileID === null,
         };
     }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index 00a3cf0d040..9e97ede6cfd 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -2,15 +2,17 @@
 
 namespace wcf\system\object\filter\user;
 
+use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\language\LanguageFactory;
+use wcf\system\object\filter\IObjectFilter;
 
 /**
- * @implements IUserObjectFilter<int>
+ * @implements IObjectFilter<User, int>
  */
-final class UserLanguageObjectFilter implements IUserObjectFilter
+final class UserLanguageObjectFilter implements IObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -61,8 +63,8 @@ public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed
     }
 
     #[\Override]
-    public function testUser(User $user, mixed $configuredValue): bool
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
-        return $user->languageID === $configuredValue;
+        return $object->languageID === $configuredValue;
     }
 }

From d0c4d2122d4d3142e840b524acb3aa920d0cc4b6 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 15:09:32 +0200
Subject: [PATCH 18/47] Split SQL-based filtering into IObjectListFilter /
 ObjectListFilterHandler

---
 .../object/filter/IObjectFilter.class.php     |  6 --
 .../object/filter/IObjectListFilter.class.php | 19 ++++++
 .../filter/ObjectFilterHandler.class.php      | 40 +------------
 .../filter/ObjectListFilterHandler.class.php  | 58 +++++++++++++++++++
 ...oupAssignmentObjectFilterBuilder.class.php | 19 +++---
 .../user/UserAvatarObjectFilter.class.php     |  6 +-
 .../user/UserLanguageObjectFilter.class.php   |  6 +-
 7 files changed, 97 insertions(+), 57 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php

diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index b4f67c56726..1176988dbeb 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -3,7 +3,6 @@
 namespace wcf\system\object\filter;
 
 use wcf\data\DatabaseObject;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\AbstractFormField;
 
 /**
@@ -38,11 +37,6 @@ public function unserializeValue(string $serializedValue): mixed;
      */
     public function summarizeValue(mixed $value): string;
 
-    /**
-     * @param TValueType $value
-     */
-    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
-
     /**
      * @param TDatabaseObject $object
      * @param TValueType $configuredValue
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
new file mode 100644
index 00000000000..13b0e4a8b45
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+
+/**
+ * @template TDatabaseObject of DatabaseObject
+ * @template TValueType of mixed
+ * @extends IObjectFilter<TDatabaseObject, TValueType>
+ */
+interface IObjectListFilter extends IObjectFilter
+{
+    /**
+     * @param TValueType $value
+     */
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 40187aa493e..60e87af437a 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -6,14 +6,13 @@
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
 use wcf\data\DatabaseObject;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\WCF;
 
 /**
  * @template TDatabaseObject of DatabaseObject
  */
-final class ObjectFilterHandler
+class ObjectFilterHandler
 {
     /**
      * @param list<IObjectFilter<TDatabaseObject, mixed>> $filters
@@ -43,39 +42,6 @@ public function getFormFields(): void
             ->required();
     }
 
-    /**
-     * @throws MappingError
-     */
-    public function applyFilters(PreparedStatementConditionBuilder $conditions, ?string $json): void
-    {
-        $values = $this->unserializeValues($json);
-        if ($values === []) {
-            $conditions->add('1=0');
-
-            return;
-        }
-
-        $filters = $this->getFiltersByIdentifier();
-
-        $hasActiveFilters = false;
-        foreach ($values as [$identifier, $serializedValue]) {
-            $filter = $filters[$identifier] ?? null;
-            if ($filter === null) {
-                continue;
-            }
-
-            $filter->applyFilter(
-                $conditions,
-                $filter->unserializeValue($serializedValue),
-            );
-            $hasActiveFilters = true;
-        }
-
-        if (!$hasActiveFilters) {
-            $conditions->add('1=0');
-        }
-    }
-
     /**
      * @param TDatabaseObject $object
      * @throws MappingError
@@ -110,7 +76,7 @@ public function testObject(DatabaseObject $object, ?string $json): bool
     /**
      * @return array<string, IObjectFilter<TDatabaseObject, mixed>>
      */
-    private function getFiltersByIdentifier(): array
+    protected function getFiltersByIdentifier(): array
     {
         $filters = [];
         foreach ($this->filters as $filter) {
@@ -124,7 +90,7 @@ private function getFiltersByIdentifier(): array
      * @return list<array{0: string, 1: string}>
      * @throws MappingError
      */
-    private function unserializeValues(?string $json): array
+    protected function unserializeValues(?string $json): array
     {
         if ($json === null) {
             return [];
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php
new file mode 100644
index 00000000000..5cb67ec0f9b
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use CuyZ\Valinor\Mapper\MappingError;
+use wcf\data\DatabaseObject;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+
+/**
+ * @template TDatabaseObject of DatabaseObject
+ * @extends ObjectFilterHandler<TDatabaseObject>
+ */
+final class ObjectListFilterHandler extends ObjectFilterHandler
+{
+    /**
+     * @param list<IObjectListFilter<TDatabaseObject, mixed>> $filters
+     */
+    public function __construct(
+        array $filters,
+    ) {
+        parent::__construct($filters);
+    }
+
+    /**
+     * @throws MappingError
+     */
+    public function applyFilters(PreparedStatementConditionBuilder $conditions, ?string $json): void
+    {
+        $values = $this->unserializeValues($json);
+        if ($values === []) {
+            $conditions->add('1=0');
+
+            return;
+        }
+
+        $filters = $this->getFiltersByIdentifier();
+
+        $hasActiveFilters = false;
+        foreach ($values as [$identifier, $serializedValue]) {
+            $filter = $filters[$identifier] ?? null;
+            if ($filter === null) {
+                continue;
+            }
+
+            \assert($filter instanceof IObjectListFilter);
+
+            $filter->applyFilter(
+                $conditions,
+                $filter->unserializeValue($serializedValue),
+            );
+            $hasActiveFilters = true;
+        }
+
+        if (!$hasActiveFilters) {
+            $conditions->add('1=0');
+        }
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 827742f636e..ce58bfde73c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -5,8 +5,8 @@
 use wcf\data\user\group\assignment\UserGroupAssignment;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\object\filter\IObjectFilter;
-use wcf\system\object\filter\ObjectFilterHandler;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\object\filter\ObjectListFilterHandler;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 use wcf\system\WCF;
@@ -17,14 +17,14 @@
 final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuilder
 {
     /**
-     * @var list<IObjectFilter<User, mixed>>
+     * @var list<IObjectListFilter<User, mixed>>
      */
     private readonly array $filters;
 
     /**
-     * @var ObjectFilterHandler<User>
+     * @var ObjectListFilterHandler<User>
      */
-    private ObjectFilterHandler $handler;
+    private ObjectListFilterHandler $handler;
 
     public function __construct()
     {
@@ -34,6 +34,9 @@ public function __construct()
         ];
     }
 
+    /**
+     * @return list<IObjectListFilter<User, mixed>>
+     */
     #[\Override]
     public function getFilters(): array
     {
@@ -63,12 +66,12 @@ public function testUser(UserGroupAssignment $assignment, User $user): bool
     }
 
     /**
-     * @return ObjectFilterHandler<User>
+     * @return ObjectListFilterHandler<User>
      */
-    private function getHandler(): ObjectFilterHandler
+    private function getHandler(): ObjectListFilterHandler
     {
         if (!isset($this->handler)) {
-            $this->handler = new ObjectFilterHandler($this->getFilters());
+            $this->handler = new ObjectListFilterHandler($this->getFilters());
         }
 
         return $this->handler;
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 96e3f272a7c..6c2ceeb9f31 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -6,12 +6,12 @@
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\BooleanFormField;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\IObjectListFilter;
 
 /**
- * @implements IObjectFilter<User, bool>
+ * @implements IObjectListFilter<User, bool>
  */
-final class UserAvatarObjectFilter implements IObjectFilter
+final class UserAvatarObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index 9e97ede6cfd..f78dc79578e 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -7,12 +7,12 @@
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\language\LanguageFactory;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\IObjectListFilter;
 
 /**
- * @implements IObjectFilter<User, int>
+ * @implements IObjectListFilter<User, int>
  */
-final class UserLanguageObjectFilter implements IObjectFilter
+final class UserLanguageObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string

From 5c51d9842dc6912104177e5879e9992f76ad1fa0 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 15:43:17 +0200
Subject: [PATCH 19/47] Extract shared filter/handler caching into
 AbstractObjectFilterBuilder

---
 .../AbstractObjectFilterBuilder.class.php     | 62 +++++++++++++++++++
 .../NoticeObjectFilterBuilder.class.php       | 35 +++--------
 ...oupAssignmentObjectFilterBuilder.class.php | 51 +++++----------
 3 files changed, 83 insertions(+), 65 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php

diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php
new file mode 100644
index 00000000000..94f415b5473
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace wcf\system\object\filter\builder;
+
+use wcf\data\DatabaseObject;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\ObjectFilterHandler;
+
+/**
+ * @template TDatabaseObject of DatabaseObject
+ * @template TFilter of IObjectFilter<TDatabaseObject, mixed>
+ * @template THandler of ObjectFilterHandler<TDatabaseObject>
+ * @implements IObjectFilterBuilder<TDatabaseObject>
+ */
+abstract class AbstractObjectFilterBuilder implements IObjectFilterBuilder
+{
+    /**
+     * @var list<TFilter>
+     */
+    private array $filters;
+
+    /**
+     * @var THandler
+     */
+    private ObjectFilterHandler $handler;
+
+    /**
+     * @return list<TFilter>
+     */
+    abstract protected function createFilters(): array;
+
+    /**
+     * @param list<TFilter> $filters
+     * @return THandler
+     */
+    abstract protected function createHandler(array $filters): ObjectFilterHandler;
+
+    /**
+     * @return list<TFilter>
+     */
+    #[\Override]
+    public function getFilters(): array
+    {
+        if (!isset($this->filters)) {
+            $this->filters = $this->createFilters();
+        }
+
+        return $this->filters;
+    }
+
+    /**
+     * @return THandler
+     */
+    protected function getHandler(): ObjectFilterHandler
+    {
+        if (!isset($this->handler)) {
+            $this->handler = $this->createHandler($this->getFilters());
+        }
+
+        return $this->handler;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index 486f3b820ea..6ae7a8c7ab7 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -11,32 +11,23 @@
 use wcf\system\WCF;
 
 /**
- * @implements IObjectFilterBuilder<User>
+ * @extends AbstractObjectFilterBuilder<User, IObjectFilter<User, mixed>, ObjectFilterHandler<User>>
  */
-final class NoticeObjectFilterBuilder implements IObjectFilterBuilder
+final class NoticeObjectFilterBuilder extends AbstractObjectFilterBuilder
 {
-    /**
-     * @var list<IObjectFilter<User, mixed>>
-     */
-    private readonly array $filters;
-
-    /**
-     * @var ObjectFilterHandler<User>
-     */
-    private ObjectFilterHandler $handler;
-
-    public function __construct()
+    #[\Override]
+    protected function createFilters(): array
     {
-        $this->filters = [
+        return [
             new UserAvatarObjectFilter(),
             new UserLanguageObjectFilter(),
         ];
     }
 
     #[\Override]
-    public function getFilters(): array
+    protected function createHandler(array $filters): ObjectFilterHandler
     {
-        return $this->filters;
+        return new ObjectFilterHandler($filters);
     }
 
     #[\Override]
@@ -64,16 +55,4 @@ public function testUser(Notice $notice, User $user): bool
 
         return $this->getHandler()->testObject($user, $notice->conditions);
     }
-
-    /**
-     * @return ObjectFilterHandler<User>
-     */
-    private function getHandler(): ObjectFilterHandler
-    {
-        if (!isset($this->handler)) {
-            $this->handler = new ObjectFilterHandler($this->getFilters());
-        }
-
-        return $this->handler;
-    }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index ce58bfde73c..7dbfe09c0c0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -6,41 +6,30 @@
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\ObjectListFilterHandler;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
 use wcf\system\WCF;
 
 /**
- * @implements IObjectFilterBuilder<User>
+ * @extends AbstractObjectFilterBuilder<User, IObjectListFilter<User, mixed>, ObjectListFilterHandler<User>>
  */
-final class UserGroupAssignmentObjectFilterBuilder implements IObjectFilterBuilder
+final class UserGroupAssignmentObjectFilterBuilder extends AbstractObjectFilterBuilder
 {
-    /**
-     * @var list<IObjectListFilter<User, mixed>>
-     */
-    private readonly array $filters;
-
-    /**
-     * @var ObjectListFilterHandler<User>
-     */
-    private ObjectListFilterHandler $handler;
-
-    public function __construct()
+    #[\Override]
+    protected function createFilters(): array
     {
-        $this->filters = [
+        return [
             new UserAvatarObjectFilter(),
             new UserLanguageObjectFilter(),
         ];
     }
 
-    /**
-     * @return list<IObjectListFilter<User, mixed>>
-     */
     #[\Override]
-    public function getFilters(): array
+    protected function createHandler(array $filters): ObjectFilterHandler
     {
-        return $this->filters;
+        return new ObjectListFilterHandler($filters);
     }
 
     #[\Override]
@@ -49,6 +38,12 @@ public function getIdentifier(): string
         return 'com.woltlab.wcf.userGroupAssignment';
     }
 
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return WCF::getSession()->hasPermission('admin.user.canManageGroupAssignment');
+    }
+
     public function applyFilters(UserGroupAssignment $assignment, PreparedStatementConditionBuilder $conditions): void
     {
         $this->getHandler()->applyFilters(
@@ -64,22 +59,4 @@ public function testUser(UserGroupAssignment $assignment, User $user): bool
             $assignment->conditions,
         );
     }
-
-    /**
-     * @return ObjectListFilterHandler<User>
-     */
-    private function getHandler(): ObjectListFilterHandler
-    {
-        if (!isset($this->handler)) {
-            $this->handler = new ObjectListFilterHandler($this->getFilters());
-        }
-
-        return $this->handler;
-    }
-
-    #[\Override]
-    public function isAccessible(): bool
-    {
-        return WCF::getSession()->hasPermission('admin.user.canManageGroupAssignment');
-    }
 }

From 7698e4e0d9088193919c9480432c3dc2a814d0b0 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 15:53:49 +0200
Subject: [PATCH 20/47] Document object filter builder classes

---
 .../AbstractObjectFilterBuilder.class.php     | 17 ++++++++++++++++
 .../builder/IObjectFilterBuilder.class.php    | 17 +++++++++++++++-
 .../NoticeObjectFilterBuilder.class.php       |  8 ++++++++
 ...oupAssignmentObjectFilterBuilder.class.php | 20 +++++++++++++++++++
 4 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php
index 94f415b5473..f20e5b4289e 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/AbstractObjectFilterBuilder.class.php
@@ -7,6 +7,14 @@
 use wcf\system\object\filter\ObjectFilterHandler;
 
 /**
+ * Default implementation of an object filter builder that lazily creates its
+ * filters and the handler that evaluates the stored filter values.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  * @template TFilter of IObjectFilter<TDatabaseObject, mixed>
  * @template THandler of ObjectFilterHandler<TDatabaseObject>
@@ -25,11 +33,18 @@ abstract class AbstractObjectFilterBuilder implements IObjectFilterBuilder
     private ObjectFilterHandler $handler;
 
     /**
+     * Creates the filters that are available for this builder. This method is
+     * called at most once, the result is cached by `getFilters()`.
+     *
      * @return list<TFilter>
      */
     abstract protected function createFilters(): array;
 
     /**
+     * Creates the handler that evaluates the stored filter values using the
+     * given filters. This method is called at most once, the result is cached
+     * by `getHandler()`.
+     *
      * @param list<TFilter> $filters
      * @return THandler
      */
@@ -49,6 +64,8 @@ public function getFilters(): array
     }
 
     /**
+     * Returns the handler that evaluates the stored filter values.
+     *
      * @return THandler
      */
     protected function getHandler(): ObjectFilterHandler
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
index 8fceaf9cb0c..e68b36474f0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -6,16 +6,31 @@
 use wcf\system\object\filter\IObjectFilter;
 
 /**
+ * Provides the set of filters that can be configured for a specific use case,
+ * e.g. the conditions of notices or automatic user group assignments.
+ *
+ * Builders are registered through the `ObjectFilterBuilderCollecting` event
+ * and are addressed by their identifier when the filter dialog is requested.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  */
 interface IObjectFilterBuilder
 {
     /**
+     * Returns the filters that are available for this builder.
+     *
      * @return list<IObjectFilter<TDatabaseObject, mixed>>
      */
     public function getFilters(): array;
 
-    // `com.woltlab.wcf.userGroupAssignment`
+    /**
+     * Returns the unique identifier of this builder, e.g. `com.woltlab.wcf.userGroupAssignment`.
+     */
     public function getIdentifier(): string;
 
     /**
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index 6ae7a8c7ab7..3f2f76a4ded 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -11,6 +11,14 @@
 use wcf\system\WCF;
 
 /**
+ * Provides the filters for the conditions of notices, controlling which users
+ * a notice is shown to.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @extends AbstractObjectFilterBuilder<User, IObjectFilter<User, mixed>, ObjectFilterHandler<User>>
  */
 final class NoticeObjectFilterBuilder extends AbstractObjectFilterBuilder
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 7dbfe09c0c0..b06f9d4a643 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -13,6 +13,16 @@
 use wcf\system\WCF;
 
 /**
+ * Provides the filters for the conditions of automatic user group assignments.
+ *
+ * The filters can be evaluated against a single user or applied to the
+ * conditions of a user list to find all matching users at once.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @extends AbstractObjectFilterBuilder<User, IObjectListFilter<User, mixed>, ObjectListFilterHandler<User>>
  */
 final class UserGroupAssignmentObjectFilterBuilder extends AbstractObjectFilterBuilder
@@ -44,6 +54,11 @@ public function isAccessible(): bool
         return WCF::getSession()->hasPermission('admin.user.canManageGroupAssignment');
     }
 
+    /**
+     * Adds the filters of the assignment to the given conditions of a user list.
+     *
+     * An assignment without any active filters matches no users.
+     */
     public function applyFilters(UserGroupAssignment $assignment, PreparedStatementConditionBuilder $conditions): void
     {
         $this->getHandler()->applyFilters(
@@ -52,6 +67,11 @@ public function applyFilters(UserGroupAssignment $assignment, PreparedStatementC
         );
     }
 
+    /**
+     * Returns whether the given user matches the filters of the assignment.
+     *
+     * An assignment without any active filters matches no users.
+     */
     public function testUser(UserGroupAssignment $assignment, User $user): bool
     {
         return $this->getHandler()->testObject(

From 20cff89ec5f1cb2cfde072d49ae88ed75fdc3188 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 16:10:05 +0200
Subject: [PATCH 21/47] Document object filter handlers, form field and
 client-side builder

---
 .../Core/Component/Object/Filter/Builder.ts   | 40 +++++++++++++++++++
 .../Core/Component/Object/Filter/Builder.js   | 33 +++++++++++++++
 .../ObjectFilterBuilderAction.class.php       | 16 ++++++++
 .../field/ObjectFilterFormField.class.php     | 28 ++++++++++++-
 .../object/filter/IObjectFilter.class.php     | 28 ++++++++++++-
 .../object/filter/IObjectListFilter.class.php | 11 +++++
 .../filter/ObjectFilterHandler.class.php      | 25 +++++++++++-
 .../filter/ObjectListFilterHandler.class.php  | 16 +++++++-
 .../builder/IObjectFilterBuilder.class.php    |  2 +-
 ...oupAssignmentObjectFilterBuilder.class.php |  2 +-
 .../user/UserAvatarObjectFilter.class.php     |  7 ++++
 .../user/UserLanguageObjectFilter.class.php   |  7 ++++
 12 files changed, 207 insertions(+), 8 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index 553a6c5c315..c88a062de78 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -1,13 +1,30 @@
+/**
+ * Manages the list of configured object filters of an `ObjectFilterFormField`.
+ * New filters are configured through a dialog, the resulting list is written
+ * into a hidden input field when the form is submitted.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
 import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
 import { dialogFactory } from "../../Dialog";
 import { getPhrase } from "WoltLabSuite/Core/Language";
 
+/**
+ * The filter returned by the dialog after it has been submitted.
+ */
 type Response = {
   identifier: string;
   summary: string;
   value: string;
 };
 
+/**
+ * A filter that has already been configured.
+ */
 type Filter = {
   identifier: string;
   summary: string;
@@ -53,12 +70,18 @@ class ObjectFilterBuilder {
     this.#fromSerializedData(values);
   }
 
+  /**
+   * Restores the filters that were configured before.
+   */
   #fromSerializedData(values: SerializedData): void {
     for (const filter of values) {
       this.#createCondition(filter);
     }
   }
 
+  /**
+   * Opens the dialog to configure a new filter and adds it to the list.
+   */
   async #addFilter(): Promise<void> {
     const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(this.#endpoint);
     if (response.ok) {
@@ -66,6 +89,9 @@ class ObjectFilterBuilder {
     }
   }
 
+  /**
+   * Adds the given filter to the list, showing its summary and a button to remove it.
+   */
   #createCondition(data: Response): void {
     const item = document.createElement("div");
     item.textContent = data.summary;
@@ -86,11 +112,18 @@ class ObjectFilterBuilder {
     this.#conditions.set(item, data);
   }
 
+  /**
+   * Removes the given filter from the list.
+   */
   #deleteCondition(element: HTMLElement): void {
     element.remove();
     this.#conditions.delete(element);
   }
 
+  /**
+   * Serializes the configured filters as a JSON-encoded list of
+   * `[filterIdentifier, serializedValue]` pairs.
+   */
   #serializeConditions(): string {
     const values: [string, string][] = [];
     this.#conditions.forEach((condition) => {
@@ -101,6 +134,13 @@ class ObjectFilterBuilder {
   }
 }
 
+/**
+ * Initializes the filter builder for the given container.
+ *
+ * @param container element that holds the list of configured filters, its id is used as the name of the submitted value
+ * @param endpoint URL of the dialog to configure a new filter
+ * @param values filters that were configured before
+ */
 export function setup(container: HTMLElement, endpoint: string, values: SerializedData): void {
   new ObjectFilterBuilder(container, endpoint, values);
 }
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 610f75a7b34..dfdfd2777bd 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -1,3 +1,13 @@
+/**
+ * Manages the list of configured object filters of an `ObjectFilterFormField`.
+ * New filters are configured through a dialog, the resulting list is written
+ * into a hidden input field when the form is submitted.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
 define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Dialog", "WoltLabSuite/Core/Language"], function (require, exports, PromiseMutex_1, Dialog_1, Language_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -28,17 +38,26 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             });
             this.#fromSerializedData(values);
         }
+        /**
+         * Restores the filters that were configured before.
+         */
         #fromSerializedData(values) {
             for (const filter of values) {
                 this.#createCondition(filter);
             }
         }
+        /**
+         * Opens the dialog to configure a new filter and adds it to the list.
+         */
         async #addFilter() {
             const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(this.#endpoint);
             if (response.ok) {
                 this.#createCondition(response.result);
             }
         }
+        /**
+         * Adds the given filter to the list, showing its summary and a button to remove it.
+         */
         #createCondition(data) {
             const item = document.createElement("div");
             item.textContent = data.summary;
@@ -54,10 +73,17 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             this.#container.append(item);
             this.#conditions.set(item, data);
         }
+        /**
+         * Removes the given filter from the list.
+         */
         #deleteCondition(element) {
             element.remove();
             this.#conditions.delete(element);
         }
+        /**
+         * Serializes the configured filters as a JSON-encoded list of
+         * `[filterIdentifier, serializedValue]` pairs.
+         */
         #serializeConditions() {
             const values = [];
             this.#conditions.forEach((condition) => {
@@ -66,6 +92,13 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             return JSON.stringify(values);
         }
     }
+    /**
+     * Initializes the filter builder for the given container.
+     *
+     * @param container element that holds the list of configured filters, its id is used as the name of the submitted value
+     * @param endpoint URL of the dialog to configure a new filter
+     * @param values filters that were configured before
+     */
     function setup(container, endpoint, values) {
         new ObjectFilterBuilder(container, endpoint, values);
     }
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index ccf2c792b36..d115ad0058a 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -17,6 +17,19 @@
 use wcf\system\form\builder\Psr15DialogForm;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
 
+/**
+ * Provides the dialog to configure a single filter of an object filter builder.
+ *
+ * The builder is selected through the `identifier` query parameter. A GET
+ * request returns the dialog, a POST request validates it and responds with
+ * the identifier of the chosen filter, a human-readable summary and the
+ * serialized value of the filter.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
 final class ObjectFilterBuilderAction implements RequestHandlerInterface
 {
     #[\Override]
@@ -81,6 +94,9 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     }
 
     /**
+     * Builds the dialog that offers a selection of the available filters.
+     * The form field of each filter is only shown while it is selected.
+     *
      * @param IObjectFilterBuilder<*> $builder
      */
     private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 43aaa3f4efb..1760ac29adc 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -10,6 +10,17 @@
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
 use wcf\system\request\LinkHandler;
 
+/**
+ * Form field to configure a list of object filters provided by an object filter builder.
+ *
+ * The value is stored as a JSON-encoded list of `[filterIdentifier, serializedValue]`
+ * pairs, which is the format expected by `ObjectFilterHandler`.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
 final class ObjectFilterFormField extends AbstractFormField
 {
     protected $templateName = 'shared_objectFilterFormField';
@@ -32,6 +43,8 @@ public function builder(IObjectFilterBuilder $builder): static
     }
 
     /**
+     * Returns the builder that provides the available filters.
+     *
      * @return IObjectFilterBuilder<*>
      * @throws \BadMethodCallException if no builder has been set
      */
@@ -74,6 +87,13 @@ public function validate(): void
         }
     }
 
+    /**
+     * Returns the configured filters as JSON for the client-side filter builder.
+     * Each filter consists of its identifier, a human-readable summary and the
+     * serialized value.
+     *
+     * @throws MappingError if the value of this field is malformed
+     */
     public function toJson(): string
     {
         return \json_encode(
@@ -82,6 +102,9 @@ public function toJson(): string
         );
     }
 
+    /**
+     * Returns the URL of the dialog that is used to add a new filter.
+     */
     public function getEndpoint(): string
     {
         return LinkHandler::getInstance()->getControllerLink(
@@ -93,12 +116,15 @@ public function getEndpoint(): string
     }
 
     /**
+     * Decodes the given value and enriches each filter with a human-readable
+     * summary. Values of unknown filters are ignored.
+     *
      * @return list<array{
      *  identifier: string,
      *  summary: string,
      *  value: string,
      * }>
-     * @throws MappingError
+     * @throws MappingError if the given value is malformed
      */
     private function unserializeFilters(?string $json): array
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 1176988dbeb..3fe21a7da96 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -6,14 +6,30 @@
 use wcf\system\form\builder\field\AbstractFormField;
 
 /**
+ * Represents a single condition that can be configured for an object filter
+ * and tested against individual objects.
+ *
+ * The configured value is stored in its serialized form and converted back
+ * into its native type before being evaluated.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  * @template TValueType of mixed
  */
 interface IObjectFilter
 {
-    // `com.woltlab.wcf.username`
+    /**
+     * Returns the unique identifier of this filter, e.g. `com.woltlab.wcf.username`.
+     */
     public function getIdentifier(): string;
 
+    /**
+     * Returns the title of this filter that is shown when selecting a filter.
+     */
     public function getTitle(): string;
 
     /**
@@ -22,22 +38,30 @@ public function getTitle(): string;
     public function getFormField(): AbstractFormField;
 
     /**
+     * Converts the given value into its string representation for storage.
+     *
      * @param TValueType $value
      */
     public function serializeValue(mixed $value): string;
 
     /**
+     * Restores the value from its string representation created by `serializeValue()`.
+     *
      * @return TValueType
      */
     public function unserializeValue(string $serializedValue): mixed;
 
-    // "In user group <strong>%s</strong>"
     /**
+     * Returns a human-readable summary of the configured value,
+     * e.g. "In user group <strong>%s</strong>".
+     *
      * @param TValueType $value
      */
     public function summarizeValue(mixed $value): string;
 
     /**
+     * Returns whether the given object matches the configured value.
+     *
      * @param TDatabaseObject $object
      * @param TValueType $configuredValue
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
index 13b0e4a8b45..db2c81fdea6 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectListFilter.class.php
@@ -6,6 +6,14 @@
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
+ * Object filter that can additionally be expressed as an SQL condition,
+ * allowing the filter to be applied to an entire object list at once.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  * @template TValueType of mixed
  * @extends IObjectFilter<TDatabaseObject, TValueType>
@@ -13,6 +21,9 @@
 interface IObjectListFilter extends IObjectFilter
 {
     /**
+     * Adds the SQL condition that matches the objects satisfying the given
+     * value to the conditions of an object list.
+     *
      * @param TValueType $value
      */
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void;
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 60e87af437a..16c2fd71121 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -10,6 +10,17 @@
 use wcf\system\WCF;
 
 /**
+ * Evaluates the stored filter values against individual objects.
+ *
+ * The filter values are stored as a JSON-encoded list of
+ * `[filterIdentifier, serializedValue]` pairs. An object matches only if it
+ * satisfies all filters (logical AND).
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  */
 class ObjectFilterHandler
@@ -43,8 +54,13 @@ public function getFormFields(): void
     }
 
     /**
+     * Returns whether the given object satisfies all stored filter values.
+     * Values of unknown filters are ignored.
+     *
+     * Returns false if there are no active filters.
+     *
      * @param TDatabaseObject $object
-     * @throws MappingError
+     * @throws MappingError if the stored filter values are malformed
      */
     public function testObject(DatabaseObject $object, ?string $json): bool
     {
@@ -74,6 +90,8 @@ public function testObject(DatabaseObject $object, ?string $json): bool
     }
 
     /**
+     * Returns the available filters indexed by their identifier.
+     *
      * @return array<string, IObjectFilter<TDatabaseObject, mixed>>
      */
     protected function getFiltersByIdentifier(): array
@@ -87,8 +105,11 @@ protected function getFiltersByIdentifier(): array
     }
 
     /**
+     * Decodes the stored filter values into a list of
+     * `[filterIdentifier, serializedValue]` pairs.
+     *
      * @return list<array{0: string, 1: string}>
-     * @throws MappingError
+     * @throws MappingError if the stored filter values are malformed
      */
     protected function unserializeValues(?string $json): array
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php
index 5cb67ec0f9b..11bc4d04067 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectListFilterHandler.class.php
@@ -7,6 +7,15 @@
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 
 /**
+ * Evaluates stored filter values that consist exclusively of list filters,
+ * allowing them to be applied to the conditions of an object list in
+ * addition to testing individual objects.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @template TDatabaseObject of DatabaseObject
  * @extends ObjectFilterHandler<TDatabaseObject>
  */
@@ -22,7 +31,12 @@ public function __construct(
     }
 
     /**
-     * @throws MappingError
+     * Adds the SQL conditions of all stored filter values to the given
+     * conditions of an object list. Values of unknown filters are ignored.
+     *
+     * Adds a condition that matches no objects if there are no active filters.
+     *
+     * @throws MappingError if the stored filter values are malformed
      */
     public function applyFilters(PreparedStatementConditionBuilder $conditions, ?string $json): void
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
index e68b36474f0..5647d89c18d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/IObjectFilterBuilder.class.php
@@ -12,7 +12,7 @@
  * Builders are registered through the `ObjectFilterBuilderCollecting` event
  * and are addressed by their identifier when the filter dialog is requested.
  *
- * @author      Marcel Werk
+ * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index b06f9d4a643..75bc3dd4abe 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -18,7 +18,7 @@
  * The filters can be evaluated against a single user or applied to the
  * conditions of a user list to find all matching users at once.
  *
- * @author      Marcel Werk
+ * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 6c2ceeb9f31..a11d08436ba 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -9,6 +9,13 @@
 use wcf\system\object\filter\IObjectListFilter;
 
 /**
+ * Filters users by whether they have an avatar.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @implements IObjectListFilter<User, bool>
  */
 final class UserAvatarObjectFilter implements IObjectListFilter
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index f78dc79578e..b636aa62214 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -10,6 +10,13 @@
 use wcf\system\object\filter\IObjectListFilter;
 
 /**
+ * Filters users by their interface language. The value is the id of the language.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
  * @implements IObjectListFilter<User, int>
  */
 final class UserLanguageObjectFilter implements IObjectListFilter

From 4ab366bf7ec37a69bfd6214c45b3d6c996cefbac Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 25 Sep 2026 16:27:45 +0200
Subject: [PATCH 22/47] Make notice and user group assignment filters
 extensible via PSR-14 events

---
 .../NoticeObjectFilterCollecting.class.php    | 41 +++++++++++++++++
 ...AssignmentObjectFilterCollecting.class.php | 45 +++++++++++++++++++
 .../NoticeObjectFilterBuilder.class.php       | 13 ++++--
 ...oupAssignmentObjectFilterBuilder.class.php | 13 ++++--
 4 files changed, 104 insertions(+), 8 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/event/notice/NoticeObjectFilterCollecting.class.php
 create mode 100644 wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentObjectFilterCollecting.class.php

diff --git a/wcfsetup/install/files/lib/event/notice/NoticeObjectFilterCollecting.class.php b/wcfsetup/install/files/lib/event/notice/NoticeObjectFilterCollecting.class.php
new file mode 100644
index 00000000000..78598445542
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/notice/NoticeObjectFilterCollecting.class.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace wcf\event\notice;
+
+use wcf\data\user\User;
+use wcf\event\IPsr14Event;
+use wcf\system\object\filter\IObjectFilter;
+
+/**
+ * Requests the collection of the filters that are available for the conditions of notices.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class NoticeObjectFilterCollecting implements IPsr14Event
+{
+    /**
+     * @var array<string, IObjectFilter<User, mixed>>
+     */
+    private array $filters = [];
+
+    /**
+     * Registers a new filter. An existing filter with the same identifier is replaced.
+     *
+     * @param IObjectFilter<User, mixed> $filter
+     */
+    public function register(IObjectFilter $filter): void
+    {
+        $this->filters[$filter->getIdentifier()] = $filter;
+    }
+
+    /**
+     * @return list<IObjectFilter<User, mixed>>
+     */
+    public function getFilters(): array
+    {
+        return \array_values($this->filters);
+    }
+}
diff --git a/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentObjectFilterCollecting.class.php b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentObjectFilterCollecting.class.php
new file mode 100644
index 00000000000..c1b50a270a2
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/user/group/assignment/UserGroupAssignmentObjectFilterCollecting.class.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace wcf\event\user\group\assignment;
+
+use wcf\data\user\User;
+use wcf\event\IPsr14Event;
+use wcf\system\object\filter\IObjectListFilter;
+
+/**
+ * Requests the collection of the filters that are available for the conditions
+ * of automatic user group assignments.
+ *
+ * Only list filters are supported because the assignments are also applied to
+ * the conditions of a user list.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UserGroupAssignmentObjectFilterCollecting implements IPsr14Event
+{
+    /**
+     * @var array<string, IObjectListFilter<User, mixed>>
+     */
+    private array $filters = [];
+
+    /**
+     * Registers a new filter. An existing filter with the same identifier is replaced.
+     *
+     * @param IObjectListFilter<User, mixed> $filter
+     */
+    public function register(IObjectListFilter $filter): void
+    {
+        $this->filters[$filter->getIdentifier()] = $filter;
+    }
+
+    /**
+     * @return list<IObjectListFilter<User, mixed>>
+     */
+    public function getFilters(): array
+    {
+        return \array_values($this->filters);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index 3f2f76a4ded..c67bf428833 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -4,6 +4,8 @@
 
 use wcf\data\notice\Notice;
 use wcf\data\user\User;
+use wcf\event\notice\NoticeObjectFilterCollecting;
+use wcf\system\event\EventHandler;
 use wcf\system\object\filter\IObjectFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
@@ -26,10 +28,13 @@ final class NoticeObjectFilterBuilder extends AbstractObjectFilterBuilder
     #[\Override]
     protected function createFilters(): array
     {
-        return [
-            new UserAvatarObjectFilter(),
-            new UserLanguageObjectFilter(),
-        ];
+        $event = new NoticeObjectFilterCollecting();
+        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserLanguageObjectFilter());
+
+        EventHandler::getInstance()->fire($event);
+
+        return $event->getFilters();
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 75bc3dd4abe..74261ab5ed4 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -4,7 +4,9 @@
 
 use wcf\data\user\group\assignment\UserGroupAssignment;
 use wcf\data\user\User;
+use wcf\event\user\group\assignment\UserGroupAssignmentObjectFilterCollecting;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\event\EventHandler;
 use wcf\system\object\filter\IObjectListFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\ObjectListFilterHandler;
@@ -30,10 +32,13 @@ final class UserGroupAssignmentObjectFilterBuilder extends AbstractObjectFilterB
     #[\Override]
     protected function createFilters(): array
     {
-        return [
-            new UserAvatarObjectFilter(),
-            new UserLanguageObjectFilter(),
-        ];
+        $event = new UserGroupAssignmentObjectFilterCollecting();
+        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserLanguageObjectFilter());
+
+        EventHandler::getInstance()->fire($event);
+
+        return $event->getFilters();
     }
 
     #[\Override]

From 13d635c8464f79484926ea39296f4337fdf38b5e Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 11:48:17 +0200
Subject: [PATCH 23/47] Validate numeric range bounds against number format,
 minimum and maximum

---
 .../field/NumericRangeFormField.class.php     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
index 40d19489974..805eff88dba 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
@@ -80,9 +80,57 @@ public function validate()
     {
         if ($this->isRequired() && ($this->getFromValue() === '' || $this->getToValue() === '')) {
             $this->addValidationError(new FormFieldValidationError('empty'));
+
+            return;
+        }
+
+        foreach ([$this->getFromValue(), $this->getToValue()] as $value) {
+            if ($value === '') {
+                continue;
+            }
+
+            $error = $this->validateBound($value);
+            if ($error !== null) {
+                $this->addValidationError($error);
+
+                return;
+            }
         }
     }
 
+    /**
+     * Returns the validation error for the given lower or upper bound or `null`
+     * if the bound is a valid number within the minimum and maximum.
+     */
+    private function validateBound(string $value): ?FormFieldValidationError
+    {
+        $isValid = $this->integerValues ? \preg_match('~^-?\d+$~', $value) === 1 : \is_numeric($value);
+        if (!$isValid) {
+            return new FormFieldValidationError(
+                'invalid',
+                'wcf.form.field.numeric.error.invalid'
+            );
+        }
+
+        if ($this->getMinimum() !== null && $value < $this->getMinimum()) {
+            return new FormFieldValidationError(
+                'minimum',
+                'wcf.form.field.numeric.error.minimum',
+                ['minimum' => $this->getMinimum()]
+            );
+        }
+
+        if ($this->getMaximum() !== null && $value > $this->getMaximum()) {
+            return new FormFieldValidationError(
+                'maximum',
+                'wcf.form.field.numeric.error.maximum',
+                ['maximum' => $this->getMaximum()]
+            );
+        }
+
+        return null;
+    }
+
     #[\Override]
     public function value(mixed $value)
     {

From 733a223f37dd93c185efa58327479d12fb1acb1c Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 11:50:09 +0200
Subject: [PATCH 24/47] Port old conditions to new API

---
 .../Core/Component/Object/Filter/Builder.ts   |   2 +-
 .../Core/Component/Object/Filter/Builder.js   |   2 +-
 .../ObjectFilterBuilderAction.class.php       |   7 +-
 .../object/filter/IObjectFilter.class.php     |   3 +
 .../filter/TRangeObjectFilter.class.php       |  63 +++++++
 .../NoticeObjectFilterBuilder.class.php       |  40 ++++-
 ...oupAssignmentObjectFilterBuilder.class.php |  28 +++-
 .../date/DaysOfWeekObjectFilter.class.php     |  96 +++++++++++
 .../NotRequestedPageObjectFilter.class.php    |  81 +++++++++
 .../page/RequestedPageObjectFilter.class.php  | 101 +++++++++++
 .../user/UserActivatedObjectFilter.class.php  |  84 ++++++++++
 .../user/UserAvatarObjectFilter.class.php     |  13 +-
 .../user/UserBannedObjectFilter.class.php     |  84 ++++++++++
 .../user/UserBirthdayObjectFilter.class.php   |  81 +++++++++
 .../UserEmailConfirmedObjectFilter.class.php  |  84 ++++++++++
 .../user/UserEmailObjectFilter.class.php      |  82 +++++++++
 .../user/UserGroupObjectFilter.class.php      | 113 +++++++++++++
 .../UserIntegerPropertyObjectFilter.class.php | 126 ++++++++++++++
 .../user/UserLanguageObjectFilter.class.php   |  50 ++++--
 .../UserMobileBrowserObjectFilter.class.php   |  73 ++++++++
 .../UserMultifactorObjectFilter.class.php     |  84 ++++++++++
 .../user/UserNoTrophyObjectFilter.class.php   |  84 ++++++++++
 .../user/UserNotInGroupObjectFilter.class.php |  91 ++++++++++
 ...UserRegistrationDateObjectFilter.class.php | 158 ++++++++++++++++++
 ...UserRegistrationDaysObjectFilter.class.php | 115 +++++++++++++
 .../user/UserTrophyObjectFilter.class.php     | 128 ++++++++++++++
 .../user/UserUsernameObjectFilter.class.php   |  82 +++++++++
 wcfsetup/install/lang/de.xml                  |  52 ++++++
 wcfsetup/install/lang/en.xml                  |  52 ++++++
 29 files changed, 2032 insertions(+), 27 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index c88a062de78..acf8fb535f9 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -94,7 +94,7 @@ class ObjectFilterBuilder {
    */
   #createCondition(data: Response): void {
     const item = document.createElement("div");
-    item.textContent = data.summary;
+    item.innerHTML = data.summary;
 
     const deleteButton = document.createElement("button");
     deleteButton.type = "button";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index dfdfd2777bd..30791dc6460 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -60,7 +60,7 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
          */
         #createCondition(data) {
             const item = document.createElement("div");
-            item.textContent = data.summary;
+            item.innerHTML = data.summary;
             const deleteButton = document.createElement("button");
             deleteButton.type = "button";
             deleteButton.classList.add("button", "small", "jsTooltip");
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index d115ad0058a..47b5a388837 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -76,12 +76,13 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 }
 
                 $id = $filter->getFormField()->getId();
-                $value = $data[$id] ?? $rawData[$id];
+                $serializedValue = $filter->serializeValue($data[$id] ?? $rawData[$id]);
 
                 $result = [
                     'identifier' => $filter->getIdentifier(),
-                    'summary' => $filter->summarizeValue($value),
-                    'value' => $filter->serializeValue($value),
+                    // Summarize the restored value to match the summaries of the stored filters.
+                    'summary' => $filter->summarizeValue($filter->unserializeValue($serializedValue)),
+                    'value' => $serializedValue,
                 ];
             }
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 3fe21a7da96..e41c0325639 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -40,6 +40,9 @@ public function getFormField(): AbstractFormField;
     /**
      * Converts the given value into its string representation for storage.
      *
+     * When a filter is configured, the given value is the value of the form
+     * field returned by `getFormField()`, which may differ from `TValueType`.
+     *
      * @param TValueType $value
      */
     public function serializeValue(mixed $value): string;
diff --git a/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php
new file mode 100644
index 00000000000..16e8ddf85da
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\system\form\builder\field\DateRangeFormField;
+use wcf\system\form\builder\field\IFormField;
+use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\form\builder\field\validation\FormFieldValidator;
+
+/**
+ * Provides the shared handling of filters whose value is a range with an
+ * optional lower and an optional upper bound, serialized as `from;to`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+trait TRangeObjectFilter
+{
+    /**
+     * Splits the serialized range into its lower and upper bound, empty bounds
+     * are returned as `null`.
+     *
+     * @return array{0: ?string, 1: ?string}
+     */
+    private function splitRange(string $value): array
+    {
+        [$from, $to] = \explode(';', $value, 2) + [1 => ''];
+
+        return [
+            $from === '' ? null : $from,
+            $to === '' ? null : $to,
+        ];
+    }
+
+    /**
+     * Returns the validator that requires at least one bound and rejects an
+     * upper bound that is lower than the lower bound.
+     */
+    private function getRangeValidator(): FormFieldValidator
+    {
+        return new FormFieldValidator(
+            'range',
+            static function (IFormField $field) {
+                \assert($field instanceof DateRangeFormField || $field instanceof NumericRangeFormField);
+                $from = $field->getFromValue();
+                $to = $field->getToValue();
+
+                if ($from === '' && $to === '') {
+                    $field->addValidationError(
+                        new FormFieldValidationError('empty')
+                    );
+                } elseif ($from !== '' && $to !== '' && $from > $to) {
+                    $field->addValidationError(
+                        new FormFieldValidationError('endBeforeStart', 'wcf.objectFilter.range.error.endBeforeStart')
+                    );
+                }
+            }
+        );
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index c67bf428833..cfc47714fe9 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -6,10 +6,28 @@
 use wcf\data\user\User;
 use wcf\event\notice\NoticeObjectFilterCollecting;
 use wcf\system\event\EventHandler;
+use wcf\system\object\filter\date\DaysOfWeekObjectFilter;
 use wcf\system\object\filter\IObjectFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
+use wcf\system\object\filter\page\NotRequestedPageObjectFilter;
+use wcf\system\object\filter\page\RequestedPageObjectFilter;
+use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
+use wcf\system\object\filter\user\UserBannedObjectFilter;
+use wcf\system\object\filter\user\UserBirthdayObjectFilter;
+use wcf\system\object\filter\user\UserEmailConfirmedObjectFilter;
+use wcf\system\object\filter\user\UserEmailObjectFilter;
+use wcf\system\object\filter\user\UserGroupObjectFilter;
+use wcf\system\object\filter\user\UserIntegerPropertyObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
+use wcf\system\object\filter\user\UserMobileBrowserObjectFilter;
+use wcf\system\object\filter\user\UserMultifactorObjectFilter;
+use wcf\system\object\filter\user\UserNotInGroupObjectFilter;
+use wcf\system\object\filter\user\UserNoTrophyObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDateObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDaysObjectFilter;
+use wcf\system\object\filter\user\UserTrophyObjectFilter;
+use wcf\system\object\filter\user\UserUsernameObjectFilter;
 use wcf\system\WCF;
 
 /**
@@ -29,8 +47,28 @@ final class NoticeObjectFilterBuilder extends AbstractObjectFilterBuilder
     protected function createFilters(): array
     {
         $event = new NoticeObjectFilterCollecting();
-        $event->register(new UserAvatarObjectFilter());
+        $event->register(new RequestedPageObjectFilter());
+        $event->register(new NotRequestedPageObjectFilter());
+        $event->register(new DaysOfWeekObjectFilter());
+        $event->register(new UserUsernameObjectFilter());
+        $event->register(new UserEmailObjectFilter());
+        $event->register(new UserGroupObjectFilter(includeGuests: true));
+        $event->register(new UserNotInGroupObjectFilter(includeGuests: true));
         $event->register(new UserLanguageObjectFilter());
+        $event->register(new UserRegistrationDateObjectFilter());
+        $event->register(new UserRegistrationDaysObjectFilter());
+        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserBannedObjectFilter());
+        $event->register(new UserActivatedObjectFilter());
+        $event->register(new UserEmailConfirmedObjectFilter());
+        $event->register(new UserMultifactorObjectFilter());
+        $event->register(new UserBirthdayObjectFilter());
+        $event->register(new UserMobileBrowserObjectFilter());
+        $event->register(new UserIntegerPropertyObjectFilter('activityPoints', 'wcf.user.condition.activityPoints'));
+        $event->register(new UserIntegerPropertyObjectFilter('likesReceived', 'wcf.user.condition.likesReceived'));
+        $event->register(new UserIntegerPropertyObjectFilter('trophyPoints', 'wcf.user.condition.trophyPoints'));
+        $event->register(new UserTrophyObjectFilter());
+        $event->register(new UserNoTrophyObjectFilter());
 
         EventHandler::getInstance()->fire($event);
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index 74261ab5ed4..c7e6aa56b91 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -10,8 +10,20 @@
 use wcf\system\object\filter\IObjectListFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\ObjectListFilterHandler;
+use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
+use wcf\system\object\filter\user\UserBannedObjectFilter;
+use wcf\system\object\filter\user\UserEmailConfirmedObjectFilter;
+use wcf\system\object\filter\user\UserEmailObjectFilter;
+use wcf\system\object\filter\user\UserGroupObjectFilter;
+use wcf\system\object\filter\user\UserIntegerPropertyObjectFilter;
 use wcf\system\object\filter\user\UserLanguageObjectFilter;
+use wcf\system\object\filter\user\UserNotInGroupObjectFilter;
+use wcf\system\object\filter\user\UserNoTrophyObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDateObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDaysObjectFilter;
+use wcf\system\object\filter\user\UserTrophyObjectFilter;
+use wcf\system\object\filter\user\UserUsernameObjectFilter;
 use wcf\system\WCF;
 
 /**
@@ -33,8 +45,22 @@ final class UserGroupAssignmentObjectFilterBuilder extends AbstractObjectFilterB
     protected function createFilters(): array
     {
         $event = new UserGroupAssignmentObjectFilterCollecting();
-        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserUsernameObjectFilter());
+        $event->register(new UserEmailObjectFilter());
+        $event->register(new UserGroupObjectFilter());
+        $event->register(new UserNotInGroupObjectFilter());
         $event->register(new UserLanguageObjectFilter());
+        $event->register(new UserRegistrationDateObjectFilter());
+        $event->register(new UserRegistrationDaysObjectFilter());
+        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserBannedObjectFilter());
+        $event->register(new UserActivatedObjectFilter());
+        $event->register(new UserEmailConfirmedObjectFilter());
+        $event->register(new UserIntegerPropertyObjectFilter('activityPoints', 'wcf.user.condition.activityPoints'));
+        $event->register(new UserIntegerPropertyObjectFilter('likesReceived', 'wcf.user.condition.likesReceived'));
+        $event->register(new UserIntegerPropertyObjectFilter('trophyPoints', 'wcf.user.condition.trophyPoints'));
+        $event->register(new UserTrophyObjectFilter());
+        $event->register(new UserNoTrophyObjectFilter());
 
         EventHandler::getInstance()->fire($event);
 
diff --git a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
new file mode 100644
index 00000000000..041a885c077
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace wcf\system\object\filter\date;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\form\builder\field\MultipleSelectionFormField;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\WCF;
+use wcf\util\DateUtil;
+
+/**
+ * Filters by whether the current day of the week is one of the given days,
+ * based on the time zone of the user. The days are numbered from `0` (Sunday)
+ * to `6` (Saturday).
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectFilter<User, list<int>>
+ */
+final class DaysOfWeekObjectFilter implements IObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.daysOfWeek';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.daysOfWeek');
+    }
+
+    #[\Override]
+    public function getFormField(): MultipleSelectionFormField
+    {
+        return MultipleSelectionFormField::create('daysOfWeek')
+            ->label('wcf.date.daysOfWeek')
+            ->options($this->getDays())
+            ->required();
+    }
+
+    /**
+     * @param list<int|string> $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return \implode(',', \array_map(static fn($day) => (int)$day, $value));
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        return \array_map(static fn($day) => (int)$day, \explode(',', $serializedValue));
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        $days = \array_intersect_key($this->getDays(), \array_flip($value));
+
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.daysOfWeek.summary', [
+            'days' => \implode(', ', \array_map(
+                static fn(string $day) => WCF::getLanguage()->get($day),
+                $days,
+            )),
+        ]);
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        $now = new \DateTimeImmutable('now', $object->getTimeZone());
+
+        return \in_array((int)$now->format('w'), $configuredValue, true);
+    }
+
+    /**
+     * Returns the language items of the days of the week, indexed by their
+     * number and sorted by the first day of the week.
+     *
+     * @return array<int, string>
+     */
+    private function getDays(): array
+    {
+        return \array_map(
+            static fn(string $day) => 'wcf.date.day.' . $day,
+            DateUtil::getWeekDays(),
+        );
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
new file mode 100644
index 00000000000..661fae5ea02
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace wcf\system\object\filter\page;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\form\builder\field\PagesFormField;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\request\RequestHandler;
+use wcf\system\WCF;
+
+/**
+ * Filters by whether the requested page is none of the pages with the given ids.
+ * Requests without an active page never match.
+ *
+ * The given user is ignored, therefore this filter is only meaningful when
+ * testing the active user.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectFilter<User, list<int>>
+ */
+final class NotRequestedPageObjectFilter implements IObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.notRequestedPage';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.notRequestedPage');
+    }
+
+    #[\Override]
+    public function getFormField(): PagesFormField
+    {
+        return PagesFormField::create('notRequestedPage')
+            ->label('wcf.page.requestedPage')
+            ->required();
+    }
+
+    /**
+     * @param list<int|string> $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return \implode(',', \array_map(static fn($pageID) => (int)$pageID, $value));
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.notRequestedPage.summary', [
+            'pages' => RequestedPageObjectFilter::getPageTitles($value),
+        ]);
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        $pageID = RequestHandler::getInstance()->getActivePageID();
+        if ($pageID === null) {
+            return false;
+        }
+
+        return !\in_array($pageID, $configuredValue, true);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
new file mode 100644
index 00000000000..d054f2b802f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace wcf\system\object\filter\page;
+
+use wcf\data\DatabaseObject;
+use wcf\data\page\PageCache;
+use wcf\data\user\User;
+use wcf\system\form\builder\field\PagesFormField;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\request\RequestHandler;
+use wcf\system\WCF;
+
+/**
+ * Filters by whether the requested page is one of the pages with the given ids.
+ * Requests without an active page never match.
+ *
+ * The given user is ignored, therefore this filter is only meaningful when
+ * testing the active user.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectFilter<User, list<int>>
+ */
+final class RequestedPageObjectFilter implements IObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.requestedPage';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.requestedPage');
+    }
+
+    #[\Override]
+    public function getFormField(): PagesFormField
+    {
+        return PagesFormField::create('requestedPage')
+            ->label('wcf.page.requestedPage')
+            ->required();
+    }
+
+    /**
+     * @param list<int|string> $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return \implode(',', \array_map(static fn($pageID) => (int)$pageID, $value));
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.requestedPage.summary', [
+            'pages' => RequestedPageObjectFilter::getPageTitles($value),
+        ]);
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        $pageID = RequestHandler::getInstance()->getActivePageID();
+        if ($pageID === null) {
+            return false;
+        }
+
+        return \in_array($pageID, $configuredValue, true);
+    }
+
+    /**
+     * Returns the comma-separated titles of the pages with the given ids.
+     *
+     * @param list<int> $pageIDs
+     * @internal
+     */
+    public static function getPageTitles(array $pageIDs): string
+    {
+        $titles = [];
+        foreach ($pageIDs as $pageID) {
+            $page = PageCache::getInstance()->getPage($pageID);
+            if ($page !== null) {
+                $titles[] = $page->getTitle();
+            }
+        }
+
+        return \implode(', ', $titles);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
new file mode 100644
index 00000000000..9a5750ed453
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by whether their account has been activated. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserActivatedObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userActivated';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.activated');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userActivated')
+            ->label('wcf.objectFilter.user.activated');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.activated.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.activated.summary.no');
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add('activationCode = 0');
+        } else {
+            $conditions->add('activationCode <> 0');
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === !$object->pendingActivation();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index a11d08436ba..3814f3cea86 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -7,9 +7,10 @@
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
 
 /**
- * Filters users by whether they have an avatar.
+ * Filters users by whether they have an avatar. Guests never match.
  *
  * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
@@ -29,7 +30,7 @@ public function getIdentifier(): string
     #[\Override]
     public function getTitle(): string
     {
-        return 'TODO: user avatar';
+        return WCF::getLanguage()->get('wcf.objectFilter.user.avatar');
     }
 
     #[\Override]
@@ -65,15 +66,19 @@ public function unserializeValue(string $serializedValue): bool
     public function summarizeValue(mixed $value): string
     {
         if ($value) {
-            return 'TODO: has an avatar';
+            return WCF::getLanguage()->get('wcf.objectFilter.user.avatar.summary.avatar');
         }
 
-        return 'TODO: does not have an avatar';
+        return WCF::getLanguage()->get('wcf.objectFilter.user.avatar.summary.noAvatar');
     }
 
     #[\Override]
     public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
+        if ($object->isGuest()) {
+            return false;
+        }
+
         return match ($configuredValue) {
             true => $object->avatarFileID !== null,
             false => $object->avatarFileID === null,
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
new file mode 100644
index 00000000000..6f891f86ba1
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by whether they are banned. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserBannedObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userBanned';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.banned');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userBanned')
+            ->label('wcf.objectFilter.user.banned');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.banned.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.banned.summary.no');
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add('banned = 1');
+        } else {
+            $conditions->add('banned = 0');
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === ($object->banned !== 0);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
new file mode 100644
index 00000000000..c8e3f89d5cb
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\user\UserBirthdayCache;
+use wcf\system\WCF;
+
+/**
+ * Filters users by whether it is their birthday today, based on the time zone
+ * of the user. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectFilter<User, bool>
+ */
+final class UserBirthdayObjectFilter implements IObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userBirthday';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.birthday');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userBirthday')
+            ->label('wcf.objectFilter.user.birthday');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.birthday.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.birthday.summary.no');
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        $today = new \DateTimeImmutable('now', $object->getTimeZone());
+        $userIDs = UserBirthdayCache::getInstance()->getBirthdays(
+            (int)$today->format('n'),
+            (int)$today->format('j'),
+        );
+
+        return $configuredValue === \in_array($object->userID, $userIDs, true);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
new file mode 100644
index 00000000000..106f54f753e
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by whether they have confirmed their email address. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserEmailConfirmedObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userEmailConfirmed';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userEmailConfirmed')
+            ->label('wcf.objectFilter.user.emailConfirmed');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed.summary.no');
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add('emailConfirmed IS NULL');
+        } else {
+            $conditions->add('emailConfirmed IS NOT NULL');
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === $object->isEmailConfirmed();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
new file mode 100644
index 00000000000..8dd9051a4bd
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\TextFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users whose email address contains the given text, ignoring case.
+ * Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, string>
+ */
+final class UserEmailObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userEmail';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.email');
+    }
+
+    #[\Override]
+    public function getFormField(): TextFormField
+    {
+        return TextFormField::create('userEmail')
+            ->label('wcf.user.email')
+            ->maximumLength(255)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): string
+    {
+        return $serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.email.summary', [
+            'value' => $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add('email LIKE ?', ['%' . WCF::getDB()->escapeLikeValue($value) . '%']);
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        // Must match the case-insensitive `LIKE` in `applyFilter()`.
+        return \mb_stripos($object->email, $configuredValue) !== false;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
new file mode 100644
index 00000000000..3c9b12892a3
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\group\UserGroup;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users that are a member of the user group with the given id.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, int>
+ */
+final class UserGroupObjectFilter implements IObjectListFilter
+{
+    /**
+     * @param bool $includeGuests offers the guest group for selection, only useful if guests are tested
+     */
+    public function __construct(
+        private readonly bool $includeGuests = false,
+    ) {}
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userGroup';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.group');
+    }
+
+    #[\Override]
+    public function getFormField(): SelectFormField
+    {
+        return SelectFormField::create('userGroup')
+            ->label('wcf.objectFilter.user.group.group')
+            ->options(UserGroupObjectFilter::getSelectableGroups($this->includeGuests), labelLanguageItems: false)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.group.summary', [
+            'group' => UserGroup::getGroupByID($value)?->getName() ?? $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add(
+            'user_table.userID IN (
+                SELECT  userID
+                FROM    wcf1_user_to_group
+                WHERE   groupID = ?
+            )',
+            [$value]
+        );
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return \in_array($configuredValue, $object->getGroupIDs(), true);
+    }
+
+    /**
+     * Returns the names of the user groups that can be selected, indexed by their id.
+     *
+     * @return array<int, string>
+     * @internal
+     */
+    public static function getSelectableGroups(bool $includeGuests): array
+    {
+        $invalidGroupTypes = [
+            UserGroup::EVERYONE,
+            UserGroup::USERS,
+        ];
+        if (!$includeGuests) {
+            $invalidGroupTypes[] = UserGroup::GUESTS;
+        }
+
+        return \array_map(
+            static fn(UserGroup $group) => $group->getName(),
+            UserGroup::getSortedAccessibleGroups([], $invalidGroupTypes),
+        );
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
new file mode 100644
index 00000000000..326b80bd1d9
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\object\filter\TRangeObjectFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by the value of an integer column of the user table, e.g.
+ * `activityPoints`. The value consists of an optional minimum and an optional
+ * maximum, both inclusive. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, array{0: ?int, 1: ?int}>
+ */
+final class UserIntegerPropertyObjectFilter implements IObjectListFilter
+{
+    use TRangeObjectFilter;
+
+    /**
+     * @param string $propertyName name of the integer column in `wcf1_user`
+     * @param string $languageItem language item of the title of the property
+     */
+    public function __construct(
+        private readonly string $propertyName,
+        private readonly string $languageItem,
+    ) {}
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.user' . \ucfirst($this->propertyName);
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->languageItem);
+    }
+
+    #[\Override]
+    public function getFormField(): NumericRangeFormField
+    {
+        return NumericRangeFormField::create('user' . \ucfirst($this->propertyName))
+            ->label($this->languageItem)
+            ->integerValues()
+            ->minimum(0)
+            ->addValidator($this->getRangeValidator());
+    }
+
+    /**
+     * @param string|array{0: ?int, 1: ?int} $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        [$from, $to] = \is_string($value) ? $this->unserializeValue($value) : $value;
+
+        return $from . ';' . $to;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        [$from, $to] = $this->splitRange($serializedValue);
+
+        return [
+            $from === null ? null : (int)$from,
+            $to === null ? null : (int)$to,
+        ];
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        [$from, $to] = $value;
+
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.integerProperty.summary', [
+            'title' => $this->getTitle(),
+            'from' => $from,
+            'to' => $to,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        [$from, $to] = $value;
+
+        if ($from !== null) {
+            $conditions->add($this->propertyName . ' >= ?', [$from]);
+        }
+        if ($to !== null) {
+            $conditions->add($this->propertyName . ' <= ?', [$to]);
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        [$from, $to] = $configuredValue;
+        $value = $object->{$this->propertyName};
+
+        if ($from !== null && $value < $from) {
+            return false;
+        }
+        if ($to !== null && $value > $to) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index b636aa62214..f26749c1733 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -5,19 +5,23 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\form\builder\field\MultipleSelectionFormField;
 use wcf\system\language\LanguageFactory;
 use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
 
 /**
- * Filters users by their interface language. The value is the id of the language.
+ * Filters users by their interface language. The value is the list of ids of
+ * the accepted languages, users must use one of them.
+ *
+ * Guests are matched by the language of the active session.
  *
  * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectListFilter<User, int>
+ * @implements IObjectListFilter<User, list<int>>
  */
 final class UserLanguageObjectFilter implements IObjectListFilter
 {
@@ -30,48 +34,62 @@ public function getIdentifier(): string
     #[\Override]
     public function getTitle(): string
     {
-        return 'TODO: user language';
+        return WCF::getLanguage()->get('wcf.objectFilter.user.language');
     }
 
     #[\Override]
-    public function getFormField(): SelectFormField
+    public function getFormField(): MultipleSelectionFormField
     {
-        return SelectFormField::create('userLanguage')
-            ->label('TODO: user language')
+        return MultipleSelectionFormField::create('userLanguage')
+            ->label('wcf.user.condition.languages')
             ->options(LanguageFactory::getInstance()->getLanguages())
             ->required();
     }
 
+    /**
+     * @param list<int|string> $value
+     */
     #[\Override]
     public function serializeValue(mixed $value): string
     {
-        return (string)$value;
+        return \implode(',', \array_map(static fn($languageID) => (int)$languageID, $value));
     }
 
     #[\Override]
-    public function unserializeValue(string $serializedValue): mixed
+    public function unserializeValue(string $serializedValue): array
     {
-        return (int)$serializedValue;
+        return \array_map(static fn($languageID) => (int)$languageID, \explode(',', $serializedValue));
     }
 
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
-        return \sprintf(
-            'TODO: has language %s',
-            LanguageFactory::getInstance()->getLanguage($value)->__toString()
-        );
+        $languages = [];
+        foreach ($value as $languageID) {
+            $language = LanguageFactory::getInstance()->getLanguage($languageID);
+            if ($language !== null) {
+                $languages[] = $language->__toString();
+            }
+        }
+
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.language.summary', [
+            'languages' => \implode(', ', $languages),
+        ]);
     }
 
     #[\Override]
     public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
     {
-        $conditions->add('languageID = ?', [$value]);
+        $conditions->add('languageID IN (?)', [$value]);
     }
 
     #[\Override]
     public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
-        return $object->languageID === $configuredValue;
+        if ($object->isGuest()) {
+            return \in_array(WCF::getLanguage()->languageID, $configuredValue, true);
+        }
+
+        return \in_array($object->languageID, $configuredValue, true);
     }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
new file mode 100644
index 00000000000..e32df887dff
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\WCF;
+use wcf\util\UserUtil;
+
+/**
+ * Filters by whether the active request originates from a mobile browser.
+ *
+ * The given user is ignored, therefore this filter is only meaningful when
+ * testing the active user.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectFilter<User, bool>
+ */
+final class UserMobileBrowserObjectFilter implements IObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userMobileBrowser';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userMobileBrowser')
+            ->label('wcf.objectFilter.user.mobileBrowser');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser.summary.no');
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return $configuredValue === UserUtil::usesMobileBrowser();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
new file mode 100644
index 00000000000..788ff404c55
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by whether they have enabled multi-factor authentication. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserMultifactorObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userMultifactor';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor');
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create('userMultifactor')
+            ->label('wcf.objectFilter.user.multifactor');
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        if ($value) {
+            return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor.summary.yes');
+        }
+
+        return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor.summary.no');
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add('multifactorActive = 1');
+        } else {
+            $conditions->add('multifactorActive = 0');
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === ($object->multifactorActive !== 0);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
new file mode 100644
index 00000000000..af426e0b79f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\trophy\TrophyCache;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users that have not received the trophy with the given id.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, int>
+ */
+final class UserNoTrophyObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userNoTrophy';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.noTrophy');
+    }
+
+    #[\Override]
+    public function getFormField(): SelectFormField
+    {
+        return SelectFormField::create('userNoTrophy')
+            ->label('wcf.objectFilter.user.trophy.trophy')
+            ->options(UserTrophyObjectFilter::getSelectableTrophies(), labelLanguageItems: false)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.noTrophy.summary', [
+            'trophy' => TrophyCache::getInstance()->getTrophyByID($value)?->getTitle() ?? $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add(
+            'user_table.userID NOT IN (
+                SELECT  userID
+                FROM    wcf1_user_trophy
+                WHERE   trophyID = ?
+            )',
+            [$value]
+        );
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return !\in_array($configuredValue, UserTrophyObjectFilter::getTrophyIDs($object), true);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
new file mode 100644
index 00000000000..bd1cb5a6ab2
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\group\UserGroup;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users that are not a member of the user group with the given id.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, int>
+ */
+final class UserNotInGroupObjectFilter implements IObjectListFilter
+{
+    /**
+     * @param bool $includeGuests offers the guest group for selection, only useful if guests are tested
+     */
+    public function __construct(
+        private readonly bool $includeGuests = false,
+    ) {}
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userNotInGroup';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.notInGroup');
+    }
+
+    #[\Override]
+    public function getFormField(): SelectFormField
+    {
+        return SelectFormField::create('userNotInGroup')
+            ->label('wcf.objectFilter.user.group.group')
+            ->options(UserGroupObjectFilter::getSelectableGroups($this->includeGuests), labelLanguageItems: false)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.notInGroup.summary', [
+            'group' => UserGroup::getGroupByID($value)?->getName() ?? $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add(
+            'user_table.userID NOT IN (
+                SELECT  userID
+                FROM    wcf1_user_to_group
+                WHERE   groupID = ?
+            )',
+            [$value]
+        );
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return !\in_array($configuredValue, $object->getGroupIDs(), true);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
new file mode 100644
index 00000000000..86a8aabcc9d
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\DateRangeFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\object\filter\TRangeObjectFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by their registration date. The value consists of an optional
+ * first and an optional last day (`Y-m-d`), both inclusive and interpreted in
+ * the default time zone. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, array{0: ?string, 1: ?string}>
+ */
+final class UserRegistrationDateObjectFilter implements IObjectListFilter
+{
+    use TRangeObjectFilter;
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userRegistrationDate';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.registrationDate');
+    }
+
+    #[\Override]
+    public function getFormField(): DateRangeFormField
+    {
+        return DateRangeFormField::create('userRegistrationDate')
+            ->label('wcf.user.condition.registrationDate')
+            ->addValidator($this->getRangeValidator());
+    }
+
+    /**
+     * @param string|array{0: ?string, 1: ?string} $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        [$from, $to] = \is_string($value) ? $this->splitRange($value) : $value;
+
+        return $from . ';' . $to;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        return $this->splitRange($serializedValue);
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        [$from, $to] = $value;
+
+        $formatter = new \IntlDateFormatter(
+            WCF::getLanguage()->getLocale(),
+            \IntlDateFormatter::LONG,
+            \IntlDateFormatter::NONE,
+            'UTC',
+        );
+        $format = static function (?string $date) use ($formatter): ?string {
+            if ($date === null) {
+                return null;
+            }
+
+            $dateTime = \DateTimeImmutable::createFromFormat('!Y-m-d', $date, new \DateTimeZone('UTC'));
+            if ($dateTime === false) {
+                return $date;
+            }
+
+            return $formatter->format($dateTime);
+        };
+
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.registrationDate.summary', [
+            'from' => $format($from),
+            'to' => $format($to),
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        [$start, $end] = $this->getBoundaries($value);
+
+        if ($start !== null) {
+            $conditions->add('registrationDate >= ?', [$start]);
+        }
+        if ($end !== null) {
+            $conditions->add('registrationDate < ?', [$end]);
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        [$start, $end] = $this->getBoundaries($configuredValue);
+
+        if ($start !== null && $object->registrationDate < $start) {
+            return false;
+        }
+        if ($end !== null && $object->registrationDate >= $end) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the timestamp of the start of the first day and the timestamp
+     * of the start of the day after the last day.
+     *
+     * @param array{0: ?string, 1: ?string} $value
+     * @return array{0: ?int, 1: ?int}
+     */
+    private function getBoundaries(array $value): array
+    {
+        [$from, $to] = $value;
+        $timezone = new \DateTimeZone(\TIMEZONE);
+
+        $start = null;
+        if ($from !== null) {
+            $dateTime = \DateTimeImmutable::createFromFormat('!Y-m-d', $from, $timezone);
+            if ($dateTime !== false) {
+                $start = $dateTime->getTimestamp();
+            }
+        }
+
+        $end = null;
+        if ($to !== null) {
+            $dateTime = \DateTimeImmutable::createFromFormat('!Y-m-d', $to, $timezone);
+            if ($dateTime !== false) {
+                $end = $dateTime->modify('+1 day')->getTimestamp();
+            }
+        }
+
+        return [$start, $end];
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
new file mode 100644
index 00000000000..4bdc52fea42
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\object\filter\TRangeObjectFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users by the number of days since their registration. The value
+ * consists of an optional minimum and an optional maximum number of days,
+ * both inclusive. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, array{0: ?int, 1: ?int}>
+ */
+final class UserRegistrationDaysObjectFilter implements IObjectListFilter
+{
+    use TRangeObjectFilter;
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userRegistrationDays';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.registrationDays');
+    }
+
+    #[\Override]
+    public function getFormField(): NumericRangeFormField
+    {
+        return NumericRangeFormField::create('userRegistrationDays')
+            ->label('wcf.user.condition.registrationDateInterval')
+            ->integerValues()
+            ->minimum(0)
+            ->addValidator($this->getRangeValidator());
+    }
+
+    /**
+     * @param string|array{0: ?int, 1: ?int} $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        [$from, $to] = \is_string($value) ? $this->unserializeValue($value) : $value;
+
+        return $from . ';' . $to;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        [$from, $to] = $this->splitRange($serializedValue);
+
+        return [
+            $from === null ? null : (int)$from,
+            $to === null ? null : (int)$to,
+        ];
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        [$from, $to] = $value;
+
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.registrationDays.summary', [
+            'from' => $from,
+            'to' => $to,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        [$from, $to] = $value;
+
+        if ($from !== null) {
+            $conditions->add('registrationDate <= ?', [\TIME_NOW - $from * 86400]);
+        }
+        if ($to !== null) {
+            $conditions->add('registrationDate >= ?', [\TIME_NOW - $to * 86400]);
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        [$from, $to] = $configuredValue;
+
+        if ($from !== null && $object->registrationDate > \TIME_NOW - $from * 86400) {
+            return false;
+        }
+        if ($to !== null && $object->registrationDate < \TIME_NOW - $to * 86400) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
new file mode 100644
index 00000000000..aa6e1602345
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\trophy\Trophy;
+use wcf\data\trophy\TrophyCache;
+use wcf\data\user\trophy\UserTrophyList;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users that have received the trophy with the given id. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, int>
+ */
+final class UserTrophyObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userTrophy';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.trophy');
+    }
+
+    #[\Override]
+    public function getFormField(): SelectFormField
+    {
+        return SelectFormField::create('userTrophy')
+            ->label('wcf.objectFilter.user.trophy.trophy')
+            ->options(UserTrophyObjectFilter::getSelectableTrophies(), labelLanguageItems: false)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.trophy.summary', [
+            'trophy' => TrophyCache::getInstance()->getTrophyByID($value)?->getTitle() ?? $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add(
+            'user_table.userID IN (
+                SELECT  userID
+                FROM    wcf1_user_trophy
+                WHERE   trophyID = ?
+            )',
+            [$value]
+        );
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return \in_array($configuredValue, UserTrophyObjectFilter::getTrophyIDs($object), true);
+    }
+
+    /**
+     * Returns the titles of the trophies that can be selected, indexed by their id.
+     *
+     * @return array<int, string>
+     * @internal
+     */
+    public static function getSelectableTrophies(): array
+    {
+        $trophies = \array_map(
+            static fn(Trophy $trophy) => $trophy->getTitle(),
+            TrophyCache::getInstance()->getTrophies(),
+        );
+
+        $collator = new \Collator(WCF::getLanguage()->getLocale());
+        \uasort(
+            $trophies,
+            static fn(string $a, string $b) => $collator->compare($a, $b)
+        );
+
+        return $trophies;
+    }
+
+    /**
+     * Returns the ids of the enabled trophies the given user has received.
+     *
+     * @return list<int>
+     * @internal
+     */
+    public static function getTrophyIDs(User $user): array
+    {
+        if ($user->isGuest()) {
+            return [];
+        }
+
+        $userTrophies = UserTrophyList::getUserTrophies([$user->userID])[$user->userID];
+
+        return \array_values(\array_map(
+            static fn($userTrophy) => $userTrophy->trophyID,
+            $userTrophies,
+        ));
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
new file mode 100644
index 00000000000..e38dd968050
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\form\builder\field\TextFormField;
+use wcf\system\object\filter\IObjectListFilter;
+use wcf\system\WCF;
+
+/**
+ * Filters users whose username contains the given text, ignoring case.
+ * Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @implements IObjectListFilter<User, string>
+ */
+final class UserUsernameObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userUsername';
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get('wcf.objectFilter.user.username');
+    }
+
+    #[\Override]
+    public function getFormField(): TextFormField
+    {
+        return TextFormField::create('userUsername')
+            ->label('wcf.user.username')
+            ->maximumLength(255)
+            ->required();
+    }
+
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): string
+    {
+        return $serializedValue;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.username.summary', [
+            'value' => $value,
+        ]);
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        $conditions->add('username LIKE ?', ['%' . WCF::getDB()->escapeLikeValue($value) . '%']);
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        // Must match the case-insensitive `LIKE` in `applyFilter()`.
+        return \mb_stripos($object->username, $configuredValue) !== false;
+    }
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 143def3fabd..b0b246414fa 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3472,6 +3472,57 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.condition.timestamp.error.invalidEnd"><![CDATA[Das Enddatum ist ungültig.]]></item>
 		<item name="wcf.condition.timestamp.error.invalidStart"><![CDATA[Das Startdatum ist ungültig.]]></item>
 	</category>
+	<category name="wcf.objectFilter">
+		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
+		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$days}]]></item>
+		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
+		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$pages}]]></item>
+		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[Der Endwert ist kleiner als der Startwert.]]></item>
+		<item name="wcf.objectFilter.requestedPage"><![CDATA[Aufgerufene Seite]]></item>
+		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Aufgerufene Seite ist eine von: {$pages}]]></item>
+		<item name="wcf.objectFilter.user.activated"><![CDATA[Benutzerkonto aktiviert]]></item>
+		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Benutzerkonto ist nicht aktiviert]]></item>
+		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Benutzerkonto ist aktiviert]]></item>
+		<item name="wcf.objectFilter.user.avatar"><![CDATA[Avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.avatar"><![CDATA[Hat einen Avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.noAvatar"><![CDATA[Hat keinen Avatar]]></item>
+		<item name="wcf.objectFilter.user.banned"><![CDATA[Gesperrt]]></item>
+		<item name="wcf.objectFilter.user.banned.summary.no"><![CDATA[Ist nicht gesperrt]]></item>
+		<item name="wcf.objectFilter.user.banned.summary.yes"><![CDATA[Ist gesperrt]]></item>
+		<item name="wcf.objectFilter.user.birthday"><![CDATA[Geburtstag heute]]></item>
+		<item name="wcf.objectFilter.user.birthday.summary.no"><![CDATA[Hat heute nicht Geburtstag]]></item>
+		<item name="wcf.objectFilter.user.birthday.summary.yes"><![CDATA[Hat heute Geburtstag]]></item>
+		<item name="wcf.objectFilter.user.email"><![CDATA[E-Mail-Adresse]]></item>
+		<item name="wcf.objectFilter.user.email.summary"><![CDATA[E-Mail-Adresse enthält „{$value}“]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed"><![CDATA[E-Mail-Adresse bestätigt]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed.summary.no"><![CDATA[Hat keine bestätigte E-Mail-Adresse]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed.summary.yes"><![CDATA[Hat eine bestätigte E-Mail-Adresse]]></item>
+		<item name="wcf.objectFilter.user.group"><![CDATA[Mitglied der Benutzergruppe]]></item>
+		<item name="wcf.objectFilter.user.group.group"><![CDATA[Benutzergruppe]]></item>
+		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Ist Mitglied der Benutzergruppe „{$group}“]]></item>
+		<item name="wcf.objectFilter.user.integerProperty.summary"><![CDATA[{$title}: {if $from !== null && $to !== null}zwischen {#$from} und {#$to}{elseif $from !== null}mindestens {#$from}{else}höchstens {#$to}{/if}]]></item>
+		<item name="wcf.objectFilter.user.language"><![CDATA[Sprache]]></item>
+		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Verwendet eine der Sprachen: {$languages}]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser"><![CDATA[Mobiler Browser]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser.summary.no"><![CDATA[Verwendet keinen mobilen Browser]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser.summary.yes"><![CDATA[Verwendet einen mobilen Browser]]></item>
+		<item name="wcf.objectFilter.user.multifactor"><![CDATA[Mehrfaktor-Authentifizierung]]></item>
+		<item name="wcf.objectFilter.user.multifactor.summary.no"><![CDATA[Mehrfaktor-Authentifizierung ist nicht aktiv]]></item>
+		<item name="wcf.objectFilter.user.multifactor.summary.yes"><![CDATA[Mehrfaktor-Authentifizierung ist aktiv]]></item>
+		<item name="wcf.objectFilter.user.noTrophy"><![CDATA[Hat Trophäe nicht erhalten]]></item>
+		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Hat die Trophäe „{$trophy}“ nicht erhalten]]></item>
+		<item name="wcf.objectFilter.user.notInGroup"><![CDATA[Kein Mitglied der Benutzergruppe]]></item>
+		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Ist kein Mitglied der Benutzergruppe „{$group}“]]></item>
+		<item name="wcf.objectFilter.user.registrationDate"><![CDATA[Registrierungsdatum]]></item>
+		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registriert {if $from !== null && $to !== null}zwischen dem {$from} und dem {$to}{elseif $from !== null}am oder nach dem {$from}{else}am oder vor dem {$to}{/if}]]></item>
+		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Tage seit Registrierung]]></item>
+		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registriert vor {if $from !== null && $to !== null}{#$from} bis {#$to} Tagen{elseif $from !== null}mindestens {#$from} Tagen{else}höchstens {#$to} Tagen{/if}]]></item>
+		<item name="wcf.objectFilter.user.trophy"><![CDATA[Hat Trophäe erhalten]]></item>
+		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Hat die Trophäe „{$trophy}“ erhalten]]></item>
+		<item name="wcf.objectFilter.user.trophy.trophy"><![CDATA[Trophäe]]></item>
+		<item name="wcf.objectFilter.user.username"><![CDATA[Benutzername]]></item>
+		<item name="wcf.objectFilter.user.username.summary"><![CDATA[Benutzername enthält „{$value}“]]></item>
+	</category>
 	<category name="wcf.contact">
 		<item name="wcf.contact.mail.subject"><![CDATA[Neue Nachricht über das Kontaktformular]]></item>
 		<item name="wcf.contact.mail.plaintext"><![CDATA[Hallo,
@@ -3969,6 +4020,7 @@ Dateianhänge:
 		<item name="wcf.form.field.className.error.nonExistent"><![CDATA[Die angegebene Klasse{if $language|isset} ({$language}){/if} existiert nicht.]]></item>
 		<item name="wcf.form.field.className.error.parentClass"><![CDATA[Die angegebene Klasse{if $language|isset} ({$language}){/if} erbt nicht von <kbd>{$parentClass}</kbd>.]]></item>
 		<item name="wcf.form.field.itemList.error.separator"><![CDATA[Die folgenden Einträge dürfen kein {if $separator === ','}Komma{else}Leerzeichen{/if} enthalten: {implode from=$invalidItems item=item}„{$item}“{/implode}.]]></item>
+		<item name="wcf.form.field.numeric.error.invalid"><![CDATA[Der angegebene Wert ist keine gültige Zahl.]]></item>
 		<item name="wcf.form.field.numeric.error.maximum"><![CDATA[Der angegebene Wert darf nicht größer als {#$maximum} sein.]]></item>
 		<item name="wcf.form.field.numeric.error.minimum"><![CDATA[Der angegebene Wert darf nicht kleiner als {#$minimum} sein.]]></item>
 		<item name="wcf.form.field.option"><![CDATA[Einstellungen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 258713f67e7..a12c3ecc3f7 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3397,6 +3397,57 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.condition.timestamp.error.invalidEnd"><![CDATA[The end date is invalid.]]></item>
 		<item name="wcf.condition.timestamp.error.invalidStart"><![CDATA[The start date is invalid.]]></item>
 	</category>
+	<category name="wcf.objectFilter">
+		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
+		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$days}]]></item>
+		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>
+		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$pages}]]></item>
+		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[The end value is less than the start value.]]></item>
+		<item name="wcf.objectFilter.requestedPage"><![CDATA[Requested Page]]></item>
+		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Requested page is one of: {$pages}]]></item>
+		<item name="wcf.objectFilter.user.activated"><![CDATA[Account Activated]]></item>
+		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Account is not activated]]></item>
+		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Account is activated]]></item>
+		<item name="wcf.objectFilter.user.avatar"><![CDATA[Avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.avatar"><![CDATA[Has an avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.noAvatar"><![CDATA[Has no avatar]]></item>
+		<item name="wcf.objectFilter.user.banned"><![CDATA[Banned]]></item>
+		<item name="wcf.objectFilter.user.banned.summary.no"><![CDATA[Is not banned]]></item>
+		<item name="wcf.objectFilter.user.banned.summary.yes"><![CDATA[Is banned]]></item>
+		<item name="wcf.objectFilter.user.birthday"><![CDATA[Birthday Today]]></item>
+		<item name="wcf.objectFilter.user.birthday.summary.no"><![CDATA[It is not their birthday today]]></item>
+		<item name="wcf.objectFilter.user.birthday.summary.yes"><![CDATA[It is their birthday today]]></item>
+		<item name="wcf.objectFilter.user.email"><![CDATA[Email Address]]></item>
+		<item name="wcf.objectFilter.user.email.summary"><![CDATA[Email address contains “{$value}”]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed"><![CDATA[Email Address Confirmed]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed.summary.no"><![CDATA[Does not have a confirmed email address]]></item>
+		<item name="wcf.objectFilter.user.emailConfirmed.summary.yes"><![CDATA[Has a confirmed email address]]></item>
+		<item name="wcf.objectFilter.user.group"><![CDATA[Member of User Group]]></item>
+		<item name="wcf.objectFilter.user.group.group"><![CDATA[User Group]]></item>
+		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Is a member of the user group “{$group}”]]></item>
+		<item name="wcf.objectFilter.user.integerProperty.summary"><![CDATA[{$title}: {if $from !== null && $to !== null}between {#$from} and {#$to}{elseif $from !== null}at least {#$from}{else}at most {#$to}{/if}]]></item>
+		<item name="wcf.objectFilter.user.language"><![CDATA[Language]]></item>
+		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Uses one of the languages: {$languages}]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser"><![CDATA[Mobile Browser]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser.summary.no"><![CDATA[Does not use a mobile browser]]></item>
+		<item name="wcf.objectFilter.user.mobileBrowser.summary.yes"><![CDATA[Uses a mobile browser]]></item>
+		<item name="wcf.objectFilter.user.multifactor"><![CDATA[Multi-factor Authentication]]></item>
+		<item name="wcf.objectFilter.user.multifactor.summary.no"><![CDATA[Multi-factor authentication is not enabled]]></item>
+		<item name="wcf.objectFilter.user.multifactor.summary.yes"><![CDATA[Multi-factor authentication is enabled]]></item>
+		<item name="wcf.objectFilter.user.noTrophy"><![CDATA[Has Not Received Trophy]]></item>
+		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Has not received the trophy “{$trophy}”]]></item>
+		<item name="wcf.objectFilter.user.notInGroup"><![CDATA[Not a Member of User Group]]></item>
+		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Is not a member of the user group “{$group}”]]></item>
+		<item name="wcf.objectFilter.user.registrationDate"><![CDATA[Registration Date]]></item>
+		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registered {if $from !== null && $to !== null}between {$from} and {$to}{elseif $from !== null}on or after {$from}{else}on or before {$to}{/if}]]></item>
+		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Days since Registration]]></item>
+		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registered {if $from !== null && $to !== null}{#$from} to {#$to} days ago{elseif $from !== null}at least {#$from} days ago{else}at most {#$to} days ago{/if}]]></item>
+		<item name="wcf.objectFilter.user.trophy"><![CDATA[Has Received Trophy]]></item>
+		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Has received the trophy “{$trophy}”]]></item>
+		<item name="wcf.objectFilter.user.trophy.trophy"><![CDATA[Trophy]]></item>
+		<item name="wcf.objectFilter.user.username"><![CDATA[Username]]></item>
+		<item name="wcf.objectFilter.user.username.summary"><![CDATA[Username contains “{$value}”]]></item>
+	</category>
 	<category name="wcf.contact">
 		<item name="wcf.contact.mail.subject"><![CDATA[New message via the contact form]]></item>
 		<item name="wcf.contact.mail.plaintext"><![CDATA[Hello,
@@ -3916,6 +3967,7 @@ Attachments:
 		<item name="wcf.form.field.className.error.nonExistent"><![CDATA[The entered class{if $language|isset} ({$language}){/if} does not exist.]]></item>
 		<item name="wcf.form.field.className.error.parentClass"><![CDATA[The entered class{if $language|isset} ({$language}){/if} does not extend <kbd>{$parentClass}</kbd>.]]></item>
 		<item name="wcf.form.field.itemList.error.separator"><![CDATA[The following items may contain no {if $separator === ','}comma{else if $separator === "\n"}newline{else}space{/if}: {implode from=$invalidItems item=item}“{$item}”{/implode}.]]></item>
+		<item name="wcf.form.field.numeric.error.invalid"><![CDATA[The entered value is not a valid number.]]></item>
 		<item name="wcf.form.field.numeric.error.maximum"><![CDATA[The entered value may not be greater than {#$maximum}.]]></item>
 		<item name="wcf.form.field.numeric.error.minimum"><![CDATA[The entered value may not be less than {#$minimum}.]]></item>
 		<item name="wcf.form.field.option"><![CDATA[Options]]></item>

From e5aca8555d43aed1d3486d39ae56499ab7f52eaa Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 12:30:53 +0200
Subject: [PATCH 25/47] Sort object filter options by localized title

---
 .../files/lib/action/ObjectFilterBuilderAction.class.php   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index 47b5a388837..c2e0bce3d3e 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -16,6 +16,7 @@
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\Psr15DialogForm;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
+use wcf\system\WCF;
 
 /**
  * Provides the dialog to configure a single filter of an object filter builder.
@@ -131,6 +132,12 @@ private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
             $selectValues[$filter->getIdentifier()] = $filter->getTitle();
         }
 
+        $collator = new \Collator(WCF::getLanguage()->getLocale());
+        \uasort(
+            $selectValues,
+            static fn(string $a, string $b) => $collator->compare($a, $b)
+        );
+
         $select->options($selectValues);
 
         $form->markRequiredFields(false);

From 552706d9def08d4185e4bd1efc6681f6277b0815 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 12:34:37 +0200
Subject: [PATCH 26/47] Require confirmation before removing an object filter

---
 .../Core/Component/Object/Filter/Builder.ts      | 16 ++++++++++++----
 .../Core/Component/Object/Filter/Builder.js      | 14 +++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index acf8fb535f9..b0f1032b5a9 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -10,6 +10,7 @@
  */
 
 import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
+import { confirmationFactory } from "../../Confirmation";
 import { dialogFactory } from "../../Dialog";
 import { getPhrase } from "WoltLabSuite/Core/Language";
 
@@ -90,20 +91,27 @@ class ObjectFilterBuilder {
   }
 
   /**
-   * Adds the given filter to the list, showing its summary and a button to remove it.
+   * Adds the given filter to the list, showing its summary and a button to remove it
+   * after a confirmation.
    */
   #createCondition(data: Response): void {
     const item = document.createElement("div");
     item.innerHTML = data.summary;
+    const title = item.textContent;
 
     const deleteButton = document.createElement("button");
     deleteButton.type = "button";
     deleteButton.classList.add("button", "small", "jsTooltip");
     deleteButton.title = getPhrase("wcf.global.button.delete");
     deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
-    deleteButton.addEventListener("click", () => {
-      this.#deleteCondition(item);
-    });
+    deleteButton.addEventListener(
+      "click",
+      promiseMutex(async () => {
+        if (await confirmationFactory().delete(title)) {
+          this.#deleteCondition(item);
+        }
+      }),
+    );
 
     item.append(deleteButton);
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 30791dc6460..4d509c409da 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -8,7 +8,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  */
-define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Dialog", "WoltLabSuite/Core/Language"], function (require, exports, PromiseMutex_1, Dialog_1, Language_1) {
+define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Confirmation", "../../Dialog", "WoltLabSuite/Core/Language"], function (require, exports, PromiseMutex_1, Confirmation_1, Dialog_1, Language_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.setup = setup;
@@ -56,19 +56,23 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Di
             }
         }
         /**
-         * Adds the given filter to the list, showing its summary and a button to remove it.
+         * Adds the given filter to the list, showing its summary and a button to remove it
+         * after a confirmation.
          */
         #createCondition(data) {
             const item = document.createElement("div");
             item.innerHTML = data.summary;
+            const title = item.textContent;
             const deleteButton = document.createElement("button");
             deleteButton.type = "button";
             deleteButton.classList.add("button", "small", "jsTooltip");
             deleteButton.title = (0, Language_1.getPhrase)("wcf.global.button.delete");
             deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
-            deleteButton.addEventListener("click", () => {
-                this.#deleteCondition(item);
-            });
+            deleteButton.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(async () => {
+                if (await (0, Confirmation_1.confirmationFactory)().delete(title)) {
+                    this.#deleteCondition(item);
+                }
+            }));
             item.append(deleteButton);
             this.#container.append(item);
             this.#conditions.set(item, data);

From 2015b30d1d47393294e22036790d0ab7da92f6b8 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 12:59:09 +0200
Subject: [PATCH 27/47] Allow editing configured object filters through a
 prefilled dialog

---
 .../Core/Component/Object/Filter/Builder.ts   | 41 ++++++++++++++++---
 .../Core/Component/Object/Filter/Builder.js   | 33 ++++++++++++---
 .../ObjectFilterBuilderAction.class.php       | 40 ++++++++++++++++--
 .../field/NumericRangeFormField.class.php     | 16 +++++++-
 .../object/filter/IObjectFilter.class.php     |  8 ++++
 .../date/DaysOfWeekObjectFilter.class.php     |  9 ++++
 .../NotRequestedPageObjectFilter.class.php    |  9 ++++
 .../page/RequestedPageObjectFilter.class.php  |  9 ++++
 .../user/UserActivatedObjectFilter.class.php  |  6 +++
 .../user/UserAvatarObjectFilter.class.php     |  6 +++
 .../user/UserBannedObjectFilter.class.php     |  6 +++
 .../user/UserBirthdayObjectFilter.class.php   |  6 +++
 .../UserEmailConfirmedObjectFilter.class.php  |  6 +++
 .../user/UserEmailObjectFilter.class.php      |  6 +++
 .../user/UserGroupObjectFilter.class.php      |  6 +++
 .../UserIntegerPropertyObjectFilter.class.php |  6 +++
 .../user/UserLanguageObjectFilter.class.php   |  9 ++++
 .../UserMobileBrowserObjectFilter.class.php   |  6 +++
 .../UserMultifactorObjectFilter.class.php     |  6 +++
 .../user/UserNoTrophyObjectFilter.class.php   |  6 +++
 .../user/UserNotInGroupObjectFilter.class.php |  6 +++
 ...UserRegistrationDateObjectFilter.class.php |  6 +++
 ...UserRegistrationDaysObjectFilter.class.php |  6 +++
 .../user/UserTrophyObjectFilter.class.php     |  6 +++
 .../user/UserUsernameObjectFilter.class.php   |  6 +++
 25 files changed, 253 insertions(+), 17 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index b0f1032b5a9..e335e7d7014 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -91,13 +91,41 @@ class ObjectFilterBuilder {
   }
 
   /**
-   * Adds the given filter to the list, showing its summary and a button to remove it
-   * after a confirmation.
+   * Opens the dialog prefilled with the given filter and replaces it with the result.
+   */
+  async #editFilter(item: HTMLElement, summary: HTMLElement): Promise<void> {
+    const data = this.#conditions.get(item)!;
+
+    const url = new URL(this.#endpoint, window.location.href);
+    url.searchParams.set("filter", data.identifier);
+    url.searchParams.set("value", data.value);
+
+    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(url.toString());
+    if (response.ok) {
+      summary.innerHTML = response.result.summary;
+      this.#conditions.set(item, response.result);
+    }
+  }
+
+  /**
+   * Adds the given filter to the list, showing its summary, a button to edit it
+   * and a button to remove it after a confirmation.
    */
   #createCondition(data: Response): void {
     const item = document.createElement("div");
-    item.innerHTML = data.summary;
-    const title = item.textContent;
+
+    const summary = document.createElement("span");
+    summary.innerHTML = data.summary;
+
+    const editButton = document.createElement("button");
+    editButton.type = "button";
+    editButton.classList.add("button", "small", "jsTooltip");
+    editButton.title = getPhrase("wcf.global.button.edit");
+    editButton.innerHTML = '<fa-icon name="pencil"></fa-icon>';
+    editButton.addEventListener(
+      "click",
+      promiseMutex(() => this.#editFilter(item, summary)),
+    );
 
     const deleteButton = document.createElement("button");
     deleteButton.type = "button";
@@ -107,13 +135,14 @@ class ObjectFilterBuilder {
     deleteButton.addEventListener(
       "click",
       promiseMutex(async () => {
-        if (await confirmationFactory().delete(title)) {
+        // Read the title when clicked, the summary changes when the filter is edited.
+        if (await confirmationFactory().delete(summary.textContent)) {
           this.#deleteCondition(item);
         }
       }),
     );
 
-    item.append(deleteButton);
+    item.append(summary, editButton, deleteButton);
 
     this.#container.append(item);
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 4d509c409da..82a189b086b 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -56,24 +56,45 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
             }
         }
         /**
-         * Adds the given filter to the list, showing its summary and a button to remove it
-         * after a confirmation.
+         * Opens the dialog prefilled with the given filter and replaces it with the result.
+         */
+        async #editFilter(item, summary) {
+            const data = this.#conditions.get(item);
+            const url = new URL(this.#endpoint, window.location.href);
+            url.searchParams.set("filter", data.identifier);
+            url.searchParams.set("value", data.value);
+            const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(url.toString());
+            if (response.ok) {
+                summary.innerHTML = response.result.summary;
+                this.#conditions.set(item, response.result);
+            }
+        }
+        /**
+         * Adds the given filter to the list, showing its summary, a button to edit it
+         * and a button to remove it after a confirmation.
          */
         #createCondition(data) {
             const item = document.createElement("div");
-            item.innerHTML = data.summary;
-            const title = item.textContent;
+            const summary = document.createElement("span");
+            summary.innerHTML = data.summary;
+            const editButton = document.createElement("button");
+            editButton.type = "button";
+            editButton.classList.add("button", "small", "jsTooltip");
+            editButton.title = (0, Language_1.getPhrase)("wcf.global.button.edit");
+            editButton.innerHTML = '<fa-icon name="pencil"></fa-icon>';
+            editButton.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#editFilter(item, summary)));
             const deleteButton = document.createElement("button");
             deleteButton.type = "button";
             deleteButton.classList.add("button", "small", "jsTooltip");
             deleteButton.title = (0, Language_1.getPhrase)("wcf.global.button.delete");
             deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
             deleteButton.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(async () => {
-                if (await (0, Confirmation_1.confirmationFactory)().delete(title)) {
+                // Read the title when clicked, the summary changes when the filter is edited.
+                if (await (0, Confirmation_1.confirmationFactory)().delete(summary.textContent)) {
                     this.#deleteCondition(item);
                 }
             }));
-            item.append(deleteButton);
+            item.append(summary, editButton, deleteButton);
             this.#container.append(item);
             this.#conditions.set(item, data);
         }
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index c2e0bce3d3e..ae06c45294e 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -13,6 +13,7 @@
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
+use wcf\system\form\builder\field\MultipleSelectionFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\Psr15DialogForm;
 use wcf\system\object\filter\builder\IObjectFilterBuilder;
@@ -26,6 +27,9 @@
  * the identifier of the chosen filter, a human-readable summary and the
  * serialized value of the filter.
  *
+ * An existing filter is edited by passing its identifier and its serialized
+ * value through the `filter` and `value` query parameters, which prefill the dialog.
+ *
  * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
@@ -41,6 +45,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             <<<'EOT'
                 array {
                     identifier: string,
+                    filter?: string,
+                    value?: string,
                 }
                 EOT
         );
@@ -57,7 +63,11 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             throw new PermissionDeniedException();
         }
 
-        $form = $this->getForm($builder);
+        $form = $this->getForm(
+            $builder,
+            $parameters['filter'] ?? null,
+            $parameters['value'] ?? null,
+        );
 
         if ($request->getMethod() === 'GET') {
             return $form->toResponse();
@@ -99,10 +109,16 @@ public function handle(ServerRequestInterface $request): ResponseInterface
      * Builds the dialog that offers a selection of the available filters.
      * The form field of each filter is only shown while it is selected.
      *
+     * If a filter identifier and its serialized value are given, the dialog is
+     * prefilled with them.
+     *
      * @param IObjectFilterBuilder<*> $builder
      */
-    private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
-    {
+    private function getForm(
+        IObjectFilterBuilder $builder,
+        ?string $filterIdentifier,
+        ?string $serializedValue,
+    ): Psr15DialogForm {
         $form = new Psr15DialogForm(
             static::class,
             'TODO: title',
@@ -130,6 +146,21 @@ private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
             $container->appendChild($formField);
 
             $selectValues[$filter->getIdentifier()] = $filter->getTitle();
+
+            if ($filter->getIdentifier() === $filterIdentifier && $serializedValue !== null) {
+                if ($formField instanceof MultipleSelectionFormField) {
+                    // Keep the remaining selection if some of the selected objects
+                    // have been deleted in the meantime.
+                    $formField->ignoreInvalidValues();
+                }
+
+                try {
+                    $formField->value($filter->toFormFieldValue($filter->unserializeValue($serializedValue)));
+                } catch (\InvalidArgumentException) {
+                    // The value is no longer valid, e.g. a selected object has
+                    // been deleted in the meantime, requiring a new value.
+                }
+            }
         }
 
         $collator = new \Collator(WCF::getLanguage()->getLocale());
@@ -139,6 +170,9 @@ private function getForm(IObjectFilterBuilder $builder): Psr15DialogForm
         );
 
         $select->options($selectValues);
+        if ($filterIdentifier !== null && isset($selectValues[$filterIdentifier])) {
+            $select->value($filterIdentifier);
+        }
 
         $form->markRequiredFields(false);
         $form->build();
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
index 805eff88dba..131389a4ab7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/NumericRangeFormField.class.php
@@ -142,13 +142,25 @@ public function value(mixed $value)
         }
 
         $this->value = [
-            'from' => $this->integerValues ? \intval($values[0]) : \floatval($values[0]),
-            'to' => $this->integerValues ? \intval($values[1]) : \floatval($values[1]),
+            'from' => $this->castValue($values[0]),
+            'to' => $this->castValue($values[1]),
         ];
 
         return $this;
     }
 
+    /**
+     * Casts a bound of the range to its numeric type, empty bounds are preserved.
+     */
+    private function castValue(string $value): int|float|string
+    {
+        if ($value === '') {
+            return '';
+        }
+
+        return $this->integerValues ? (int)$value : (float)$value;
+    }
+
     public function getFromValue(): string
     {
         return $this->value['from'] ?? '';
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index e41c0325639..f65eb2edf3d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -54,6 +54,14 @@ public function serializeValue(mixed $value): string;
      */
     public function unserializeValue(string $serializedValue): mixed;
 
+    /**
+     * Converts the given value into the value of the form field returned by
+     * `getFormField()`, used to prefill the form field when editing the filter.
+     *
+     * @param TValueType $value
+     */
+    public function toFormFieldValue(mixed $value): mixed;
+
     /**
      * Returns a human-readable summary of the configured value,
      * e.g. "In user group <strong>%s</strong>".
diff --git a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
index 041a885c077..e47f5f4cfb6 100644
--- a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
@@ -59,6 +59,15 @@ public function unserializeValue(string $serializedValue): array
         return \array_map(static fn($day) => (int)$day, \explode(',', $serializedValue));
     }
 
+    /**
+     * @return list<int>
+     */
+    #[\Override]
+    public function toFormFieldValue(mixed $value): array
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
index 661fae5ea02..7663d76d73d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
@@ -60,6 +60,15 @@ public function unserializeValue(string $serializedValue): array
         return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
     }
 
+    /**
+     * @return list<int>
+     */
+    #[\Override]
+    public function toFormFieldValue(mixed $value): array
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
index d054f2b802f..a5bce225e71 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
@@ -61,6 +61,15 @@ public function unserializeValue(string $serializedValue): array
         return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
     }
 
+    /**
+     * @return list<int>
+     */
+    #[\Override]
+    public function toFormFieldValue(mixed $value): array
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
index 9a5750ed453..be53a2a35db 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
@@ -52,6 +52,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 3814f3cea86..960eff2ea2b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -62,6 +62,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
index 6f891f86ba1..2d414f7da07 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
@@ -52,6 +52,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
index c8e3f89d5cb..c9bb8d27237 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
@@ -53,6 +53,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
index 106f54f753e..c3f79b2897b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
@@ -52,6 +52,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
index 8dd9051a4bd..220a524ef13 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
@@ -55,6 +55,12 @@ public function unserializeValue(string $serializedValue): string
         return $serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
index 3c9b12892a3..9b68a4c412d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
@@ -62,6 +62,12 @@ public function unserializeValue(string $serializedValue): int
         return (int)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): int
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
index 326b80bd1d9..30129acacca 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
@@ -79,6 +79,12 @@ public function unserializeValue(string $serializedValue): array
         ];
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $this->serializeValue($value);
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index f26749c1733..5c2e7a905da 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -61,6 +61,15 @@ public function unserializeValue(string $serializedValue): array
         return \array_map(static fn($languageID) => (int)$languageID, \explode(',', $serializedValue));
     }
 
+    /**
+     * @return list<int>
+     */
+    #[\Override]
+    public function toFormFieldValue(mixed $value): array
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
index e32df887dff..cbccdc326c4 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
@@ -55,6 +55,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
index 788ff404c55..8259cec5745 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
@@ -52,6 +52,12 @@ public function unserializeValue(string $serializedValue): bool
         return (bool)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
index af426e0b79f..d0ece9c2ed3 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
@@ -55,6 +55,12 @@ public function unserializeValue(string $serializedValue): int
         return (int)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): int
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
index bd1cb5a6ab2..47d1b717835 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
@@ -62,6 +62,12 @@ public function unserializeValue(string $serializedValue): int
         return (int)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): int
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
index 86a8aabcc9d..33976137b9c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
@@ -63,6 +63,12 @@ public function unserializeValue(string $serializedValue): array
         return $this->splitRange($serializedValue);
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $this->serializeValue($value);
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
index 4bdc52fea42..0223021bc4c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
@@ -70,6 +70,12 @@ public function unserializeValue(string $serializedValue): array
         ];
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $this->serializeValue($value);
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
index aa6e1602345..a0b13982592 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
@@ -57,6 +57,12 @@ public function unserializeValue(string $serializedValue): int
         return (int)$serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): int
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
index e38dd968050..727340fadb2 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
@@ -55,6 +55,12 @@ public function unserializeValue(string $serializedValue): string
         return $serializedValue;
     }
 
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $value;
+    }
+
     #[\Override]
     public function summarizeValue(mixed $value): string
     {

From 892d2e772eec472f112d9f0f193dac14cade3980 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 13:16:47 +0200
Subject: [PATCH 28/47] Extract base classes for boolean, selection,
 multi-selection and range object filters

---
 .../AbstractBooleanObjectFilter.class.php     |  72 +++++++++++
 ...actMultipleSelectionObjectFilter.class.php |  77 +++++++++++
 .../AbstractRangeObjectFilter.class.php       | 122 ++++++++++++++++++
 .../AbstractSelectionObjectFilter.class.php   | 103 +++++++++++++++
 .../filter/TRangeObjectFilter.class.php       |  63 ---------
 .../date/DaysOfWeekObjectFilter.class.php     |  56 ++------
 .../NotRequestedPageObjectFilter.class.php    |  49 ++-----
 .../page/RequestedPageObjectFilter.class.php  |  56 +++-----
 .../user/UserActivatedObjectFilter.class.php  |  45 +------
 .../user/UserAvatarObjectFilter.class.php     |  45 +------
 .../user/UserBannedObjectFilter.class.php     |  45 +------
 .../user/UserBirthdayObjectFilter.class.php   |  47 +------
 .../UserEmailConfirmedObjectFilter.class.php  |  45 +------
 .../user/UserGroupObjectFilter.class.php      |  43 +-----
 .../UserIntegerPropertyObjectFilter.class.php |  42 ++----
 .../user/UserLanguageObjectFilter.class.php   |  62 +++------
 .../UserMobileBrowserObjectFilter.class.php   |  47 +------
 .../UserMultifactorObjectFilter.class.php     |  45 +------
 .../user/UserNoTrophyObjectFilter.class.php   |  44 +------
 .../user/UserNotInGroupObjectFilter.class.php |  44 +------
 ...UserRegistrationDateObjectFilter.class.php |  37 ++----
 ...UserRegistrationDaysObjectFilter.class.php |  54 ++------
 .../user/UserTrophyObjectFilter.class.php     |  42 +-----
 wcfsetup/install/lang/de.xml                  |  22 ++--
 wcfsetup/install/lang/en.xml                  |  22 ++--
 25 files changed, 543 insertions(+), 786 deletions(-)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
 delete mode 100644 wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php

diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
new file mode 100644
index 00000000000..5dae43957cc
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\WCF;
+
+/**
+ * Default implementation of a filter whose value is a yes/no choice.
+ *
+ * The language item returned by `getLanguageItem()` is used as the title and
+ * the label of the form field, the summaries are read from the language items
+ * `<languageItem>.summary.yes` and `<languageItem>.summary.no`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @template TDatabaseObject of DatabaseObject
+ * @implements IObjectFilter<TDatabaseObject, bool>
+ */
+abstract class AbstractBooleanObjectFilter implements IObjectFilter
+{
+    /**
+     * Returns the language item of the title of this filter.
+     */
+    abstract protected function getLanguageItem(): string;
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->getLanguageItem());
+    }
+
+    #[\Override]
+    public function getFormField(): BooleanFormField
+    {
+        return BooleanFormField::create(\str_replace('.', '_', $this->getIdentifier()))
+            ->label($this->getLanguageItem());
+    }
+
+    /**
+     * @param bool|int $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return $value ? '1' : '0';
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): bool
+    {
+        return (bool)$serializedValue;
+    }
+
+    #[\Override]
+    public function toFormFieldValue(mixed $value): bool
+    {
+        return $value;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->get(
+            $this->getLanguageItem() . ($value ? '.summary.yes' : '.summary.no')
+        );
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
new file mode 100644
index 00000000000..cd29f493041
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\WCF;
+
+/**
+ * Default implementation of a filter whose value is a list of object ids, the
+ * tested object must match one of them.
+ *
+ * The language item returned by `getLanguageItem()` is used as the title, the
+ * summary is read from the language item `<languageItem>.summary` that receives
+ * the comma-separated labels of the selected objects as `$values`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @template TDatabaseObject of DatabaseObject
+ * @implements IObjectFilter<TDatabaseObject, list<int>>
+ */
+abstract class AbstractMultipleSelectionObjectFilter implements IObjectFilter
+{
+    /**
+     * Returns the language item of the title of this filter.
+     */
+    abstract protected function getLanguageItem(): string;
+
+    /**
+     * Returns the labels of the objects with the given ids, ids of unknown
+     * objects are skipped.
+     *
+     * @param list<int> $objectIDs
+     * @return list<string>
+     */
+    abstract protected function getLabels(array $objectIDs): array;
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->getLanguageItem());
+    }
+
+    /**
+     * @param list<int|string> $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return \implode(',', \array_map(static fn($objectID) => (int)$objectID, $value));
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        return \array_map(static fn($objectID) => (int)$objectID, \explode(',', $serializedValue));
+    }
+
+    /**
+     * @return list<int>
+     */
+    #[\Override]
+    public function toFormFieldValue(mixed $value): array
+    {
+        return $value;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable($this->getLanguageItem() . '.summary', [
+            'values' => \implode(', ', $this->getLabels($value)),
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
new file mode 100644
index 00000000000..ef4b41d2ffb
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\form\builder\field\DateRangeFormField;
+use wcf\system\form\builder\field\IFormField;
+use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\form\builder\field\validation\FormFieldValidator;
+use wcf\system\WCF;
+
+/**
+ * Default implementation of a filter whose value is a range with an optional
+ * lower and an optional upper bound, serialized as `from;to`. At least one
+ * bound is required.
+ *
+ * The language item returned by `getLanguageItem()` is used as the title, the
+ * summary is read from the language item `<languageItem>.summary` that receives
+ * the bounds as `$from` and `$to`, missing bounds are `null`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @template TDatabaseObject of DatabaseObject
+ * @template TBound of int|string
+ * @implements IObjectFilter<TDatabaseObject, array{0: ?TBound, 1: ?TBound}>
+ */
+abstract class AbstractRangeObjectFilter implements IObjectFilter
+{
+    /**
+     * Returns the language item of the title of this filter.
+     */
+    abstract protected function getLanguageItem(): string;
+
+    /**
+     * Creates the form field to enter the range, the validation of the bounds
+     * is added by `getFormField()`.
+     */
+    abstract protected function createFormField(): DateRangeFormField|NumericRangeFormField;
+
+    /**
+     * Converts a non-empty bound into its native type.
+     *
+     * @return TBound
+     */
+    abstract protected function unserializeBound(string $bound): int|string;
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->getLanguageItem());
+    }
+
+    #[\Override]
+    public function getFormField(): DateRangeFormField|NumericRangeFormField
+    {
+        return $this->createFormField()
+            ->addValidator(new FormFieldValidator(
+                'range',
+                static function (IFormField $field) {
+                    \assert($field instanceof DateRangeFormField || $field instanceof NumericRangeFormField);
+                    $from = $field->getFromValue();
+                    $to = $field->getToValue();
+
+                    if ($from === '' && $to === '') {
+                        $field->addValidationError(
+                            new FormFieldValidationError('empty')
+                        );
+                    } elseif ($from !== '' && $to !== '' && $from > $to) {
+                        $field->addValidationError(
+                            new FormFieldValidationError(
+                                'endBeforeStart',
+                                'wcf.objectFilter.range.error.endBeforeStart'
+                            )
+                        );
+                    }
+                }
+            ));
+    }
+
+    /**
+     * @param string|array{0: ?TBound, 1: ?TBound} $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        [$from, $to] = \is_string($value) ? $this->unserializeValue($value) : $value;
+
+        return $from . ';' . $to;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): array
+    {
+        [$from, $to] = \explode(';', $serializedValue, 2) + [1 => ''];
+
+        return [
+            $from === '' ? null : $this->unserializeBound($from),
+            $to === '' ? null : $this->unserializeBound($to),
+        ];
+    }
+
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return $this->serializeValue($value);
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        [$from, $to] = $value;
+
+        return WCF::getLanguage()->getDynamicVariable($this->getLanguageItem() . '.summary', [
+            'from' => $from,
+            'to' => $to,
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
new file mode 100644
index 00000000000..c8ed84f7497
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\WCF;
+
+/**
+ * Default implementation of a filter whose value is a single object selected
+ * from a list, e.g. a user group. The value is the id of the selected object.
+ *
+ * The language item returned by `getLanguageItem()` is used as the title and
+ * the label of the form field, the summary is read from the language item
+ * `<languageItem>.summary` that receives the label of the selected object as
+ * `$value`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @template TDatabaseObject of DatabaseObject
+ * @implements IObjectFilter<TDatabaseObject, int>
+ */
+abstract class AbstractSelectionObjectFilter implements IObjectFilter
+{
+    /**
+     * @var array<int, string>
+     */
+    private array $options;
+
+    /**
+     * Returns the language item of the title of this filter.
+     */
+    abstract protected function getLanguageItem(): string;
+
+    /**
+     * Returns the labels of the selectable objects, indexed by their id and
+     * sorted in the order they are offered.
+     *
+     * @return array<int, string>
+     */
+    abstract protected function createOptions(): array;
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->getLanguageItem());
+    }
+
+    #[\Override]
+    public function getFormField(): SelectFormField
+    {
+        return SelectFormField::create(\str_replace('.', '_', $this->getIdentifier()))
+            ->label($this->getLanguageItem())
+            ->options($this->getOptions(), labelLanguageItems: false)
+            ->required();
+    }
+
+    /**
+     * @param int|string $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function toFormFieldValue(mixed $value): int
+    {
+        return $value;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable($this->getLanguageItem() . '.summary', [
+            'value' => $this->getOptions()[$value] ?? $value,
+        ]);
+    }
+
+    /**
+     * Returns the labels of the selectable objects, indexed by their id.
+     *
+     * @return array<int, string>
+     */
+    protected function getOptions(): array
+    {
+        if (!isset($this->options)) {
+            $this->options = $this->createOptions();
+        }
+
+        return $this->options;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php
deleted file mode 100644
index 16e8ddf85da..00000000000
--- a/wcfsetup/install/files/lib/system/object/filter/TRangeObjectFilter.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace wcf\system\object\filter;
-
-use wcf\system\form\builder\field\DateRangeFormField;
-use wcf\system\form\builder\field\IFormField;
-use wcf\system\form\builder\field\NumericRangeFormField;
-use wcf\system\form\builder\field\validation\FormFieldValidationError;
-use wcf\system\form\builder\field\validation\FormFieldValidator;
-
-/**
- * Provides the shared handling of filters whose value is a range with an
- * optional lower and an optional upper bound, serialized as `from;to`.
- *
- * @author      Marcel Werk
- * @copyright   2001-2026 WoltLab GmbH
- * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @since       6.3
- */
-trait TRangeObjectFilter
-{
-    /**
-     * Splits the serialized range into its lower and upper bound, empty bounds
-     * are returned as `null`.
-     *
-     * @return array{0: ?string, 1: ?string}
-     */
-    private function splitRange(string $value): array
-    {
-        [$from, $to] = \explode(';', $value, 2) + [1 => ''];
-
-        return [
-            $from === '' ? null : $from,
-            $to === '' ? null : $to,
-        ];
-    }
-
-    /**
-     * Returns the validator that requires at least one bound and rejects an
-     * upper bound that is lower than the lower bound.
-     */
-    private function getRangeValidator(): FormFieldValidator
-    {
-        return new FormFieldValidator(
-            'range',
-            static function (IFormField $field) {
-                \assert($field instanceof DateRangeFormField || $field instanceof NumericRangeFormField);
-                $from = $field->getFromValue();
-                $to = $field->getToValue();
-
-                if ($from === '' && $to === '') {
-                    $field->addValidationError(
-                        new FormFieldValidationError('empty')
-                    );
-                } elseif ($from !== '' && $to !== '' && $from > $to) {
-                    $field->addValidationError(
-                        new FormFieldValidationError('endBeforeStart', 'wcf.objectFilter.range.error.endBeforeStart')
-                    );
-                }
-            }
-        );
-    }
-}
diff --git a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
index e47f5f4cfb6..eaf6454fe0b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
@@ -5,7 +5,7 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\form\builder\field\MultipleSelectionFormField;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\WCF;
 use wcf\util\DateUtil;
 
@@ -19,9 +19,9 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectFilter<User, list<int>>
+ * @extends AbstractMultipleSelectionObjectFilter<User>
  */
-final class DaysOfWeekObjectFilter implements IObjectFilter
+final class DaysOfWeekObjectFilter extends AbstractMultipleSelectionObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -30,9 +30,18 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.daysOfWeek');
+        return 'wcf.objectFilter.daysOfWeek';
+    }
+
+    #[\Override]
+    protected function getLabels(array $objectIDs): array
+    {
+        return \array_values(\array_map(
+            static fn(string $day) => WCF::getLanguage()->get($day),
+            \array_intersect_key($this->getDays(), \array_flip($objectIDs)),
+        ));
     }
 
     #[\Override]
@@ -44,43 +53,6 @@ public function getFormField(): MultipleSelectionFormField
             ->required();
     }
 
-    /**
-     * @param list<int|string> $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return \implode(',', \array_map(static fn($day) => (int)$day, $value));
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        return \array_map(static fn($day) => (int)$day, \explode(',', $serializedValue));
-    }
-
-    /**
-     * @return list<int>
-     */
-    #[\Override]
-    public function toFormFieldValue(mixed $value): array
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        $days = \array_intersect_key($this->getDays(), \array_flip($value));
-
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.daysOfWeek.summary', [
-            'days' => \implode(', ', \array_map(
-                static fn(string $day) => WCF::getLanguage()->get($day),
-                $days,
-            )),
-        ]);
-    }
-
     #[\Override]
     public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
index 7663d76d73d..17f36157311 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\form\builder\field\PagesFormField;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\request\RequestHandler;
-use wcf\system\WCF;
 
 /**
  * Filters by whether the requested page is none of the pages with the given ids.
@@ -21,9 +20,9 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectFilter<User, list<int>>
+ * @extends AbstractMultipleSelectionObjectFilter<User>
  */
-final class NotRequestedPageObjectFilter implements IObjectFilter
+final class NotRequestedPageObjectFilter extends AbstractMultipleSelectionObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -32,49 +31,23 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.notRequestedPage');
+        return 'wcf.objectFilter.notRequestedPage';
     }
 
     #[\Override]
-    public function getFormField(): PagesFormField
-    {
-        return PagesFormField::create('notRequestedPage')
-            ->label('wcf.page.requestedPage')
-            ->required();
-    }
-
-    /**
-     * @param list<int|string> $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return \implode(',', \array_map(static fn($pageID) => (int)$pageID, $value));
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
-    }
-
-    /**
-     * @return list<int>
-     */
-    #[\Override]
-    public function toFormFieldValue(mixed $value): array
+    protected function getLabels(array $objectIDs): array
     {
-        return $value;
+        return RequestedPageObjectFilter::getPageTitles($objectIDs);
     }
 
     #[\Override]
-    public function summarizeValue(mixed $value): string
+    public function getFormField(): PagesFormField
     {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.notRequestedPage.summary', [
-            'pages' => RequestedPageObjectFilter::getPageTitles($value),
-        ]);
+        return PagesFormField::create('notRequestedPage')
+            ->label('wcf.page.requestedPage')
+            ->required();
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
index a5bce225e71..a265b723e4c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
@@ -6,9 +6,8 @@
 use wcf\data\page\PageCache;
 use wcf\data\user\User;
 use wcf\system\form\builder\field\PagesFormField;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\request\RequestHandler;
-use wcf\system\WCF;
 
 /**
  * Filters by whether the requested page is one of the pages with the given ids.
@@ -22,9 +21,9 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectFilter<User, list<int>>
+ * @extends AbstractMultipleSelectionObjectFilter<User>
  */
-final class RequestedPageObjectFilter implements IObjectFilter
+final class RequestedPageObjectFilter extends AbstractMultipleSelectionObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -33,49 +32,23 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.requestedPage');
+        return 'wcf.objectFilter.requestedPage';
     }
 
     #[\Override]
-    public function getFormField(): PagesFormField
-    {
-        return PagesFormField::create('requestedPage')
-            ->label('wcf.page.requestedPage')
-            ->required();
-    }
-
-    /**
-     * @param list<int|string> $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return \implode(',', \array_map(static fn($pageID) => (int)$pageID, $value));
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        return \array_map(static fn($pageID) => (int)$pageID, \explode(',', $serializedValue));
-    }
-
-    /**
-     * @return list<int>
-     */
-    #[\Override]
-    public function toFormFieldValue(mixed $value): array
+    protected function getLabels(array $objectIDs): array
     {
-        return $value;
+        return RequestedPageObjectFilter::getPageTitles($objectIDs);
     }
 
     #[\Override]
-    public function summarizeValue(mixed $value): string
+    public function getFormField(): PagesFormField
     {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.requestedPage.summary', [
-            'pages' => RequestedPageObjectFilter::getPageTitles($value),
-        ]);
+        return PagesFormField::create('requestedPage')
+            ->label('wcf.page.requestedPage')
+            ->required();
     }
 
     #[\Override]
@@ -90,12 +63,13 @@ public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     }
 
     /**
-     * Returns the comma-separated titles of the pages with the given ids.
+     * Returns the titles of the pages with the given ids, unknown pages are skipped.
      *
      * @param list<int> $pageIDs
+     * @return list<string>
      * @internal
      */
-    public static function getPageTitles(array $pageIDs): string
+    public static function getPageTitles(array $pageIDs): array
     {
         $titles = [];
         foreach ($pageIDs as $pageID) {
@@ -105,6 +79,6 @@ public static function getPageTitles(array $pageIDs): string
             }
         }
 
-        return \implode(', ', $titles);
+        return $titles;
     }
 }
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
index be53a2a35db..8b3f374a2f8 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserActivatedObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether their account has been activated. Guests never match.
@@ -17,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractBooleanObjectFilter<User>
  * @implements IObjectListFilter<User, bool>
  */
-final class UserActivatedObjectFilter implements IObjectListFilter
+final class UserActivatedObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -28,44 +28,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.activated');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userActivated')
-            ->label('wcf.objectFilter.user.activated');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.activated.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.activated.summary.no');
+        return 'wcf.objectFilter.user.activated';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
index 960eff2ea2b..d381259b25b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserAvatarObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether they have an avatar. Guests never match.
@@ -17,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractBooleanObjectFilter<User>
  * @implements IObjectListFilter<User, bool>
  */
-final class UserAvatarObjectFilter implements IObjectListFilter
+final class UserAvatarObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -28,16 +28,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.avatar');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userAvatar')
-            ->label('wcf.user.avatar');
+        return 'wcf.objectFilter.user.avatar';
     }
 
     #[\Override]
@@ -50,34 +43,6 @@ public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed
         }
     }
 
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.avatar.summary.avatar');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.avatar.summary.noAvatar');
-    }
-
     #[\Override]
     public function testObject(DatabaseObject $object, mixed $configuredValue): bool
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
index 2d414f7da07..2845beb63b3 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBannedObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether they are banned. Guests never match.
@@ -17,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractBooleanObjectFilter<User>
  * @implements IObjectListFilter<User, bool>
  */
-final class UserBannedObjectFilter implements IObjectListFilter
+final class UserBannedObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -28,44 +28,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.banned');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userBanned')
-            ->label('wcf.objectFilter.user.banned');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.banned.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.banned.summary.no');
+        return 'wcf.objectFilter.user.banned';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
index c9bb8d27237..75975468b15 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserBirthdayObjectFilter.class.php
@@ -4,10 +4,8 @@
 
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
-use wcf\system\form\builder\field\BooleanFormField;
-use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\user\UserBirthdayCache;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether it is their birthday today, based on the time zone
@@ -18,9 +16,9 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectFilter<User, bool>
+ * @extends AbstractBooleanObjectFilter<User>
  */
-final class UserBirthdayObjectFilter implements IObjectFilter
+final class UserBirthdayObjectFilter extends AbstractBooleanObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -29,44 +27,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.birthday');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userBirthday')
-            ->label('wcf.objectFilter.user.birthday');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.birthday.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.birthday.summary.no');
+        return 'wcf.objectFilter.user.birthday';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
index c3f79b2897b..3f6ea29c493 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailConfirmedObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether they have confirmed their email address. Guests never match.
@@ -17,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractBooleanObjectFilter<User>
  * @implements IObjectListFilter<User, bool>
  */
-final class UserEmailConfirmedObjectFilter implements IObjectListFilter
+final class UserEmailConfirmedObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -28,44 +28,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userEmailConfirmed')
-            ->label('wcf.objectFilter.user.emailConfirmed');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.emailConfirmed.summary.no');
+        return 'wcf.objectFilter.user.emailConfirmed';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
index 9b68a4c412d..e7e6f623d6b 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserGroupObjectFilter.class.php
@@ -6,9 +6,8 @@
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\AbstractSelectionObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users that are a member of the user group with the given id.
@@ -18,9 +17,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractSelectionObjectFilter<User>
  * @implements IObjectListFilter<User, int>
  */
-final class UserGroupObjectFilter implements IObjectListFilter
+final class UserGroupObjectFilter extends AbstractSelectionObjectFilter implements IObjectListFilter
 {
     /**
      * @param bool $includeGuests offers the guest group for selection, only useful if guests are tested
@@ -36,44 +36,15 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.group');
+        return 'wcf.objectFilter.user.group';
     }
 
     #[\Override]
-    public function getFormField(): SelectFormField
+    protected function createOptions(): array
     {
-        return SelectFormField::create('userGroup')
-            ->label('wcf.objectFilter.user.group.group')
-            ->options(UserGroupObjectFilter::getSelectableGroups($this->includeGuests), labelLanguageItems: false)
-            ->required();
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return (string)$value;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): int
-    {
-        return (int)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): int
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.group.summary', [
-            'group' => UserGroup::getGroupByID($value)?->getName() ?? $value,
-        ]);
+        return UserGroupObjectFilter::getSelectableGroups($this->includeGuests);
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
index 30129acacca..aa61340f7bb 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
@@ -6,8 +6,8 @@
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\object\filter\AbstractRangeObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\object\filter\TRangeObjectFilter;
 use wcf\system\WCF;
 
 /**
@@ -20,12 +20,11 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractRangeObjectFilter<User, int>
  * @implements IObjectListFilter<User, array{0: ?int, 1: ?int}>
  */
-final class UserIntegerPropertyObjectFilter implements IObjectListFilter
+final class UserIntegerPropertyObjectFilter extends AbstractRangeObjectFilter implements IObjectListFilter
 {
-    use TRangeObjectFilter;
-
     /**
      * @param string $propertyName name of the integer column in `wcf1_user`
      * @param string $languageItem language item of the title of the property
@@ -42,47 +41,24 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get($this->languageItem);
+        return $this->languageItem;
     }
 
     #[\Override]
-    public function getFormField(): NumericRangeFormField
+    protected function createFormField(): NumericRangeFormField
     {
         return NumericRangeFormField::create('user' . \ucfirst($this->propertyName))
             ->label($this->languageItem)
             ->integerValues()
-            ->minimum(0)
-            ->addValidator($this->getRangeValidator());
-    }
-
-    /**
-     * @param string|array{0: ?int, 1: ?int} $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        [$from, $to] = \is_string($value) ? $this->unserializeValue($value) : $value;
-
-        return $from . ';' . $to;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        [$from, $to] = $this->splitRange($serializedValue);
-
-        return [
-            $from === null ? null : (int)$from,
-            $to === null ? null : (int)$to,
-        ];
+            ->minimum(0);
     }
 
     #[\Override]
-    public function toFormFieldValue(mixed $value): string
+    protected function unserializeBound(string $bound): int
     {
-        return $this->serializeValue($value);
+        return (int)$bound;
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
index 5c2e7a905da..e8d4d652322 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserLanguageObjectFilter.class.php
@@ -7,6 +7,7 @@
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\MultipleSelectionFormField;
 use wcf\system\language\LanguageFactory;
+use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
 use wcf\system\WCF;
 
@@ -21,9 +22,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractMultipleSelectionObjectFilter<User>
  * @implements IObjectListFilter<User, list<int>>
  */
-final class UserLanguageObjectFilter implements IObjectListFilter
+final class UserLanguageObjectFilter extends AbstractMultipleSelectionObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -32,58 +34,32 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.language');
+        return 'wcf.objectFilter.user.language';
     }
 
     #[\Override]
-    public function getFormField(): MultipleSelectionFormField
-    {
-        return MultipleSelectionFormField::create('userLanguage')
-            ->label('wcf.user.condition.languages')
-            ->options(LanguageFactory::getInstance()->getLanguages())
-            ->required();
-    }
-
-    /**
-     * @param list<int|string> $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return \implode(',', \array_map(static fn($languageID) => (int)$languageID, $value));
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        return \array_map(static fn($languageID) => (int)$languageID, \explode(',', $serializedValue));
-    }
-
-    /**
-     * @return list<int>
-     */
-    #[\Override]
-    public function toFormFieldValue(mixed $value): array
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
+    protected function getLabels(array $objectIDs): array
     {
-        $languages = [];
-        foreach ($value as $languageID) {
+        $labels = [];
+        foreach ($objectIDs as $languageID) {
             $language = LanguageFactory::getInstance()->getLanguage($languageID);
             if ($language !== null) {
-                $languages[] = $language->__toString();
+                $labels[] = $language->__toString();
             }
         }
 
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.language.summary', [
-            'languages' => \implode(', ', $languages),
-        ]);
+        return $labels;
+    }
+
+    #[\Override]
+    public function getFormField(): MultipleSelectionFormField
+    {
+        return MultipleSelectionFormField::create('userLanguage')
+            ->label('wcf.user.condition.languages')
+            ->options(LanguageFactory::getInstance()->getLanguages())
+            ->required();
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
index cbccdc326c4..2e193d1eead 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMobileBrowserObjectFilter.class.php
@@ -4,9 +4,7 @@
 
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
-use wcf\system\form\builder\field\BooleanFormField;
-use wcf\system\object\filter\IObjectFilter;
-use wcf\system\WCF;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\util\UserUtil;
 
 /**
@@ -20,9 +18,9 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @implements IObjectFilter<User, bool>
+ * @extends AbstractBooleanObjectFilter<User>
  */
-final class UserMobileBrowserObjectFilter implements IObjectFilter
+final class UserMobileBrowserObjectFilter extends AbstractBooleanObjectFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -31,44 +29,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userMobileBrowser')
-            ->label('wcf.objectFilter.user.mobileBrowser');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.mobileBrowser.summary.no');
+        return 'wcf.objectFilter.user.mobileBrowser';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
index 8259cec5745..c8849510fe0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserMultifactorObjectFilter.class.php
@@ -5,9 +5,8 @@
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by whether they have enabled multi-factor authentication. Guests never match.
@@ -17,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractBooleanObjectFilter<User>
  * @implements IObjectListFilter<User, bool>
  */
-final class UserMultifactorObjectFilter implements IObjectListFilter
+final class UserMultifactorObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -28,44 +28,9 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor');
-    }
-
-    #[\Override]
-    public function getFormField(): BooleanFormField
-    {
-        return BooleanFormField::create('userMultifactor')
-            ->label('wcf.objectFilter.user.multifactor');
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return $value ? '1' : '0';
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): bool
-    {
-        return (bool)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): bool
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        if ($value) {
-            return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor.summary.yes');
-        }
-
-        return WCF::getLanguage()->get('wcf.objectFilter.user.multifactor.summary.no');
+        return 'wcf.objectFilter.user.multifactor';
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
index d0ece9c2ed3..43572e1920d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNoTrophyObjectFilter.class.php
@@ -3,12 +3,10 @@
 namespace wcf\system\object\filter\user;
 
 use wcf\data\DatabaseObject;
-use wcf\data\trophy\TrophyCache;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\AbstractSelectionObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users that have not received the trophy with the given id.
@@ -18,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractSelectionObjectFilter<User>
  * @implements IObjectListFilter<User, int>
  */
-final class UserNoTrophyObjectFilter implements IObjectListFilter
+final class UserNoTrophyObjectFilter extends AbstractSelectionObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -29,44 +28,15 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.noTrophy');
+        return 'wcf.objectFilter.user.noTrophy';
     }
 
     #[\Override]
-    public function getFormField(): SelectFormField
+    protected function createOptions(): array
     {
-        return SelectFormField::create('userNoTrophy')
-            ->label('wcf.objectFilter.user.trophy.trophy')
-            ->options(UserTrophyObjectFilter::getSelectableTrophies(), labelLanguageItems: false)
-            ->required();
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return (string)$value;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): int
-    {
-        return (int)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): int
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.noTrophy.summary', [
-            'trophy' => TrophyCache::getInstance()->getTrophyByID($value)?->getTitle() ?? $value,
-        ]);
+        return UserTrophyObjectFilter::getSelectableTrophies();
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
index 47d1b717835..aa90489c801 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserNotInGroupObjectFilter.class.php
@@ -3,12 +3,10 @@
 namespace wcf\system\object\filter\user;
 
 use wcf\data\DatabaseObject;
-use wcf\data\user\group\UserGroup;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\AbstractSelectionObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users that are not a member of the user group with the given id.
@@ -18,9 +16,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractSelectionObjectFilter<User>
  * @implements IObjectListFilter<User, int>
  */
-final class UserNotInGroupObjectFilter implements IObjectListFilter
+final class UserNotInGroupObjectFilter extends AbstractSelectionObjectFilter implements IObjectListFilter
 {
     /**
      * @param bool $includeGuests offers the guest group for selection, only useful if guests are tested
@@ -36,44 +35,15 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.notInGroup');
+        return 'wcf.objectFilter.user.notInGroup';
     }
 
     #[\Override]
-    public function getFormField(): SelectFormField
+    protected function createOptions(): array
     {
-        return SelectFormField::create('userNotInGroup')
-            ->label('wcf.objectFilter.user.group.group')
-            ->options(UserGroupObjectFilter::getSelectableGroups($this->includeGuests), labelLanguageItems: false)
-            ->required();
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return (string)$value;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): int
-    {
-        return (int)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): int
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.notInGroup.summary', [
-            'group' => UserGroup::getGroupByID($value)?->getName() ?? $value,
-        ]);
+        return UserGroupObjectFilter::getSelectableGroups($this->includeGuests);
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
index 33976137b9c..44f9c73e2a0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDateObjectFilter.class.php
@@ -6,8 +6,8 @@
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\DateRangeFormField;
+use wcf\system\object\filter\AbstractRangeObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\object\filter\TRangeObjectFilter;
 use wcf\system\WCF;
 
 /**
@@ -20,12 +20,11 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractRangeObjectFilter<User, string>
  * @implements IObjectListFilter<User, array{0: ?string, 1: ?string}>
  */
-final class UserRegistrationDateObjectFilter implements IObjectListFilter
+final class UserRegistrationDateObjectFilter extends AbstractRangeObjectFilter implements IObjectListFilter
 {
-    use TRangeObjectFilter;
-
     #[\Override]
     public function getIdentifier(): string
     {
@@ -33,40 +32,22 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.registrationDate');
+        return 'wcf.objectFilter.user.registrationDate';
     }
 
     #[\Override]
-    public function getFormField(): DateRangeFormField
+    protected function createFormField(): DateRangeFormField
     {
         return DateRangeFormField::create('userRegistrationDate')
-            ->label('wcf.user.condition.registrationDate')
-            ->addValidator($this->getRangeValidator());
-    }
-
-    /**
-     * @param string|array{0: ?string, 1: ?string} $value
-     */
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        [$from, $to] = \is_string($value) ? $this->splitRange($value) : $value;
-
-        return $from . ';' . $to;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        return $this->splitRange($serializedValue);
+            ->label('wcf.user.condition.registrationDate');
     }
 
     #[\Override]
-    public function toFormFieldValue(mixed $value): string
+    protected function unserializeBound(string $bound): string
     {
-        return $this->serializeValue($value);
+        return $bound;
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
index 0223021bc4c..8305c0d639e 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserRegistrationDaysObjectFilter.class.php
@@ -6,9 +6,8 @@
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\form\builder\field\NumericRangeFormField;
+use wcf\system\object\filter\AbstractRangeObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
-use wcf\system\object\filter\TRangeObjectFilter;
-use wcf\system\WCF;
 
 /**
  * Filters users by the number of days since their registration. The value
@@ -20,12 +19,11 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractRangeObjectFilter<User, int>
  * @implements IObjectListFilter<User, array{0: ?int, 1: ?int}>
  */
-final class UserRegistrationDaysObjectFilter implements IObjectListFilter
+final class UserRegistrationDaysObjectFilter extends AbstractRangeObjectFilter implements IObjectListFilter
 {
-    use TRangeObjectFilter;
-
     #[\Override]
     public function getIdentifier(): string
     {
@@ -33,58 +31,24 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.registrationDays');
+        return 'wcf.objectFilter.user.registrationDays';
     }
 
     #[\Override]
-    public function getFormField(): NumericRangeFormField
+    protected function createFormField(): NumericRangeFormField
     {
         return NumericRangeFormField::create('userRegistrationDays')
             ->label('wcf.user.condition.registrationDateInterval')
             ->integerValues()
-            ->minimum(0)
-            ->addValidator($this->getRangeValidator());
+            ->minimum(0);
     }
 
-    /**
-     * @param string|array{0: ?int, 1: ?int} $value
-     */
     #[\Override]
-    public function serializeValue(mixed $value): string
+    protected function unserializeBound(string $bound): int
     {
-        [$from, $to] = \is_string($value) ? $this->unserializeValue($value) : $value;
-
-        return $from . ';' . $to;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): array
-    {
-        [$from, $to] = $this->splitRange($serializedValue);
-
-        return [
-            $from === null ? null : (int)$from,
-            $to === null ? null : (int)$to,
-        ];
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): string
-    {
-        return $this->serializeValue($value);
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        [$from, $to] = $value;
-
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.registrationDays.summary', [
-            'from' => $from,
-            'to' => $to,
-        ]);
+        return (int)$bound;
     }
 
     #[\Override]
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
index a0b13982592..51a1f9c4477 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserTrophyObjectFilter.class.php
@@ -8,7 +8,7 @@
 use wcf\data\user\trophy\UserTrophyList;
 use wcf\data\user\User;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
-use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\object\filter\AbstractSelectionObjectFilter;
 use wcf\system\object\filter\IObjectListFilter;
 use wcf\system\WCF;
 
@@ -20,9 +20,10 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
+ * @extends AbstractSelectionObjectFilter<User>
  * @implements IObjectListFilter<User, int>
  */
-final class UserTrophyObjectFilter implements IObjectListFilter
+final class UserTrophyObjectFilter extends AbstractSelectionObjectFilter implements IObjectListFilter
 {
     #[\Override]
     public function getIdentifier(): string
@@ -31,44 +32,15 @@ public function getIdentifier(): string
     }
 
     #[\Override]
-    public function getTitle(): string
+    protected function getLanguageItem(): string
     {
-        return WCF::getLanguage()->get('wcf.objectFilter.user.trophy');
+        return 'wcf.objectFilter.user.trophy';
     }
 
     #[\Override]
-    public function getFormField(): SelectFormField
+    protected function createOptions(): array
     {
-        return SelectFormField::create('userTrophy')
-            ->label('wcf.objectFilter.user.trophy.trophy')
-            ->options(UserTrophyObjectFilter::getSelectableTrophies(), labelLanguageItems: false)
-            ->required();
-    }
-
-    #[\Override]
-    public function serializeValue(mixed $value): string
-    {
-        return (string)$value;
-    }
-
-    #[\Override]
-    public function unserializeValue(string $serializedValue): int
-    {
-        return (int)$serializedValue;
-    }
-
-    #[\Override]
-    public function toFormFieldValue(mixed $value): int
-    {
-        return $value;
-    }
-
-    #[\Override]
-    public function summarizeValue(mixed $value): string
-    {
-        return WCF::getLanguage()->getDynamicVariable('wcf.objectFilter.user.trophy.summary', [
-            'trophy' => TrophyCache::getInstance()->getTrophyByID($value)?->getTitle() ?? $value,
-        ]);
+        return UserTrophyObjectFilter::getSelectableTrophies();
     }
 
     #[\Override]
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b0b246414fa..672d04695b1 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3474,18 +3474,18 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 	</category>
 	<category name="wcf.objectFilter">
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
-		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$days}]]></item>
+		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$values}]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
-		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$pages}]]></item>
+		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[Der Endwert ist kleiner als der Startwert.]]></item>
 		<item name="wcf.objectFilter.requestedPage"><![CDATA[Aufgerufene Seite]]></item>
-		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Aufgerufene Seite ist eine von: {$pages}]]></item>
+		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Aufgerufene Seite ist eine von: {$values}]]></item>
 		<item name="wcf.objectFilter.user.activated"><![CDATA[Benutzerkonto aktiviert]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Benutzerkonto ist nicht aktiviert]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Benutzerkonto ist aktiviert]]></item>
 		<item name="wcf.objectFilter.user.avatar"><![CDATA[Avatar]]></item>
-		<item name="wcf.objectFilter.user.avatar.summary.avatar"><![CDATA[Hat einen Avatar]]></item>
-		<item name="wcf.objectFilter.user.avatar.summary.noAvatar"><![CDATA[Hat keinen Avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.no"><![CDATA[Hat keinen Avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.yes"><![CDATA[Hat einen Avatar]]></item>
 		<item name="wcf.objectFilter.user.banned"><![CDATA[Gesperrt]]></item>
 		<item name="wcf.objectFilter.user.banned.summary.no"><![CDATA[Ist nicht gesperrt]]></item>
 		<item name="wcf.objectFilter.user.banned.summary.yes"><![CDATA[Ist gesperrt]]></item>
@@ -3498,11 +3498,10 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.user.emailConfirmed.summary.no"><![CDATA[Hat keine bestätigte E-Mail-Adresse]]></item>
 		<item name="wcf.objectFilter.user.emailConfirmed.summary.yes"><![CDATA[Hat eine bestätigte E-Mail-Adresse]]></item>
 		<item name="wcf.objectFilter.user.group"><![CDATA[Mitglied der Benutzergruppe]]></item>
-		<item name="wcf.objectFilter.user.group.group"><![CDATA[Benutzergruppe]]></item>
-		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Ist Mitglied der Benutzergruppe „{$group}“]]></item>
+		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Ist Mitglied der Benutzergruppe „{$value}“]]></item>
 		<item name="wcf.objectFilter.user.integerProperty.summary"><![CDATA[{$title}: {if $from !== null && $to !== null}zwischen {#$from} und {#$to}{elseif $from !== null}mindestens {#$from}{else}höchstens {#$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.language"><![CDATA[Sprache]]></item>
-		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Verwendet eine der Sprachen: {$languages}]]></item>
+		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Verwendet eine der Sprachen: {$values}]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser"><![CDATA[Mobiler Browser]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser.summary.no"><![CDATA[Verwendet keinen mobilen Browser]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser.summary.yes"><![CDATA[Verwendet einen mobilen Browser]]></item>
@@ -3510,16 +3509,15 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.user.multifactor.summary.no"><![CDATA[Mehrfaktor-Authentifizierung ist nicht aktiv]]></item>
 		<item name="wcf.objectFilter.user.multifactor.summary.yes"><![CDATA[Mehrfaktor-Authentifizierung ist aktiv]]></item>
 		<item name="wcf.objectFilter.user.noTrophy"><![CDATA[Hat Trophäe nicht erhalten]]></item>
-		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Hat die Trophäe „{$trophy}“ nicht erhalten]]></item>
+		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Hat die Trophäe „{$value}“ nicht erhalten]]></item>
 		<item name="wcf.objectFilter.user.notInGroup"><![CDATA[Kein Mitglied der Benutzergruppe]]></item>
-		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Ist kein Mitglied der Benutzergruppe „{$group}“]]></item>
+		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Ist kein Mitglied der Benutzergruppe „{$value}“]]></item>
 		<item name="wcf.objectFilter.user.registrationDate"><![CDATA[Registrierungsdatum]]></item>
 		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registriert {if $from !== null && $to !== null}zwischen dem {$from} und dem {$to}{elseif $from !== null}am oder nach dem {$from}{else}am oder vor dem {$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Tage seit Registrierung]]></item>
 		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registriert vor {if $from !== null && $to !== null}{#$from} bis {#$to} Tagen{elseif $from !== null}mindestens {#$from} Tagen{else}höchstens {#$to} Tagen{/if}]]></item>
 		<item name="wcf.objectFilter.user.trophy"><![CDATA[Hat Trophäe erhalten]]></item>
-		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Hat die Trophäe „{$trophy}“ erhalten]]></item>
-		<item name="wcf.objectFilter.user.trophy.trophy"><![CDATA[Trophäe]]></item>
+		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Hat die Trophäe „{$value}“ erhalten]]></item>
 		<item name="wcf.objectFilter.user.username"><![CDATA[Benutzername]]></item>
 		<item name="wcf.objectFilter.user.username.summary"><![CDATA[Benutzername enthält „{$value}“]]></item>
 	</category>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a12c3ecc3f7..c31cda7f534 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3399,18 +3399,18 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 	</category>
 	<category name="wcf.objectFilter">
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
-		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$days}]]></item>
+		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$values}]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>
-		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$pages}]]></item>
+		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[The end value is less than the start value.]]></item>
 		<item name="wcf.objectFilter.requestedPage"><![CDATA[Requested Page]]></item>
-		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Requested page is one of: {$pages}]]></item>
+		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Requested page is one of: {$values}]]></item>
 		<item name="wcf.objectFilter.user.activated"><![CDATA[Account Activated]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Account is not activated]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Account is activated]]></item>
 		<item name="wcf.objectFilter.user.avatar"><![CDATA[Avatar]]></item>
-		<item name="wcf.objectFilter.user.avatar.summary.avatar"><![CDATA[Has an avatar]]></item>
-		<item name="wcf.objectFilter.user.avatar.summary.noAvatar"><![CDATA[Has no avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.no"><![CDATA[Has no avatar]]></item>
+		<item name="wcf.objectFilter.user.avatar.summary.yes"><![CDATA[Has an avatar]]></item>
 		<item name="wcf.objectFilter.user.banned"><![CDATA[Banned]]></item>
 		<item name="wcf.objectFilter.user.banned.summary.no"><![CDATA[Is not banned]]></item>
 		<item name="wcf.objectFilter.user.banned.summary.yes"><![CDATA[Is banned]]></item>
@@ -3423,11 +3423,10 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.user.emailConfirmed.summary.no"><![CDATA[Does not have a confirmed email address]]></item>
 		<item name="wcf.objectFilter.user.emailConfirmed.summary.yes"><![CDATA[Has a confirmed email address]]></item>
 		<item name="wcf.objectFilter.user.group"><![CDATA[Member of User Group]]></item>
-		<item name="wcf.objectFilter.user.group.group"><![CDATA[User Group]]></item>
-		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Is a member of the user group “{$group}”]]></item>
+		<item name="wcf.objectFilter.user.group.summary"><![CDATA[Is a member of the user group “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.integerProperty.summary"><![CDATA[{$title}: {if $from !== null && $to !== null}between {#$from} and {#$to}{elseif $from !== null}at least {#$from}{else}at most {#$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.language"><![CDATA[Language]]></item>
-		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Uses one of the languages: {$languages}]]></item>
+		<item name="wcf.objectFilter.user.language.summary"><![CDATA[Uses one of the languages: {$values}]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser"><![CDATA[Mobile Browser]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser.summary.no"><![CDATA[Does not use a mobile browser]]></item>
 		<item name="wcf.objectFilter.user.mobileBrowser.summary.yes"><![CDATA[Uses a mobile browser]]></item>
@@ -3435,16 +3434,15 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.user.multifactor.summary.no"><![CDATA[Multi-factor authentication is not enabled]]></item>
 		<item name="wcf.objectFilter.user.multifactor.summary.yes"><![CDATA[Multi-factor authentication is enabled]]></item>
 		<item name="wcf.objectFilter.user.noTrophy"><![CDATA[Has Not Received Trophy]]></item>
-		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Has not received the trophy “{$trophy}”]]></item>
+		<item name="wcf.objectFilter.user.noTrophy.summary"><![CDATA[Has not received the trophy “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.notInGroup"><![CDATA[Not a Member of User Group]]></item>
-		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Is not a member of the user group “{$group}”]]></item>
+		<item name="wcf.objectFilter.user.notInGroup.summary"><![CDATA[Is not a member of the user group “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.registrationDate"><![CDATA[Registration Date]]></item>
 		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registered {if $from !== null && $to !== null}between {$from} and {$to}{elseif $from !== null}on or after {$from}{else}on or before {$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Days since Registration]]></item>
 		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registered {if $from !== null && $to !== null}{#$from} to {#$to} days ago{elseif $from !== null}at least {#$from} days ago{else}at most {#$to} days ago{/if}]]></item>
 		<item name="wcf.objectFilter.user.trophy"><![CDATA[Has Received Trophy]]></item>
-		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Has received the trophy “{$trophy}”]]></item>
-		<item name="wcf.objectFilter.user.trophy.trophy"><![CDATA[Trophy]]></item>
+		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Has received the trophy “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.username"><![CDATA[Username]]></item>
 		<item name="wcf.objectFilter.user.username.summary"><![CDATA[Username contains “{$value}”]]></item>
 	</category>

From 7c66d8f841c7d76a042cb8c98aaa5b2cf6bee83d Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 13:43:55 +0200
Subject: [PATCH 29/47] Add localized label and icon to the add object filter
 button

---
 .../templates/shared_objectFilterFormField.tpl         |  1 +
 .../Core/Component/Object/Filter/Builder.ts            | 10 +++++++++-
 .../Core/Component/Object/Filter/Builder.js            |  7 ++++++-
 wcfsetup/install/lang/de.xml                           |  1 +
 wcfsetup/install/lang/en.xml                           |  1 +
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index f8765021b02..b7af14d1b21 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -2,6 +2,7 @@
 
 <script data-relocate="true">
 	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
+		{jsphrase name='wcf.objectFilter.addFilter'}
 		setup(
 			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
 			'{unsafe:$field->getEndpoint()|encodeJS}',
diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index e335e7d7014..4888ac853fe 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -46,7 +46,15 @@ class ObjectFilterBuilder {
     const button = document.createElement("button");
     button.type = "button";
     button.classList.add("button");
-    button.textContent = "TODO: add object filter";
+
+    const icon = document.createElement("fa-icon");
+    icon.setIcon("plus");
+    button.appendChild(icon);
+
+    const span = document.createElement("span");
+    span.textContent = getPhrase("wcf.objectFilter.addFilter");
+    button.appendChild(span);
+
     button.addEventListener(
       "click",
       promiseMutex(() => this.#addFilter()),
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 82a189b086b..cf77e9af9f7 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -22,7 +22,12 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
             const button = document.createElement("button");
             button.type = "button";
             button.classList.add("button");
-            button.textContent = "TODO: add object filter";
+            const icon = document.createElement("fa-icon");
+            icon.setIcon("plus");
+            button.appendChild(icon);
+            const span = document.createElement("span");
+            span.textContent = (0, Language_1.getPhrase)("wcf.objectFilter.addFilter");
+            button.appendChild(span);
             button.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#addFilter()));
             this.#container.insertAdjacentElement("beforebegin", button);
             const form = this.#container.closest("form");
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 672d04695b1..2b09ef65af3 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3473,6 +3473,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.condition.timestamp.error.invalidStart"><![CDATA[Das Startdatum ist ungültig.]]></item>
 	</category>
 	<category name="wcf.objectFilter">
+		<item name="wcf.objectFilter.addFilter"><![CDATA[Bedingung hinzufügen]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$values}]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c31cda7f534..89298995086 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3398,6 +3398,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.condition.timestamp.error.invalidStart"><![CDATA[The start date is invalid.]]></item>
 	</category>
 	<category name="wcf.objectFilter">
+		<item name="wcf.objectFilter.addFilter"><![CDATA[Add Condition]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$values}]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>

From 87bc2a9e2badeb36ad943e5847fd9bdbb8fdf771 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 15:31:12 +0200
Subject: [PATCH 30/47] Style object filter items as cards and move add button
 below the list

---
 .../shared_objectFilterFormField.tpl          |  2 +-
 .../Core/Component/Object/Filter/Builder.ts   |  9 +++++--
 .../Core/Component/Object/Filter/Builder.js   |  8 ++++--
 wcfsetup/install/files/style/layout/form.scss | 27 +++++++++++++++++++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index b7af14d1b21..9a18de763ef 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -1,4 +1,4 @@
-<div id="{$field->getPrefixedId()}"></div>
+<div id="{$field->getPrefixedId()}" class="objectFilter__container"></div>
 
 <script data-relocate="true">
 	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index 4888ac853fe..6cb0262a533 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -60,7 +60,7 @@ class ObjectFilterBuilder {
       promiseMutex(() => this.#addFilter()),
     );
 
-    this.#container.insertAdjacentElement("beforebegin", button);
+    this.#container.insertAdjacentElement("afterend", button);
 
     const form = this.#container.closest("form");
     let shadow: HTMLInputElement | undefined = undefined;
@@ -121,10 +121,14 @@ class ObjectFilterBuilder {
    */
   #createCondition(data: Response): void {
     const item = document.createElement("div");
+    item.classList.add("objectFilter__item");
 
     const summary = document.createElement("span");
     summary.innerHTML = data.summary;
 
+    const buttons = document.createElement("div");
+    buttons.classList.add("objectFilter__item__buttons");
+
     const editButton = document.createElement("button");
     editButton.type = "button";
     editButton.classList.add("button", "small", "jsTooltip");
@@ -150,7 +154,8 @@ class ObjectFilterBuilder {
       }),
     );
 
-    item.append(summary, editButton, deleteButton);
+    buttons.append(editButton, deleteButton);
+    item.append(summary, buttons);
 
     this.#container.append(item);
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index cf77e9af9f7..b754ef6495a 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -29,7 +29,7 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
             span.textContent = (0, Language_1.getPhrase)("wcf.objectFilter.addFilter");
             button.appendChild(span);
             button.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#addFilter()));
-            this.#container.insertAdjacentElement("beforebegin", button);
+            this.#container.insertAdjacentElement("afterend", button);
             const form = this.#container.closest("form");
             let shadow = undefined;
             form?.addEventListener("submit", () => {
@@ -80,8 +80,11 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
          */
         #createCondition(data) {
             const item = document.createElement("div");
+            item.classList.add("objectFilter__item");
             const summary = document.createElement("span");
             summary.innerHTML = data.summary;
+            const buttons = document.createElement("div");
+            buttons.classList.add("objectFilter__item__buttons");
             const editButton = document.createElement("button");
             editButton.type = "button";
             editButton.classList.add("button", "small", "jsTooltip");
@@ -99,7 +102,8 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
                     this.#deleteCondition(item);
                 }
             }));
-            item.append(summary, editButton, deleteButton);
+            buttons.append(editButton, deleteButton);
+            item.append(summary, buttons);
             this.#container.append(item);
             this.#conditions.set(item, data);
         }
diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss
index b3f78cfd927..d9dd1d16cda 100644
--- a/wcfsetup/install/files/style/layout/form.scss
+++ b/wcfsetup/install/files/style/layout/form.scss
@@ -409,3 +409,30 @@ html[data-color-scheme="dark"] .passwordStrengthScore {
 		grid-column: 1 / 3;
 	}
 }
+
+.objectFilter__container {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+
+.objectFilter__container:not(:empty) {
+	margin-bottom: 10px;
+}
+
+.objectFilter__item {
+	align-items: center;
+	background: var(--wcfContentBackground);
+	border: 1px solid var(--wcfContentBorderInner);
+	border-radius: var(--wcfBorderRadiusContainer);
+	display: flex;
+	gap: 10px;
+	justify-content: space-between;
+	padding: 12px;
+}
+
+.objectFilter__item__buttons {
+	display: flex;
+	flex-direction: row;
+	gap: 5px;
+}

From 7f08226b28dea3daf3a6ac49245cee7324617c18 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 15:56:21 +0200
Subject: [PATCH 31/47] Show an "AND" joiner between object filters

---
 .../shared_objectFilterFormField.tpl          |  1 +
 .../Core/Component/Object/Filter/Builder.ts   | 23 ++++++++++++++++++-
 .../Core/Component/Object/Filter/Builder.js   | 20 +++++++++++++++-
 wcfsetup/install/files/style/layout/form.scss | 18 +++++++++++++++
 wcfsetup/install/lang/de.xml                  |  1 +
 wcfsetup/install/lang/en.xml                  |  1 +
 6 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
index 9a18de763ef..2a64dc25fb0 100644
--- a/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_objectFilterFormField.tpl
@@ -3,6 +3,7 @@
 <script data-relocate="true">
 	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
 		{jsphrase name='wcf.objectFilter.addFilter'}
+		{jsphrase name='wcf.objectFilter.joiner'}
 		setup(
 			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
 			'{unsafe:$field->getEndpoint()|encodeJS}',
diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index 6cb0262a533..bdff1fcc6ce 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -157,15 +157,36 @@ class ObjectFilterBuilder {
     buttons.append(editButton, deleteButton);
     item.append(summary, buttons);
 
+    if (this.#conditions.size > 0) {
+      this.#container.append(this.#createJoiner());
+    }
     this.#container.append(item);
 
     this.#conditions.set(item, data);
   }
 
   /**
-   * Removes the given filter from the list.
+   * Creates the element that is shown between two filters, all filters must be satisfied.
+   */
+  #createJoiner(): HTMLElement {
+    const joiner = document.createElement("div");
+    joiner.classList.add("objectFilter__joiner");
+    joiner.textContent = getPhrase("wcf.objectFilter.joiner");
+
+    return joiner;
+  }
+
+  /**
+   * Removes the given filter from the list together with the joiner that
+   * separates it from the previous filter, or from the next filter if it is
+   * the first one.
    */
   #deleteCondition(element: HTMLElement): void {
+    const joiner = element.previousElementSibling ?? element.nextElementSibling;
+    if (joiner?.classList.contains("objectFilter__joiner")) {
+      joiner.remove();
+    }
+
     element.remove();
     this.#conditions.delete(element);
   }
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index b754ef6495a..55d2f772e55 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -104,13 +104,31 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
             }));
             buttons.append(editButton, deleteButton);
             item.append(summary, buttons);
+            if (this.#conditions.size > 0) {
+                this.#container.append(this.#createJoiner());
+            }
             this.#container.append(item);
             this.#conditions.set(item, data);
         }
         /**
-         * Removes the given filter from the list.
+         * Creates the element that is shown between two filters, all filters must be satisfied.
+         */
+        #createJoiner() {
+            const joiner = document.createElement("div");
+            joiner.classList.add("objectFilter__joiner");
+            joiner.textContent = (0, Language_1.getPhrase)("wcf.objectFilter.joiner");
+            return joiner;
+        }
+        /**
+         * Removes the given filter from the list together with the joiner that
+         * separates it from the previous filter, or from the next filter if it is
+         * the first one.
          */
         #deleteCondition(element) {
+            const joiner = element.previousElementSibling ?? element.nextElementSibling;
+            if (joiner?.classList.contains("objectFilter__joiner")) {
+                joiner.remove();
+            }
             element.remove();
             this.#conditions.delete(element);
         }
diff --git a/wcfsetup/install/files/style/layout/form.scss b/wcfsetup/install/files/style/layout/form.scss
index d9dd1d16cda..1be981df295 100644
--- a/wcfsetup/install/files/style/layout/form.scss
+++ b/wcfsetup/install/files/style/layout/form.scss
@@ -436,3 +436,21 @@ html[data-color-scheme="dark"] .passwordStrengthScore {
 	flex-direction: row;
 	gap: 5px;
 }
+
+.objectFilter__joiner {
+	align-items: center;
+	color: var(--wcfContentDimmedText);
+	display: flex;
+	gap: 10px;
+	padding-left: 20px;
+
+	@include wcfFontSmall;
+}
+
+.objectFilter__joiner::before {
+	background: var(--wcfContentBorderInner);
+	content: "";
+	height: 16px;
+	margin-left: -8px;
+	width: 1px;
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 2b09ef65af3..a382a718d23 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3476,6 +3476,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Bedingung hinzufügen]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$values}]]></item>
+		<item name="wcf.objectFilter.joiner"><![CDATA[UND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[Der Endwert ist kleiner als der Startwert.]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 89298995086..a5a6a131eb1 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3401,6 +3401,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Add Condition]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$values}]]></item>
+		<item name="wcf.objectFilter.joiner"><![CDATA[AND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[The end value is less than the start value.]]></item>

From e6ea2ad1d9177495a2745da4ffa92569ae3b710a Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 17:49:35 +0200
Subject: [PATCH 32/47] Move DaysOfWeekObjectFilter into the user filter
 namespace

---
 .../object/filter/builder/NoticeObjectFilterBuilder.class.php   | 2 +-
 .../filter/{date => user}/DaysOfWeekObjectFilter.class.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename wcfsetup/install/files/lib/system/object/filter/{date => user}/DaysOfWeekObjectFilter.class.php (98%)

diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index cfc47714fe9..eb0c897aacd 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -6,11 +6,11 @@
 use wcf\data\user\User;
 use wcf\event\notice\NoticeObjectFilterCollecting;
 use wcf\system\event\EventHandler;
-use wcf\system\object\filter\date\DaysOfWeekObjectFilter;
 use wcf\system\object\filter\IObjectFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\page\NotRequestedPageObjectFilter;
 use wcf\system\object\filter\page\RequestedPageObjectFilter;
+use wcf\system\object\filter\user\DaysOfWeekObjectFilter;
 use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserBannedObjectFilter;
diff --git a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/DaysOfWeekObjectFilter.class.php
similarity index 98%
rename from wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
rename to wcfsetup/install/files/lib/system/object/filter/user/DaysOfWeekObjectFilter.class.php
index eaf6454fe0b..86935c9d6ec 100644
--- a/wcfsetup/install/files/lib/system/object/filter/date/DaysOfWeekObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/DaysOfWeekObjectFilter.class.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace wcf\system\object\filter\date;
+namespace wcf\system\object\filter\user;
 
 use wcf\data\DatabaseObject;
 use wcf\data\user\User;

From da6dfdb74a1a0ed7f6c660fee76953c9e47cf05e Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 19:55:34 +0200
Subject: [PATCH 33/47] Move page object filters into the generic filter
 namespace

---
 .../lib/system/object/filter/IObjectFilter.class.php     | 1 +
 .../{page => }/NotRequestedPageObjectFilter.class.php    | 9 ++-------
 .../{page => }/RequestedPageObjectFilter.class.php       | 9 ++-------
 .../filter/builder/NoticeObjectFilterBuilder.class.php   | 4 ++--
 4 files changed, 7 insertions(+), 16 deletions(-)
 rename wcfsetup/install/files/lib/system/object/filter/{page => }/NotRequestedPageObjectFilter.class.php (83%)
 rename wcfsetup/install/files/lib/system/object/filter/{page => }/RequestedPageObjectFilter.class.php (87%)

diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index f65eb2edf3d..bb9cba0e114 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -18,6 +18,7 @@
  * @since       6.3
  *
  * @template TDatabaseObject of DatabaseObject
+ * @phpstan-template-contravariant TDatabaseObject of DatabaseObject
  * @template TValueType of mixed
  */
 interface IObjectFilter
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/NotRequestedPageObjectFilter.class.php
similarity index 83%
rename from wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
rename to wcfsetup/install/files/lib/system/object/filter/NotRequestedPageObjectFilter.class.php
index 17f36157311..d24e0a39fb1 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/NotRequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/NotRequestedPageObjectFilter.class.php
@@ -1,26 +1,21 @@
 <?php
 
-namespace wcf\system\object\filter\page;
+namespace wcf\system\object\filter;
 
 use wcf\data\DatabaseObject;
-use wcf\data\user\User;
 use wcf\system\form\builder\field\PagesFormField;
-use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\request\RequestHandler;
 
 /**
  * Filters by whether the requested page is none of the pages with the given ids.
  * Requests without an active page never match.
  *
- * The given user is ignored, therefore this filter is only meaningful when
- * testing the active user.
- *
  * @author      Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @extends AbstractMultipleSelectionObjectFilter<User>
+ * @extends AbstractMultipleSelectionObjectFilter<DatabaseObject>
  */
 final class NotRequestedPageObjectFilter extends AbstractMultipleSelectionObjectFilter
 {
diff --git a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/RequestedPageObjectFilter.class.php
similarity index 87%
rename from wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
rename to wcfsetup/install/files/lib/system/object/filter/RequestedPageObjectFilter.class.php
index a265b723e4c..bf8b495005d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/page/RequestedPageObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/RequestedPageObjectFilter.class.php
@@ -1,27 +1,22 @@
 <?php
 
-namespace wcf\system\object\filter\page;
+namespace wcf\system\object\filter;
 
 use wcf\data\DatabaseObject;
 use wcf\data\page\PageCache;
-use wcf\data\user\User;
 use wcf\system\form\builder\field\PagesFormField;
-use wcf\system\object\filter\AbstractMultipleSelectionObjectFilter;
 use wcf\system\request\RequestHandler;
 
 /**
  * Filters by whether the requested page is one of the pages with the given ids.
  * Requests without an active page never match.
  *
- * The given user is ignored, therefore this filter is only meaningful when
- * testing the active user.
- *
  * @author      Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since       6.3
  *
- * @extends AbstractMultipleSelectionObjectFilter<User>
+ * @extends AbstractMultipleSelectionObjectFilter<DatabaseObject>
  */
 final class RequestedPageObjectFilter extends AbstractMultipleSelectionObjectFilter
 {
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index eb0c897aacd..8ee67c490fc 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -7,9 +7,9 @@
 use wcf\event\notice\NoticeObjectFilterCollecting;
 use wcf\system\event\EventHandler;
 use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\NotRequestedPageObjectFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
-use wcf\system\object\filter\page\NotRequestedPageObjectFilter;
-use wcf\system\object\filter\page\RequestedPageObjectFilter;
+use wcf\system\object\filter\RequestedPageObjectFilter;
 use wcf\system\object\filter\user\DaysOfWeekObjectFilter;
 use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;

From c1670d916fec0c7500d3120a5f69b6583c8394e3 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sat, 26 Sep 2026 20:28:20 +0200
Subject: [PATCH 34/47] Add start and end date object filters for notices

---
 .../AbstractTimestampObjectFilter.class.php   | 75 +++++++++++++++++++
 .../filter/EndDateObjectFilter.class.php      | 36 +++++++++
 .../filter/StartDateObjectFilter.class.php    | 36 +++++++++
 .../NoticeObjectFilterBuilder.class.php       |  4 +
 wcfsetup/install/lang/de.xml                  |  4 +
 wcfsetup/install/lang/en.xml                  |  4 +
 6 files changed, 159 insertions(+)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/EndDateObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/StartDateObjectFilter.class.php

diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
new file mode 100644
index 00000000000..9898a21c1c1
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+use wcf\system\form\builder\field\DateFormField;
+use wcf\system\WCF;
+
+/**
+ * Default implementation of a filter whose value is a point in time, stored as
+ * a unix timestamp.
+ *
+ * The language item returned by `getLanguageItem()` is used as the title and
+ * the label of the form field, the summary is read from the language item
+ * `<languageItem>.summary` that receives the timestamp as `$value`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @template TDatabaseObject of DatabaseObject
+ * @implements IObjectFilter<TDatabaseObject, int>
+ */
+abstract class AbstractTimestampObjectFilter implements IObjectFilter
+{
+    /**
+     * Returns the language item of the title of this filter.
+     */
+    abstract protected function getLanguageItem(): string;
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->get($this->getLanguageItem());
+    }
+
+    #[\Override]
+    public function getFormField(): DateFormField
+    {
+        return DateFormField::create(\str_replace('.', '_', $this->getIdentifier()))
+            ->label($this->getLanguageItem())
+            ->supportTime()
+            ->required();
+    }
+
+    /**
+     * @param int|string $value
+     */
+    #[\Override]
+    public function serializeValue(mixed $value): string
+    {
+        return (string)(int)$value;
+    }
+
+    #[\Override]
+    public function unserializeValue(string $serializedValue): int
+    {
+        return (int)$serializedValue;
+    }
+
+    #[\Override]
+    public function toFormFieldValue(mixed $value): string
+    {
+        return (string)$value;
+    }
+
+    #[\Override]
+    public function summarizeValue(mixed $value): string
+    {
+        return WCF::getLanguage()->getDynamicVariable($this->getLanguageItem() . '.summary', [
+            'value' => $value,
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/EndDateObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/EndDateObjectFilter.class.php
new file mode 100644
index 00000000000..60d959ab9a2
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/EndDateObjectFilter.class.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+
+/**
+ * Filters by whether the current time is before the given point in time.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractTimestampObjectFilter<DatabaseObject>
+ */
+final class EndDateObjectFilter extends AbstractTimestampObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.endDate';
+    }
+
+    #[\Override]
+    protected function getLanguageItem(): string
+    {
+        return 'wcf.objectFilter.endDate';
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return \TIME_NOW < $configuredValue;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/StartDateObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/StartDateObjectFilter.class.php
new file mode 100644
index 00000000000..8a7e0e8237f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/StartDateObjectFilter.class.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace wcf\system\object\filter;
+
+use wcf\data\DatabaseObject;
+
+/**
+ * Filters by whether the current time is at or after the given point in time.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractTimestampObjectFilter<DatabaseObject>
+ */
+final class StartDateObjectFilter extends AbstractTimestampObjectFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.startDate';
+    }
+
+    #[\Override]
+    protected function getLanguageItem(): string
+    {
+        return 'wcf.objectFilter.startDate';
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        return \TIME_NOW >= $configuredValue;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index 8ee67c490fc..eee3f9095d6 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -6,10 +6,12 @@
 use wcf\data\user\User;
 use wcf\event\notice\NoticeObjectFilterCollecting;
 use wcf\system\event\EventHandler;
+use wcf\system\object\filter\EndDateObjectFilter;
 use wcf\system\object\filter\IObjectFilter;
 use wcf\system\object\filter\NotRequestedPageObjectFilter;
 use wcf\system\object\filter\ObjectFilterHandler;
 use wcf\system\object\filter\RequestedPageObjectFilter;
+use wcf\system\object\filter\StartDateObjectFilter;
 use wcf\system\object\filter\user\DaysOfWeekObjectFilter;
 use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
@@ -50,6 +52,8 @@ protected function createFilters(): array
         $event->register(new RequestedPageObjectFilter());
         $event->register(new NotRequestedPageObjectFilter());
         $event->register(new DaysOfWeekObjectFilter());
+        $event->register(new StartDateObjectFilter());
+        $event->register(new EndDateObjectFilter());
         $event->register(new UserUsernameObjectFilter());
         $event->register(new UserEmailObjectFilter());
         $event->register(new UserGroupObjectFilter(includeGuests: true));
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a382a718d23..f04ab27fc7d 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3476,12 +3476,16 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Bedingung hinzufügen]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$values}]]></item>
+		<item name="wcf.objectFilter.endDate"><![CDATA[Enddatum]]></item>
+		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Bis {$value|plainTime}]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[UND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[Der Endwert ist kleiner als der Startwert.]]></item>
 		<item name="wcf.objectFilter.requestedPage"><![CDATA[Aufgerufene Seite]]></item>
 		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Aufgerufene Seite ist eine von: {$values}]]></item>
+		<item name="wcf.objectFilter.startDate"><![CDATA[Startdatum]]></item>
+		<item name="wcf.objectFilter.startDate.summary"><![CDATA[Ab {$value|plainTime}]]></item>
 		<item name="wcf.objectFilter.user.activated"><![CDATA[Benutzerkonto aktiviert]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Benutzerkonto ist nicht aktiviert]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Benutzerkonto ist aktiviert]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a5a6a131eb1..b320bc0333e 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3401,12 +3401,16 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Add Condition]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$values}]]></item>
+		<item name="wcf.objectFilter.endDate"><![CDATA[End Date]]></item>
+		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Until {$value|plainTime}]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[AND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$values}]]></item>
 		<item name="wcf.objectFilter.range.error.endBeforeStart"><![CDATA[The end value is less than the start value.]]></item>
 		<item name="wcf.objectFilter.requestedPage"><![CDATA[Requested Page]]></item>
 		<item name="wcf.objectFilter.requestedPage.summary"><![CDATA[Requested page is one of: {$values}]]></item>
+		<item name="wcf.objectFilter.startDate"><![CDATA[Start Date]]></item>
+		<item name="wcf.objectFilter.startDate.summary"><![CDATA[From {$value|plainTime}]]></item>
 		<item name="wcf.objectFilter.user.activated"><![CDATA[Account Activated]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.no"><![CDATA[Account is not activated]]></item>
 		<item name="wcf.objectFilter.user.activated.summary.yes"><![CDATA[Account is activated]]></item>

From f85ebd678569b389324c3ed0d89dc8213aaa1bb4 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 11:41:40 +0200
Subject: [PATCH 35/47] Hide object filters without selectable options from the
 filter dialog

---
 .../files/lib/action/ObjectFilterBuilderAction.class.php | 4 ++++
 .../object/filter/AbstractBooleanObjectFilter.class.php  | 6 ++++++
 .../AbstractMultipleSelectionObjectFilter.class.php      | 6 ++++++
 .../object/filter/AbstractRangeObjectFilter.class.php    | 6 ++++++
 .../filter/AbstractSelectionObjectFilter.class.php       | 9 +++++++++
 .../filter/AbstractTimestampObjectFilter.class.php       | 6 ++++++
 .../lib/system/object/filter/IObjectFilter.class.php     | 7 +++++++
 .../object/filter/user/UserEmailObjectFilter.class.php   | 6 ++++++
 .../filter/user/UserUsernameObjectFilter.class.php       | 6 ++++++
 9 files changed, 56 insertions(+)

diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index ae06c45294e..38be5d71cba 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -135,6 +135,10 @@ private function getForm(
 
         $selectValues = [];
         foreach ($builder->getFilters() as $filter) {
+            if (!$filter->isAvailable()) {
+                continue;
+            }
+
             $formField = $filter->getFormField();
             $formField->addDependency(
                 ValueFormFieldDependency::create($formField->getId() . 'Dependency')
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
index 5dae43957cc..48dbe9012d0 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
@@ -41,6 +41,12 @@ public function getFormField(): BooleanFormField
             ->label($this->getLanguageItem());
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     /**
      * @param bool|int $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
index cd29f493041..3aaa96c6bfb 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
@@ -43,6 +43,12 @@ public function getTitle(): string
         return WCF::getLanguage()->get($this->getLanguageItem());
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     /**
      * @param list<int|string> $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
index ef4b41d2ffb..63245e673ad 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
@@ -81,6 +81,12 @@ static function (IFormField $field) {
             ));
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     /**
      * @param string|array{0: ?TBound, 1: ?TBound} $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
index c8ed84f7497..24e3b147f76 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
@@ -58,6 +58,15 @@ public function getFormField(): SelectFormField
             ->required();
     }
 
+    /**
+     * Returns false if there are no objects to choose from.
+     */
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return $this->getOptions() !== [];
+    }
+
     /**
      * @param int|string $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
index 9898a21c1c1..308b26433e9 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
@@ -44,6 +44,12 @@ public function getFormField(): DateFormField
             ->required();
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     /**
      * @param int|string $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index bb9cba0e114..836a9aec790 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -38,6 +38,13 @@ public function getTitle(): string;
      */
     public function getFormField(): AbstractFormField;
 
+    /**
+     * Returns true if this filter can be selected when configuring a filter,
+     * e.g. false if there are no objects to choose from. Stored values of an
+     * unavailable filter are still evaluated.
+     */
+    public function isAvailable(): bool;
+
     /**
      * Converts the given value into its string representation for storage.
      *
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
index 220a524ef13..0b07f3b80db 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
@@ -43,6 +43,12 @@ public function getFormField(): TextFormField
             ->required();
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     #[\Override]
     public function serializeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
index 727340fadb2..140588282f6 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
@@ -43,6 +43,12 @@ public function getFormField(): TextFormField
             ->required();
     }
 
+    #[\Override]
+    public function isAvailable(): bool
+    {
+        return true;
+    }
+
     #[\Override]
     public function serializeValue(mixed $value): string
     {

From 797b36e7472c5cca0c3f911faeafdf1ca9e83c18 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 11:42:34 +0200
Subject: [PATCH 36/47] Remove unused getFormFields() stub from
 ObjectFilterHandler

---
 .../filter/ObjectFilterHandler.class.php      | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
index 16c2fd71121..cfcecd02f3d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/ObjectFilterHandler.class.php
@@ -6,8 +6,6 @@
 use CuyZ\Valinor\Mapper\Source\Source;
 use CuyZ\Valinor\MapperBuilder;
 use wcf\data\DatabaseObject;
-use wcf\system\form\builder\field\SelectFormField;
-use wcf\system\WCF;
 
 /**
  * Evaluates the stored filter values against individual objects.
@@ -32,27 +30,6 @@ public function __construct(
         private readonly array $filters,
     ) {}
 
-    /**
-     * This method is intended to eventually take over the generation of the form in `ObjectFilterBuilderAction`.
-     */
-    public function getFormFields(): void
-    {
-        $filters = [];
-        foreach ($this->filters as $filter) {
-            $filters[$filter->getIdentifier()] = $filter->getTitle();
-        }
-
-        $collator = new \Collator(WCF::getLanguage()->getLocale());
-        \uasort(
-            $filters,
-            static fn($a, $b) => $collator->compare($a, $b)
-        );
-
-        $selection = SelectFormField::create('filter')
-            ->options($filters)
-            ->required();
-    }
-
     /**
      * Returns whether the given object satisfies all stored filter values.
      * Values of unknown filters are ignored.

From 0d52ced422ddcc917546a2ef05310ff6d01139e5 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 11:47:35 +0200
Subject: [PATCH 37/47] Replace placeholder dialog title and filter label in
 ObjectFilterBuilderAction with phrases

---
 .../files/lib/action/ObjectFilterBuilderAction.class.php    | 6 ++++--
 wcfsetup/install/lang/de.xml                                | 2 ++
 wcfsetup/install/lang/en.xml                                | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index 38be5d71cba..1e7df32b4d3 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -121,7 +121,9 @@ private function getForm(
     ): Psr15DialogForm {
         $form = new Psr15DialogForm(
             static::class,
-            'TODO: title',
+            WCF::getLanguage()->get(
+                $filterIdentifier === null ? 'wcf.objectFilter.addFilter' : 'wcf.objectFilter.editFilter'
+            ),
         );
 
         $container = FormContainer::create('container');
@@ -129,7 +131,7 @@ private function getForm(
         $form->appendChild($container);
 
         $select = SelectFormField::create('filter')
-            ->label('TODO: type')
+            ->label('wcf.objectFilter.filter')
             ->required();
         $container->appendChild($select);
 
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index f04ab27fc7d..c1dd7074b96 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3476,8 +3476,10 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Bedingung hinzufügen]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Wochentag]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Wochentag: {$values}]]></item>
+		<item name="wcf.objectFilter.editFilter"><![CDATA[Bedingung bearbeiten]]></item>
 		<item name="wcf.objectFilter.endDate"><![CDATA[Enddatum]]></item>
 		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Bis {$value|plainTime}]]></item>
+		<item name="wcf.objectFilter.filter"><![CDATA[Bedingung]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[UND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Aufgerufene Seite ist keine von: {$values}]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b320bc0333e..e28cbd95338 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3401,8 +3401,10 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.addFilter"><![CDATA[Add Condition]]></item>
 		<item name="wcf.objectFilter.daysOfWeek"><![CDATA[Day of the Week]]></item>
 		<item name="wcf.objectFilter.daysOfWeek.summary"><![CDATA[Day of the week: {$values}]]></item>
+		<item name="wcf.objectFilter.editFilter"><![CDATA[Edit Condition]]></item>
 		<item name="wcf.objectFilter.endDate"><![CDATA[End Date]]></item>
 		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Until {$value|plainTime}]]></item>
+		<item name="wcf.objectFilter.filter"><![CDATA[Condition]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[AND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>
 		<item name="wcf.objectFilter.notRequestedPage.summary"><![CDATA[Requested page is none of: {$values}]]></item>

From a5e6d573731292e669a8bca29e675dce068fefff Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 13:06:43 +0200
Subject: [PATCH 38/47] Add signature and cover photo filters

---
 .../NoticeObjectFilterBuilder.class.php       |  4 ++
 ...oupAssignmentObjectFilterBuilder.class.php |  4 ++
 .../user/UserCoverPhotoObjectFilter.class.php | 55 +++++++++++++++++++
 .../user/UserSignatureObjectFilter.class.php  | 55 +++++++++++++++++++
 wcfsetup/install/lang/de.xml                  |  6 ++
 wcfsetup/install/lang/en.xml                  |  6 ++
 6 files changed, 130 insertions(+)
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserCoverPhotoObjectFilter.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/user/UserSignatureObjectFilter.class.php

diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
index eee3f9095d6..2f807f3c441 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/NoticeObjectFilterBuilder.class.php
@@ -17,6 +17,7 @@
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserBannedObjectFilter;
 use wcf\system\object\filter\user\UserBirthdayObjectFilter;
+use wcf\system\object\filter\user\UserCoverPhotoObjectFilter;
 use wcf\system\object\filter\user\UserEmailConfirmedObjectFilter;
 use wcf\system\object\filter\user\UserEmailObjectFilter;
 use wcf\system\object\filter\user\UserGroupObjectFilter;
@@ -28,6 +29,7 @@
 use wcf\system\object\filter\user\UserNoTrophyObjectFilter;
 use wcf\system\object\filter\user\UserRegistrationDateObjectFilter;
 use wcf\system\object\filter\user\UserRegistrationDaysObjectFilter;
+use wcf\system\object\filter\user\UserSignatureObjectFilter;
 use wcf\system\object\filter\user\UserTrophyObjectFilter;
 use wcf\system\object\filter\user\UserUsernameObjectFilter;
 use wcf\system\WCF;
@@ -62,6 +64,8 @@ protected function createFilters(): array
         $event->register(new UserRegistrationDateObjectFilter());
         $event->register(new UserRegistrationDaysObjectFilter());
         $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserSignatureObjectFilter());
+        $event->register(new UserCoverPhotoObjectFilter());
         $event->register(new UserBannedObjectFilter());
         $event->register(new UserActivatedObjectFilter());
         $event->register(new UserEmailConfirmedObjectFilter());
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
index c7e6aa56b91..c8a22c6ac8c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/UserGroupAssignmentObjectFilterBuilder.class.php
@@ -13,6 +13,7 @@
 use wcf\system\object\filter\user\UserActivatedObjectFilter;
 use wcf\system\object\filter\user\UserAvatarObjectFilter;
 use wcf\system\object\filter\user\UserBannedObjectFilter;
+use wcf\system\object\filter\user\UserCoverPhotoObjectFilter;
 use wcf\system\object\filter\user\UserEmailConfirmedObjectFilter;
 use wcf\system\object\filter\user\UserEmailObjectFilter;
 use wcf\system\object\filter\user\UserGroupObjectFilter;
@@ -22,6 +23,7 @@
 use wcf\system\object\filter\user\UserNoTrophyObjectFilter;
 use wcf\system\object\filter\user\UserRegistrationDateObjectFilter;
 use wcf\system\object\filter\user\UserRegistrationDaysObjectFilter;
+use wcf\system\object\filter\user\UserSignatureObjectFilter;
 use wcf\system\object\filter\user\UserTrophyObjectFilter;
 use wcf\system\object\filter\user\UserUsernameObjectFilter;
 use wcf\system\WCF;
@@ -53,6 +55,8 @@ protected function createFilters(): array
         $event->register(new UserRegistrationDateObjectFilter());
         $event->register(new UserRegistrationDaysObjectFilter());
         $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserSignatureObjectFilter());
+        $event->register(new UserCoverPhotoObjectFilter());
         $event->register(new UserBannedObjectFilter());
         $event->register(new UserActivatedObjectFilter());
         $event->register(new UserEmailConfirmedObjectFilter());
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserCoverPhotoObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserCoverPhotoObjectFilter.class.php
new file mode 100644
index 00000000000..2618f36d48f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserCoverPhotoObjectFilter.class.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
+use wcf\system\object\filter\IObjectListFilter;
+
+/**
+ * Filters users by whether they have a cover photo. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractBooleanObjectFilter<User>
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserCoverPhotoObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userCoverPhoto';
+    }
+
+    #[\Override]
+    protected function getLanguageItem(): string
+    {
+        return 'wcf.objectFilter.user.coverPhoto';
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add("coverPhotoFileID IS NOT NULL");
+        } else {
+            $conditions->add("coverPhotoFileID IS NULL");
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === ($object->coverPhotoFileID !== null);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserSignatureObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserSignatureObjectFilter.class.php
new file mode 100644
index 00000000000..e70731f2e8a
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserSignatureObjectFilter.class.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace wcf\system\object\filter\user;
+
+use wcf\data\DatabaseObject;
+use wcf\data\user\User;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\object\filter\AbstractBooleanObjectFilter;
+use wcf\system\object\filter\IObjectListFilter;
+
+/**
+ * Filters users by whether they have a signature. Guests never match.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractBooleanObjectFilter<User>
+ * @implements IObjectListFilter<User, bool>
+ */
+final class UserSignatureObjectFilter extends AbstractBooleanObjectFilter implements IObjectListFilter
+{
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.userSignature';
+    }
+
+    #[\Override]
+    protected function getLanguageItem(): string
+    {
+        return 'wcf.objectFilter.user.signature';
+    }
+
+    #[\Override]
+    public function applyFilter(PreparedStatementConditionBuilder $conditions, mixed $value): void
+    {
+        if ($value) {
+            $conditions->add("(signature <> '' AND signature IS NOT NULL)");
+        } else {
+            $conditions->add("(signature = '' OR signature IS NULL)");
+        }
+    }
+
+    #[\Override]
+    public function testObject(DatabaseObject $object, mixed $configuredValue): bool
+    {
+        if ($object->isGuest()) {
+            return false;
+        }
+
+        return $configuredValue === ($object->signature !== '' && $object->signature !== null);
+    }
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index c1dd7074b96..a3f8de6efc1 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3500,6 +3500,9 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.user.birthday"><![CDATA[Geburtstag heute]]></item>
 		<item name="wcf.objectFilter.user.birthday.summary.no"><![CDATA[Hat heute nicht Geburtstag]]></item>
 		<item name="wcf.objectFilter.user.birthday.summary.yes"><![CDATA[Hat heute Geburtstag]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto"><![CDATA[Titelbild]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto.summary.no"><![CDATA[Hat kein Titelbild]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto.summary.yes"><![CDATA[Hat ein Titelbild]]></item>
 		<item name="wcf.objectFilter.user.email"><![CDATA[E-Mail-Adresse]]></item>
 		<item name="wcf.objectFilter.user.email.summary"><![CDATA[E-Mail-Adresse enthält „{$value}“]]></item>
 		<item name="wcf.objectFilter.user.emailConfirmed"><![CDATA[E-Mail-Adresse bestätigt]]></item>
@@ -3524,6 +3527,9 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registriert {if $from !== null && $to !== null}zwischen dem {$from} und dem {$to}{elseif $from !== null}am oder nach dem {$from}{else}am oder vor dem {$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Tage seit Registrierung]]></item>
 		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registriert vor {if $from !== null && $to !== null}{#$from} bis {#$to} Tagen{elseif $from !== null}mindestens {#$from} Tagen{else}höchstens {#$to} Tagen{/if}]]></item>
+		<item name="wcf.objectFilter.user.signature"><![CDATA[Signatur]]></item>
+		<item name="wcf.objectFilter.user.signature.summary.no"><![CDATA[Hat keine Signatur]]></item>
+		<item name="wcf.objectFilter.user.signature.summary.yes"><![CDATA[Hat eine Signatur]]></item>
 		<item name="wcf.objectFilter.user.trophy"><![CDATA[Hat Trophäe erhalten]]></item>
 		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Hat die Trophäe „{$value}“ erhalten]]></item>
 		<item name="wcf.objectFilter.user.username"><![CDATA[Benutzername]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e28cbd95338..32c795aa947 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3425,6 +3425,9 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.user.birthday"><![CDATA[Birthday Today]]></item>
 		<item name="wcf.objectFilter.user.birthday.summary.no"><![CDATA[It is not their birthday today]]></item>
 		<item name="wcf.objectFilter.user.birthday.summary.yes"><![CDATA[It is their birthday today]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto"><![CDATA[Cover Photo]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto.summary.no"><![CDATA[Has no cover photo]]></item>
+		<item name="wcf.objectFilter.user.coverPhoto.summary.yes"><![CDATA[Has a cover photo]]></item>
 		<item name="wcf.objectFilter.user.email"><![CDATA[Email Address]]></item>
 		<item name="wcf.objectFilter.user.email.summary"><![CDATA[Email address contains “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.emailConfirmed"><![CDATA[Email Address Confirmed]]></item>
@@ -3449,6 +3452,9 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.user.registrationDate.summary"><![CDATA[Registered {if $from !== null && $to !== null}between {$from} and {$to}{elseif $from !== null}on or after {$from}{else}on or before {$to}{/if}]]></item>
 		<item name="wcf.objectFilter.user.registrationDays"><![CDATA[Days since Registration]]></item>
 		<item name="wcf.objectFilter.user.registrationDays.summary"><![CDATA[Registered {if $from !== null && $to !== null}{#$from} to {#$to} days ago{elseif $from !== null}at least {#$from} days ago{else}at most {#$to} days ago{/if}]]></item>
+		<item name="wcf.objectFilter.user.signature"><![CDATA[Signature]]></item>
+		<item name="wcf.objectFilter.user.signature.summary.no"><![CDATA[Has no signature]]></item>
+		<item name="wcf.objectFilter.user.signature.summary.yes"><![CDATA[Has a signature]]></item>
 		<item name="wcf.objectFilter.user.trophy"><![CDATA[Has Received Trophy]]></item>
 		<item name="wcf.objectFilter.user.trophy.summary"><![CDATA[Has received the trophy “{$value}”]]></item>
 		<item name="wcf.objectFilter.user.username"><![CDATA[Username]]></item>

From ca3c7c74d5fee01754abb7fa30d4eb20a3be6d17 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 13:10:01 +0200
Subject: [PATCH 39/47] Migrate legacy notice and assignment conditions

---
 com.woltlab.wcf/package.xml                   |   1 +
 .../update_com.woltlab.wcf_6.3_conditions.php | 211 ++++++++++++++++++
 .../LegacyConditionMigration.class.php        | 210 +++++++++++++++++
 3 files changed, 422 insertions(+)
 create mode 100644 wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9fa19eea583..69eaa4bcdc8 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -69,6 +69,7 @@
 	Required order of the following steps for the update to 6.3:
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_likeObject.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step1.php</instruction>
+	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_conditions.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_styleTemplateGroup.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step2.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_embeddedObjects.php</instruction>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
new file mode 100644
index 00000000000..aebbc6d21f7
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
@@ -0,0 +1,211 @@
+<?php
+
+/**
+ * Migrates the legacy conditions of notices and user group assignments into
+ * object filters. Conditions that cannot be converted, e.g. those of apps, are
+ * kept and the affected notices and assignments are disabled.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ */
+
+use wcf\data\object\type\ObjectType;
+use wcf\system\condition\DaysOfWeekCondition;
+use wcf\system\condition\page\MultiPageCondition;
+use wcf\system\condition\UserAvatarCondition;
+use wcf\system\condition\UserBirthdayCondition;
+use wcf\system\condition\UserCoverPhotoCondition;
+use wcf\system\condition\UserEmailCondition;
+use wcf\system\condition\UserGroupCondition;
+use wcf\system\condition\UserIntegerPropertyCondition;
+use wcf\system\condition\UserLanguageCondition;
+use wcf\system\condition\UserMobileBrowserCondition;
+use wcf\system\condition\UserMultifactorCondition;
+use wcf\system\condition\UserRegistrationDateCondition;
+use wcf\system\condition\UserRegistrationDateIntervalCondition;
+use wcf\system\condition\UserSignatureCondition;
+use wcf\system\condition\UserStateCondition;
+use wcf\system\condition\UserTrophyCondition;
+use wcf\system\condition\UserUsernameCondition;
+use wcf\system\object\filter\migration\LegacyConditionMigration;
+
+/**
+ * Returns the given ids as a comma-separated list, or `null` if there are none.
+ */
+$idList = static function (mixed $ids): ?string {
+    if (!\is_array($ids) || $ids === []) {
+        return null;
+    }
+
+    return \implode(',', \array_map(static fn($id) => (int)$id, $ids));
+};
+
+/**
+ * Returns one filter per id, the ids are optional.
+ *
+ * @return list<array{0: string, 1: string}>
+ */
+$filterPerID = static function (string $identifier, mixed $ids): array {
+    if (!\is_array($ids)) {
+        return [];
+    }
+
+    return \array_values(\array_map(
+        static fn($id) => [$identifier, (string)(int)$id],
+        $ids,
+    ));
+};
+
+/**
+ * Converts a legacy yes/no value (`0` or `1`) into a boolean filter.
+ *
+ * @return ?list<array{0: string, 1: string}>
+ */
+$boolean = static function (string $identifier, mixed $value): ?array {
+    return match ((int)$value) {
+        0 => [[$identifier, '0']],
+        1 => [[$identifier, '1']],
+        default => null,
+    };
+};
+
+$converters = [
+    MultiPageCondition::class => static function (array $data) use ($idList): ?array {
+        $pageIDs = $idList($data['pageIDs'] ?? null);
+        if ($pageIDs === null) {
+            return null;
+        }
+
+        // Older conditions do not store the reverse logic flag.
+        $reverseLogic = (bool)($data['pageIDs_reverseLogic'] ?? false);
+        $identifier = $reverseLogic ? 'com.woltlab.wcf.notRequestedPage' : 'com.woltlab.wcf.requestedPage';
+
+        return [[$identifier, $pageIDs]];
+    },
+    DaysOfWeekCondition::class => static function (array $data) use ($idList): ?array {
+        $days = $idList($data['daysOfWeek'] ?? null);
+        if ($days === null) {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.daysOfWeek', $days]];
+    },
+    UserUsernameCondition::class => static function (array $data): ?array {
+        $username = (string)($data['username'] ?? '');
+        if ($username === '') {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.userUsername', $username]];
+    },
+    UserEmailCondition::class => static function (array $data): ?array {
+        $email = (string)($data['email'] ?? '');
+        if ($email === '') {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.userEmail', $email]];
+    },
+    UserGroupCondition::class => static function (array $data) use ($filterPerID): array {
+        return [
+            ...$filterPerID('com.woltlab.wcf.userGroup', $data['groupIDs'] ?? null),
+            ...$filterPerID('com.woltlab.wcf.userNotInGroup', $data['notGroupIDs'] ?? null),
+        ];
+    },
+    UserLanguageCondition::class => static function (array $data) use ($idList): ?array {
+        $languageIDs = $idList($data['languageIDs'] ?? null);
+        if ($languageIDs === null) {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.userLanguage', $languageIDs]];
+    },
+    UserRegistrationDateCondition::class => static function (array $data): ?array {
+        $start = (string)($data['registrationDateStart'] ?? '');
+        $end = (string)($data['registrationDateEnd'] ?? '');
+        if ($start === '' && $end === '') {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.userRegistrationDate', $start . ';' . $end]];
+    },
+    UserRegistrationDateIntervalCondition::class => static function (array $data): ?array {
+        $greaterThan = isset($data['greaterThan']) ? (string)(int)$data['greaterThan'] : '';
+        $lessThan = isset($data['lessThan']) ? (string)(int)$data['lessThan'] : '';
+        if ($greaterThan === '' && $lessThan === '') {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.userRegistrationDays', $greaterThan . ';' . $lessThan]];
+    },
+    UserAvatarCondition::class => static function (array $data) use ($boolean): ?array {
+        // The value `2` (Gravatar) is no longer supported and never matched.
+        return $boolean('com.woltlab.wcf.userAvatar', $data['userAvatar'] ?? null);
+    },
+    UserSignatureCondition::class => static function (array $data) use ($boolean): ?array {
+        return $boolean('com.woltlab.wcf.userSignature', $data['userSignature'] ?? null);
+    },
+    UserCoverPhotoCondition::class => static function (array $data) use ($boolean): ?array {
+        return $boolean('com.woltlab.wcf.userCoverPhoto', $data['userCoverPhoto'] ?? null);
+    },
+    UserStateCondition::class => static function (array $data) use ($boolean): ?array {
+        $filters = [];
+        foreach (
+            [
+                'userIsBanned' => 'com.woltlab.wcf.userBanned',
+                'userIsEnabled' => 'com.woltlab.wcf.userActivated',
+                'userIsEmailConfirmed' => 'com.woltlab.wcf.userEmailConfirmed',
+            ] as $key => $identifier
+        ) {
+            if (!isset($data[$key])) {
+                continue;
+            }
+
+            $filter = $boolean($identifier, $data[$key]);
+            if ($filter === null) {
+                return null;
+            }
+
+            \array_push($filters, ...$filter);
+        }
+
+        return $filters;
+    },
+    UserMobileBrowserCondition::class => static function (array $data) use ($boolean): ?array {
+        return $boolean('com.woltlab.wcf.userMobileBrowser', $data['usesMobileBrowser'] ?? null);
+    },
+    UserBirthdayCondition::class => static function (array $data) use ($boolean): ?array {
+        return $boolean('com.woltlab.wcf.userBirthday', $data['birthdayToday'] ?? null);
+    },
+    UserMultifactorCondition::class => static function (array $data) use ($boolean): ?array {
+        return $boolean('com.woltlab.wcf.userMultifactor', $data['multifactorActive'] ?? null);
+    },
+    UserIntegerPropertyCondition::class => static function (array $data, ObjectType $objectType): ?array {
+        // Properties of apps are migrated by the apps, which provide the matching filters.
+        $propertyName = $objectType->propertyname;
+        if (!\in_array($propertyName, ['activityPoints', 'likesReceived', 'trophyPoints'], true)) {
+            return null;
+        }
+
+        // The legacy bounds are exclusive, the bounds of the filter are inclusive.
+        $from = isset($data['greaterThan']) ? (string)((int)$data['greaterThan'] + 1) : '';
+        $to = isset($data['lessThan']) ? (string)((int)$data['lessThan'] - 1) : '';
+        if ($from === '' && $to === '') {
+            return null;
+        }
+
+        return [['com.woltlab.wcf.user' . \ucfirst($propertyName), $from . ';' . $to]];
+    },
+    UserTrophyCondition::class => static function (array $data) use ($filterPerID): array {
+        return [
+            ...$filterPerID('com.woltlab.wcf.userTrophy', $data['userTrophyIDs'] ?? null),
+            ...$filterPerID('com.woltlab.wcf.userNoTrophy', $data['notUserTrophyIDs'] ?? null),
+        ];
+    },
+];
+
+(new LegacyConditionMigration('com.woltlab.wcf.condition.notice', 'wcf1_notice', 'noticeID'))
+    ->migrate($converters);
+(new LegacyConditionMigration('com.woltlab.wcf.condition.userGroupAssignment', 'wcf1_user_group_assignment', 'assignmentID'))
+    ->migrate($converters);
diff --git a/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php b/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php
new file mode 100644
index 00000000000..e8a28b97ba9
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php
@@ -0,0 +1,210 @@
+<?php
+
+namespace wcf\system\object\filter\migration;
+
+use wcf\data\object\type\ObjectType;
+use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\WCF;
+
+/**
+ * Migrates the conditions of the legacy condition system (`wcf1_condition`)
+ * into the JSON-encoded object filters stored in the `conditions` column of
+ * the objects the conditions belong to.
+ *
+ * Only conditions whose object type has a converter and whose data could be
+ * converted are migrated and deleted. All other conditions are left untouched,
+ * allowing other packages to migrate them later. Objects with remaining legacy
+ * conditions are disabled, as evaluating only a part of their conditions would
+ * match more users than intended.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ * @deprecated  6.3 Only intended for the update to 6.3, will be removed with the next major version.
+ */
+final class LegacyConditionMigration
+{
+    /**
+     * @param string $definitionName name of the object type definition of the conditions, e.g. `com.woltlab.wcf.condition.notice`
+     * @param string $tableName name of the table of the objects, must have the columns `conditions` and `isDisabled`
+     * @param string $idColumn name of the id column of the table
+     */
+    public function __construct(
+        private readonly string $definitionName,
+        private readonly string $tableName,
+        private readonly string $idColumn,
+    ) {}
+
+    /**
+     * Migrates the conditions using the given converters, indexed by the class
+     * name of the condition object type.
+     *
+     * A converter receives the unserialized condition data and the object type
+     * and returns the list of `[filterIdentifier, serializedValue]` pairs that
+     * replace the condition, or `null` if the condition cannot be converted.
+     *
+     * @param array<string, callable(array<string, mixed>, ObjectType): ?list<array{0: string, 1: string}>> $converters
+     */
+    public function migrate(array $converters): void
+    {
+        $objectTypes = $this->getObjectTypes();
+        if ($objectTypes === []) {
+            return;
+        }
+
+        foreach ($this->getConditionsByObject(\array_keys($objectTypes)) as $objectID => $conditions) {
+            $filters = [];
+            $convertedConditionIDs = [];
+            $hasUnconvertedConditions = false;
+
+            foreach ($conditions as $condition) {
+                $objectType = $objectTypes[$condition['objectTypeID']];
+                $converter = $converters[$objectType->className] ?? null;
+
+                $result = null;
+                $conditionData = @\unserialize($condition['conditionData']);
+                if ($converter !== null && \is_array($conditionData)) {
+                    try {
+                        $result = $converter($conditionData, $objectType);
+                    } catch (\Throwable) {
+                        // Malformed legacy data must not break the update,
+                        // the condition is treated as not convertible.
+                        $result = null;
+                    }
+                }
+
+                if ($result === null) {
+                    $hasUnconvertedConditions = true;
+                } else {
+                    \array_push($filters, ...$result);
+                    $convertedConditionIDs[] = $condition['conditionID'];
+                }
+            }
+
+            $this->updateObject($objectID, $filters, $convertedConditionIDs, $hasUnconvertedConditions);
+        }
+    }
+
+    /**
+     * Returns the condition object types of the definition, indexed by their id.
+     *
+     * @return array<int, ObjectType>
+     */
+    private function getObjectTypes(): array
+    {
+        $sql = "SELECT      object_type.*
+                FROM        wcf1_object_type object_type
+                INNER JOIN  wcf1_object_type_definition definition
+                ON          definition.definitionID = object_type.definitionID
+                WHERE       definition.definitionName = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([$this->definitionName]);
+
+        $objectTypes = [];
+        while ($row = $statement->fetchArray()) {
+            $objectTypes[$row['objectTypeID']] = new ObjectType(null, $row);
+        }
+
+        return $objectTypes;
+    }
+
+    /**
+     * Returns the conditions of existing objects, grouped by the id of the object.
+     *
+     * @param list<int> $objectTypeIDs
+     * @return array<int, list<array{conditionID: int, objectTypeID: int, conditionData: string}>>
+     */
+    private function getConditionsByObject(array $objectTypeIDs): array
+    {
+        $conditionBuilder = new PreparedStatementConditionBuilder();
+        $conditionBuilder->add('condition_table.objectTypeID IN (?)', [$objectTypeIDs]);
+
+        // Conditions of deleted objects are skipped.
+        $sql = "SELECT      condition_table.conditionID, condition_table.objectTypeID,
+                            condition_table.objectID, condition_table.conditionData
+                FROM        wcf1_condition condition_table
+                INNER JOIN  {$this->tableName} object_table
+                ON          object_table.{$this->idColumn} = condition_table.objectID
+                {$conditionBuilder}
+                ORDER BY    condition_table.objectID, condition_table.conditionID";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute($conditionBuilder->getParameters());
+
+        $conditions = [];
+        while ($row = $statement->fetchArray()) {
+            $conditions[$row['objectID']][] = [
+                'conditionID' => $row['conditionID'],
+                'objectTypeID' => $row['objectTypeID'],
+                'conditionData' => $row['conditionData'],
+            ];
+        }
+
+        return $conditions;
+    }
+
+    /**
+     * Appends the given filters to the object, deletes the converted legacy
+     * conditions and disables the object if some conditions are left.
+     *
+     * @param list<array{0: string, 1: string}> $filters
+     * @param list<int> $convertedConditionIDs
+     */
+    private function updateObject(
+        int $objectID,
+        array $filters,
+        array $convertedConditionIDs,
+        bool $hasUnconvertedConditions
+    ): void {
+        WCF::getDB()->beginTransaction();
+        try {
+            if ($filters !== []) {
+                $sql = "SELECT  conditions
+                        FROM    {$this->tableName}
+                        WHERE   {$this->idColumn} = ?
+                        FOR UPDATE";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([$objectID]);
+                $existingFilters = \json_decode((string)$statement->fetchSingleColumn(), true);
+
+                // Keeps filters that were migrated by an earlier run, e.g. by another package.
+                if (\is_array($existingFilters)) {
+                    $filters = [...$existingFilters, ...$filters];
+                }
+
+                $sql = "UPDATE  {$this->tableName}
+                        SET     conditions = ?
+                        WHERE   {$this->idColumn} = ?";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([
+                    \json_encode($filters, \JSON_THROW_ON_ERROR),
+                    $objectID,
+                ]);
+            }
+
+            if ($convertedConditionIDs !== []) {
+                $conditionBuilder = new PreparedStatementConditionBuilder();
+                $conditionBuilder->add('conditionID IN (?)', [$convertedConditionIDs]);
+
+                $sql = "DELETE FROM wcf1_condition
+                        {$conditionBuilder}";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute($conditionBuilder->getParameters());
+            }
+
+            if ($hasUnconvertedConditions) {
+                $sql = "UPDATE  {$this->tableName}
+                        SET     isDisabled = ?
+                        WHERE   {$this->idColumn} = ?";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([1, $objectID]);
+            }
+
+            WCF::getDB()->commitTransaction();
+        } catch (\Throwable $e) {
+            WCF::getDB()->rollBackTransaction();
+
+            throw $e;
+        }
+    }
+}

From 723cbe717bdbe3e08dd8c1ac27943d62ead337ce Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 13:16:49 +0200
Subject: [PATCH 40/47] Deprecate legacy getConditions() on Notice and
 UserGroupAssignment

---
 wcfsetup/install/files/lib/data/notice/Notice.class.php          | 1 +
 .../lib/data/user/group/assignment/UserGroupAssignment.class.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/wcfsetup/install/files/lib/data/notice/Notice.class.php b/wcfsetup/install/files/lib/data/notice/Notice.class.php
index 129a14cf195..401f9e7bf55 100644
--- a/wcfsetup/install/files/lib/data/notice/Notice.class.php
+++ b/wcfsetup/install/files/lib/data/notice/Notice.class.php
@@ -67,6 +67,7 @@ public function __toString(): string
      * Returns the conditions of the notice.
      *
      * @return  Condition[]
+     * @deprecated 6.3 Use object filter API instead.
      */
     public function getConditions()
     {
diff --git a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
index bbe9fc9820e..022d7793619 100644
--- a/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
+++ b/wcfsetup/install/files/lib/data/user/group/assignment/UserGroupAssignment.class.php
@@ -27,6 +27,7 @@ class UserGroupAssignment extends DatabaseObject implements IRouteController
      * Returns the conditions of the automatic assignment to a user group.
      *
      * @return  Condition[]
+     * @deprecated 6.3 Use object filter API instead.
      */
     public function getConditions()
     {

From cf5e4ae25131dc500158889aa220e6b1ee10f2e6 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 13:23:24 +0200
Subject: [PATCH 41/47] Prevent non-repeatable object filters from being added
 more than once

---
 .../Core/Component/Object/Filter/Builder.ts   | 22 +++++++++++++++++--
 .../Core/Component/Object/Filter/Builder.js   | 19 ++++++++++++++--
 .../ObjectFilterBuilderAction.class.php       | 12 +++++++++-
 .../field/ObjectFilterFormField.class.php     | 19 ++++++++++++++++
 .../AbstractBooleanObjectFilter.class.php     |  6 +++++
 ...actMultipleSelectionObjectFilter.class.php |  9 ++++++++
 .../AbstractRangeObjectFilter.class.php       |  6 +++++
 .../AbstractSelectionObjectFilter.class.php   |  9 ++++++++
 .../AbstractTimestampObjectFilter.class.php   |  6 +++++
 .../object/filter/IObjectFilter.class.php     |  7 ++++++
 .../user/UserEmailObjectFilter.class.php      |  6 +++++
 .../user/UserUsernameObjectFilter.class.php   |  6 +++++
 wcfsetup/install/lang/de.xml                  |  1 +
 wcfsetup/install/lang/en.xml                  |  1 +
 14 files changed, 124 insertions(+), 5 deletions(-)

diff --git a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
index bdff1fcc6ce..92496c857cf 100644
--- a/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
+++ b/ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts
@@ -88,11 +88,29 @@ class ObjectFilterBuilder {
     }
   }
 
+  /**
+   * Returns the URL of the dialog, passing the identifiers of the configured
+   * filters except for the given one that is being edited. Filters that are
+   * not repeatable are no longer offered once they have been configured.
+   */
+  #getEndpoint(editedItem?: HTMLElement): URL {
+    const url = new URL(this.#endpoint, window.location.href);
+    this.#conditions.forEach((condition, item) => {
+      if (item !== editedItem) {
+        url.searchParams.append("used[]", condition.identifier);
+      }
+    });
+
+    return url;
+  }
+
   /**
    * Opens the dialog to configure a new filter and adds it to the list.
    */
   async #addFilter(): Promise<void> {
-    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(this.#endpoint);
+    const url = this.#getEndpoint();
+
+    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(url.toString());
     if (response.ok) {
       this.#createCondition(response.result);
     }
@@ -104,7 +122,7 @@ class ObjectFilterBuilder {
   async #editFilter(item: HTMLElement, summary: HTMLElement): Promise<void> {
     const data = this.#conditions.get(item)!;
 
-    const url = new URL(this.#endpoint, window.location.href);
+    const url = this.#getEndpoint(item);
     url.searchParams.set("filter", data.identifier);
     url.searchParams.set("value", data.value);
 
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
index 55d2f772e55..7b43df57cb3 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Object/Filter/Builder.js
@@ -51,11 +51,26 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
                 this.#createCondition(filter);
             }
         }
+        /**
+         * Returns the URL of the dialog, passing the identifiers of the configured
+         * filters except for the given one that is being edited. Filters that are
+         * not repeatable are no longer offered once they have been configured.
+         */
+        #getEndpoint(editedItem) {
+            const url = new URL(this.#endpoint, window.location.href);
+            this.#conditions.forEach((condition, item) => {
+                if (item !== editedItem) {
+                    url.searchParams.append("used[]", condition.identifier);
+                }
+            });
+            return url;
+        }
         /**
          * Opens the dialog to configure a new filter and adds it to the list.
          */
         async #addFilter() {
-            const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(this.#endpoint);
+            const url = this.#getEndpoint();
+            const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(url.toString());
             if (response.ok) {
                 this.#createCondition(response.result);
             }
@@ -65,7 +80,7 @@ define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "../../Co
          */
         async #editFilter(item, summary) {
             const data = this.#conditions.get(item);
-            const url = new URL(this.#endpoint, window.location.href);
+            const url = this.#getEndpoint(item);
             url.searchParams.set("filter", data.identifier);
             url.searchParams.set("value", data.value);
             const response = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(url.toString());
diff --git a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
index 1e7df32b4d3..09b1b0dd61b 100644
--- a/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
+++ b/wcfsetup/install/files/lib/action/ObjectFilterBuilderAction.class.php
@@ -29,6 +29,8 @@
  *
  * An existing filter is edited by passing its identifier and its serialized
  * value through the `filter` and `value` query parameters, which prefill the dialog.
+ * The identifiers of the other configured filters are passed through `used`,
+ * filters that are not repeatable are not offered again.
  *
  * @author      Alexander Ebert, Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
@@ -47,6 +49,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                     identifier: string,
                     filter?: string,
                     value?: string,
+                    used?: list<string>,
                 }
                 EOT
         );
@@ -67,6 +70,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $builder,
             $parameters['filter'] ?? null,
             $parameters['value'] ?? null,
+            $parameters['used'] ?? [],
         );
 
         if ($request->getMethod() === 'GET') {
@@ -110,14 +114,17 @@ public function handle(ServerRequestInterface $request): ResponseInterface
      * The form field of each filter is only shown while it is selected.
      *
      * If a filter identifier and its serialized value are given, the dialog is
-     * prefilled with them.
+     * prefilled with them. Filters that are not repeatable are only offered if
+     * they are not part of the given identifiers of the other configured filters.
      *
      * @param IObjectFilterBuilder<*> $builder
+     * @param list<string> $usedIdentifiers
      */
     private function getForm(
         IObjectFilterBuilder $builder,
         ?string $filterIdentifier,
         ?string $serializedValue,
+        array $usedIdentifiers,
     ): Psr15DialogForm {
         $form = new Psr15DialogForm(
             static::class,
@@ -140,6 +147,9 @@ private function getForm(
             if (!$filter->isAvailable()) {
                 continue;
             }
+            if (!$filter->isRepeatable() && \in_array($filter->getIdentifier(), $usedIdentifiers, true)) {
+                continue;
+            }
 
             $formField = $filter->getFormField();
             $formField->addDependency(
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
index 1760ac29adc..fd23364de89 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ObjectFilterFormField.class.php
@@ -85,6 +85,25 @@ public function validate(): void
                 new FormFieldValidationError('empty')
             );
         }
+
+        $filters = [];
+        foreach ($this->getBuilder()->getFilters() as $filter) {
+            $filters[$filter->getIdentifier()] = $filter;
+        }
+
+        $counts = \array_count_values(\array_column($values, 'identifier'));
+        foreach ($counts as $identifier => $count) {
+            $filter = $filters[$identifier];
+            if ($count > 1 && !$filter->isRepeatable()) {
+                $this->addValidationError(
+                    new FormFieldValidationError(
+                        'notRepeatable',
+                        'wcf.objectFilter.error.notRepeatable',
+                        ['title' => $filter->getTitle()]
+                    )
+                );
+            }
+        }
     }
 
     /**
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
index 48dbe9012d0..96a67f1f284 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractBooleanObjectFilter.class.php
@@ -47,6 +47,12 @@ public function isAvailable(): bool
         return true;
     }
 
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return false;
+    }
+
     /**
      * @param bool|int $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
index 3aaa96c6bfb..6716e4381f3 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractMultipleSelectionObjectFilter.class.php
@@ -49,6 +49,15 @@ public function isAvailable(): bool
         return true;
     }
 
+    /**
+     * Multiple values are selected in a single filter instead.
+     */
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return false;
+    }
+
     /**
      * @param list<int|string> $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
index 63245e673ad..34466f1588d 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractRangeObjectFilter.class.php
@@ -87,6 +87,12 @@ public function isAvailable(): bool
         return true;
     }
 
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return false;
+    }
+
     /**
      * @param string|array{0: ?TBound, 1: ?TBound} $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
index 24e3b147f76..5bb65ffa938 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractSelectionObjectFilter.class.php
@@ -67,6 +67,15 @@ public function isAvailable(): bool
         return $this->getOptions() !== [];
     }
 
+    /**
+     * Selecting multiple objects requires the filter to be repeated.
+     */
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return true;
+    }
+
     /**
      * @param int|string $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
index 308b26433e9..7d9c872972c 100644
--- a/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/AbstractTimestampObjectFilter.class.php
@@ -50,6 +50,12 @@ public function isAvailable(): bool
         return true;
     }
 
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return false;
+    }
+
     /**
      * @param int|string $value
      */
diff --git a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
index 836a9aec790..7207489b965 100644
--- a/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/IObjectFilter.class.php
@@ -45,6 +45,13 @@ public function getFormField(): AbstractFormField;
      */
     public function isAvailable(): bool;
 
+    /**
+     * Returns true if this filter can be configured more than once for the
+     * same object. Filters whose repeated use is redundant or contradictory,
+     * e.g. a yes/no choice, return false.
+     */
+    public function isRepeatable(): bool;
+
     /**
      * Converts the given value into its string representation for storage.
      *
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
index 0b07f3b80db..d55b2b709d7 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserEmailObjectFilter.class.php
@@ -49,6 +49,12 @@ public function isAvailable(): bool
         return true;
     }
 
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return true;
+    }
+
     #[\Override]
     public function serializeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
index 140588282f6..c2234135c25 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserUsernameObjectFilter.class.php
@@ -49,6 +49,12 @@ public function isAvailable(): bool
         return true;
     }
 
+    #[\Override]
+    public function isRepeatable(): bool
+    {
+        return true;
+    }
+
     #[\Override]
     public function serializeValue(mixed $value): string
     {
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index a3f8de6efc1..cf07667a099 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -3479,6 +3479,7 @@ Erlaubte Dateiendungen: {', '|implode:$attachmentHandler->getFormattedAllowedExt
 		<item name="wcf.objectFilter.editFilter"><![CDATA[Bedingung bearbeiten]]></item>
 		<item name="wcf.objectFilter.endDate"><![CDATA[Enddatum]]></item>
 		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Bis {$value|plainTime}]]></item>
+		<item name="wcf.objectFilter.error.notRepeatable"><![CDATA[Die Bedingung „{$title}“ kann nur einmal hinzugefügt werden.]]></item>
 		<item name="wcf.objectFilter.filter"><![CDATA[Bedingung]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[UND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Aufgerufene Seite ausgeschlossen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 32c795aa947..b1e222b47a4 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3404,6 +3404,7 @@ Allowed extensions: {', '|implode:$attachmentHandler->getFormattedAllowedExtensi
 		<item name="wcf.objectFilter.editFilter"><![CDATA[Edit Condition]]></item>
 		<item name="wcf.objectFilter.endDate"><![CDATA[End Date]]></item>
 		<item name="wcf.objectFilter.endDate.summary"><![CDATA[Until {$value|plainTime}]]></item>
+		<item name="wcf.objectFilter.error.notRepeatable"><![CDATA[The condition “{$title}” can only be added once.]]></item>
 		<item name="wcf.objectFilter.filter"><![CDATA[Condition]]></item>
 		<item name="wcf.objectFilter.joiner"><![CDATA[AND]]></item>
 		<item name="wcf.objectFilter.notRequestedPage"><![CDATA[Requested Page Excluded]]></item>

From 51e16d78eb180cd1bd10a0f0010aaf63351ca8a3 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 27 Sep 2026 13:33:58 +0200
Subject: [PATCH 42/47] Group assignment form fields into containers and remove
 unused phrases

---
 .../form/UserGroupAssignmentAddForm.class.php | 59 +++++++++++--------
 .../UserGroupAssignmentGridView.class.php     |  4 +-
 wcfsetup/install/lang/de.xml                  |  8 +--
 wcfsetup/install/lang/en.xml                  |  6 +-
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
index 33098517561..ecea1b1e34c 100644
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
@@ -9,6 +9,7 @@
 use wcf\data\user\group\assignment\UserGroupAssignmentBuilder;
 use wcf\data\user\group\UserGroup;
 use wcf\form\AbstractDatabaseObjectBuilderForm;
+use wcf\system\form\builder\container\FormContainer;
 use wcf\system\form\builder\field\BooleanFormField;
 use wcf\system\form\builder\field\IFormField;
 use wcf\system\form\builder\field\ObjectFilterFormField;
@@ -66,31 +67,39 @@ protected function getCommand(DatabaseObjectBuilder $builder): callable
     protected function createForm(): void
     {
         $this->form->appendChildren([
-            TitleFormField::create('title')
-                ->label('wcf.global.name')
-                ->maximumLength(255)
-                ->required()
-                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
-                    $builder->setTitle($field->getSaveValue());
-                }),
-            SelectFormField::create('groupID')
-                ->label('wcf.user.group')
-                ->options($this->getAvailableUserGroups())
-                ->required()
-                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
-                    $builder->setGroupID((int)$field->getSaveValue());
-                }),
-            BooleanFormField::create('isDisabled')
-                ->label('wcf.acp.group.assignment.isDisabled')
-                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
-                    $builder->setIsDisabled((bool)$field->getSaveValue());
-                }),
-            ObjectFilterFormField::create('conditions')
-                ->builder(new UserGroupAssignmentObjectFilterBuilder())
-                ->required()
-                ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
-                    $builder->setConditions($field->getSaveValue());
-                }),
+            FormContainer::create('data')
+                ->appendChildren([
+                    TitleFormField::create('title')
+                        ->label('wcf.global.name')
+                        ->maximumLength(255)
+                        ->required()
+                        ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                            $builder->setTitle($field->getSaveValue());
+                        }),
+                    SelectFormField::create('groupID')
+                        ->label('wcf.user.group')
+                        ->options($this->getAvailableUserGroups())
+                        ->required()
+                        ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                            $builder->setGroupID((int)$field->getSaveValue());
+                        }),
+                    BooleanFormField::create('isDisabled')
+                        ->label('wcf.acp.group.assignment.isDisabled')
+                        ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                            $builder->setIsDisabled((bool)$field->getSaveValue());
+                        }),
+                ]),
+            FormContainer::create('conditionsContainer')
+                ->label('wcf.acp.group.assignment.conditions')
+                ->description('wcf.acp.group.assignment.conditions.description')
+                ->appendChild(
+                    ObjectFilterFormField::create('conditions')
+                        ->builder(new UserGroupAssignmentObjectFilterBuilder())
+                        ->required()
+                        ->saveValueCallback(static function (UserGroupAssignmentBuilder $builder, IFormField $field) {
+                            $builder->setConditions($field->getSaveValue());
+                        }),
+                ),
         ]);
     }
 
diff --git a/wcfsetup/install/files/lib/system/gridView/admin/UserGroupAssignmentGridView.class.php b/wcfsetup/install/files/lib/system/gridView/admin/UserGroupAssignmentGridView.class.php
index cd5201f48bd..5b4bca0cbf1 100644
--- a/wcfsetup/install/files/lib/system/gridView/admin/UserGroupAssignmentGridView.class.php
+++ b/wcfsetup/install/files/lib/system/gridView/admin/UserGroupAssignmentGridView.class.php
@@ -47,7 +47,7 @@ public function __construct()
                 ->filter(TextFilter::class)
                 ->sortable(),
             GridViewColumn::for("groupID")
-                ->label("wcf.acp.group.assignment.userGroup")
+                ->label("wcf.user.group")
                 ->filter(new SelectFilter(
                     UserGroup::getSortedGroupsByType([], [
                         UserGroup::EVERYONE,
@@ -56,7 +56,7 @@ public function __construct()
                         UserGroup::USERS,
                     ]),
                     'groupID',
-                    'wcf.acp.group.assignment.userGroup'
+                    'wcf.user.group'
                 ))
                 ->sortable()
                 ->renderer(
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index cf07667a099..0ac741013cb 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -865,15 +865,11 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.group.option.admin.user.canManageGroupAssignment"><![CDATA[Kann automatische Gruppenzuordnungen verwalten]]></item>
 		<item name="wcf.acp.group.assignment.add"><![CDATA[Automatische Benutzergruppen-Zuordnung hinzufügen]]></item>
 		<item name="wcf.acp.group.assignment.button.add"><![CDATA[Automatische Zuordnung hinzufügen]]></item>
-		<item name="wcf.acp.group.assignment.button.list"><![CDATA[Automatische Zuordnungen auflisten]]></item>
 		<item name="wcf.acp.group.assignment.conditions"><![CDATA[Bedingungen]]></item>
-		<item name="wcf.acp.group.assignment.conditions.description"><![CDATA[Benutzer müssen die folgenden Bedingungen erfüllen, um automatisch der Benutzergruppe hinzugefügt zu werden]]></item>
+		<item name="wcf.acp.group.assignment.conditions.description"><![CDATA[Benutzer müssen die folgenden Bedingungen erfüllen, um automatisch der Benutzergruppe hinzugefügt zu werden.]]></item>
 		<item name="wcf.acp.group.assignment.edit"><![CDATA[Automatische Benutzergruppen-Zuordnung bearbeiten]]></item>
-		<item name="wcf.acp.group.assignment.error.noConditions"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} keine Bedingungen ausgewählt.]]></item>
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatische Benutzergruppen-Zuordnungen]]></item>
-		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[Benutzergruppe]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Automatische Zuordnung deaktivieren]]></item>
-		<item name="wcf.acp.group.assignment.title.error.tooLong"><![CDATA[Der eingegebene Titel ist zu lang. Die maximale Länge beträgt 255 Zeichen.]]></item>
 		<item name="wcf.acp.group.option.admin.notice.canManageNotice"><![CDATA[Kann Hinweise verwalten]]></item>
 		<item name="wcf.acp.group.option.admin.ad.canManageAd"><![CDATA[Kann Werbung verwalten]]></item>
 		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[Maximallänge „Über mich“]]></item>
@@ -1271,7 +1267,7 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.notice.cssClassName.success"><![CDATA[Erfolgsmeldung]]></item>
 		<item name="wcf.acp.notice.cssClassName.warning"><![CDATA[Warnung]]></item>
 		<item name="wcf.acp.notice.conditions"><![CDATA[Bedingungen]]></item>
-		<item name="wcf.acp.notice.conditions.description"><![CDATA[Werden keine Bedingungen ausgewählt, wird der Hinweis für jeden Benutzer auf allen Seiten angezeigt.]]></item>
+		<item name="wcf.acp.notice.conditions.description"><![CDATA[Der Hinweis wird angezeigt, wenn ALLE nachfolgenden Bedingungen erfüllt sind. Werden keine Bedingungen ausgewählt, wird der Hinweis für jeden Benutzer auf allen Seiten angezeigt.]]></item>
 		<item name="wcf.acp.notice.conditions.page"><![CDATA[Seite]]></item>
 		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[Die vom Benutzer aufgerufene Seite muss folgende Bedingungen erfüllen, damit der Hinweis angezeigt wird.]]></item>
 		<item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Zeitpunkt]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index b1e222b47a4..04ac6561f7a 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -843,15 +843,11 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.group.option.admin.user.canManageGroupAssignment"><![CDATA[Can manage automatic user group assignments]]></item>
 		<item name="wcf.acp.group.assignment.add"><![CDATA[Add User Group Automatic Assignment]]></item>
 		<item name="wcf.acp.group.assignment.button.add"><![CDATA[Add Automatic Assignment]]></item>
-		<item name="wcf.acp.group.assignment.button.list"><![CDATA[Automatic Assignments]]></item>
 		<item name="wcf.acp.group.assignment.conditions"><![CDATA[Conditions]]></item>
 		<item name="wcf.acp.group.assignment.conditions.description"><![CDATA[The users need to fulfill the following conditions to automatically be added to the user group.]]></item>
 		<item name="wcf.acp.group.assignment.edit"><![CDATA[Edit User Group Automatic Assignment]]></item>
-		<item name="wcf.acp.group.assignment.error.noConditions"><![CDATA[You have not provided any conditions yet.]]></item>
 		<item name="wcf.acp.group.assignment.list"><![CDATA[Automatic User Group Assignments]]></item>
-		<item name="wcf.acp.group.assignment.userGroup"><![CDATA[User Group]]></item>
 		<item name="wcf.acp.group.assignment.isDisabled"><![CDATA[Disable automatic assignment]]></item>
-		<item name="wcf.acp.group.assignment.title.error.tooLong"><![CDATA[The entered title is too long. The maximum length is 255 characters.]]></item>
 		<item name="wcf.acp.group.option.admin.notice.canManageNotice"><![CDATA[Can manage notices]]></item>
 		<item name="wcf.acp.group.option.admin.ad.canManageAd"><![CDATA[Can manage ads]]></item>
 		<item name="wcf.acp.group.option.user.profile.aboutMeMaxLength"><![CDATA[Maximum About Me Length]]></item>
@@ -1249,7 +1245,7 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.notice.cssClassName.success"><![CDATA[Success]]></item>
 		<item name="wcf.acp.notice.cssClassName.warning"><![CDATA[Warning]]></item>
 		<item name="wcf.acp.notice.conditions"><![CDATA[Conditions]]></item>
-		<item name="wcf.acp.notice.conditions.description"><![CDATA[If no conditions are specified, the notice will display for every user.]]></item>
+		<item name="wcf.acp.notice.conditions.description"><![CDATA[The notice is displayed if ALL of the following conditions are met. If no conditions are selected, the notice is displayed to every user on all pages.]]></item>
 		<item name="wcf.acp.notice.conditions.page"><![CDATA[Page]]></item>
 		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the notice to be displayed.]]></item>
 		<item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Time]]></item>

From bef2cd1d0b27de8683294858a928acd5faabcca7 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 28 Sep 2026 15:38:20 +0200
Subject: [PATCH 43/47] Refactor ads to new API

Closes #6104
---
 phpstan-baseline.neon                         |   5 -
 .../update_com.woltlab.wcf_6.3_step1.php      |   6 +-
 wcfsetup/install/files/acp/js/WCF.ACP.js      | 172 ---------
 .../acp/templates/__adLocationVariables.tpl   |  10 +
 .../install/files/acp/templates/adAdd.tpl     | 143 +------
 .../update_com.woltlab.wcf_6.3_conditions.php |   8 +-
 .../files/lib/acp/form/AdAddForm.class.php    | 352 +++++++-----------
 .../files/lib/acp/form/AdEditForm.class.php   | 115 +-----
 .../files/lib/bootstrap/com.woltlab.wcf.php   |   1 +
 .../files/lib/command/ad/CreateAd.class.php   |  34 ++
 .../files/lib/command/ad/DeleteAd.class.php   |  32 ++
 .../files/lib/command/ad/DisableAd.class.php  |  10 +-
 .../files/lib/command/ad/EnableAd.class.php   |  10 +-
 .../files/lib/command/ad/UpdateAd.class.php   |  34 ++
 .../install/files/lib/data/ad/Ad.class.php    |   2 +
 .../files/lib/data/ad/AdAction.class.php      |   1 +
 .../files/lib/data/ad/AdBuilder.class.php     | 181 +++++++++
 .../files/lib/data/ad/AdEditor.class.php      |   1 +
 .../files/lib/event/ad/AdCreated.class.php    |  23 ++
 .../files/lib/event/ad/AdDeleted.class.php    |  21 ++
 .../ad/AdObjectFilterCollecting.class.php     |  41 ++
 .../files/lib/event/ad/AdUpdated.class.php    |  23 ++
 .../files/lib/system/ad/AdHandler.class.php   |  15 +-
 .../controller/core/ads/DeleteAd.class.php    |   4 +-
 .../builder/AdObjectFilterBuilder.class.php   | 117 ++++++
 wcfsetup/install/lang/de.xml                  |  16 +-
 wcfsetup/install/lang/en.xml                  |  16 +-
 wcfsetup/setup/db/install_com.woltlab.wcf.php |   1 +
 28 files changed, 718 insertions(+), 676 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/templates/__adLocationVariables.tpl
 create mode 100644 wcfsetup/install/files/lib/command/ad/CreateAd.class.php
 create mode 100644 wcfsetup/install/files/lib/command/ad/DeleteAd.class.php
 create mode 100644 wcfsetup/install/files/lib/command/ad/UpdateAd.class.php
 create mode 100644 wcfsetup/install/files/lib/data/ad/AdBuilder.class.php
 create mode 100644 wcfsetup/install/files/lib/event/ad/AdCreated.class.php
 create mode 100644 wcfsetup/install/files/lib/event/ad/AdDeleted.class.php
 create mode 100644 wcfsetup/install/files/lib/event/ad/AdObjectFilterCollecting.class.php
 create mode 100644 wcfsetup/install/files/lib/event/ad/AdUpdated.class.php
 create mode 100644 wcfsetup/install/files/lib/system/object/filter/builder/AdObjectFilterBuilder.class.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5fca153539f..7f592a28697 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -42,11 +42,6 @@ parameters:
 			count: 2
 			path: wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 2
-			path: wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
 
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
index a41f51127f5..c2f54c2b1bb 100644
--- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
+++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
@@ -127,5 +127,9 @@
     PartialDatabaseTable::create('wcf1_notice')
         ->columns([
             JsonDatabaseTableColumn::create('conditions'),
-        ])
+        ]),
+    PartialDatabaseTable::create('wcf1_ad')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ]),
 ];
diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index fdaca16580d..e1fa3db079c 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -827,175 +827,3 @@ WCF.ACP.Stat.Chart = Class.extend({
 		elBySel('.contentHeader > .contentTitle').scrollIntoView({ behavior: 'smooth' });
 	}
 });
-
-/**
- * Namespace for ACP ad management.
- */
-WCF.ACP.Ad = { };
-
-/**
- * Handles the location of an ad during ad creation/editing.
- */
-WCF.ACP.Ad.LocationHandler = Class.extend({
-	/**
-	 * fieldset of the page conditions
-	 * @var	jQuery
-	 */
-	_pageConditions: null,
-	
-	/**
-	 * select elements for the page controller condition
-	 * @var	jQuery[]
-	 */
-	_pageInputs: [],
-	
-	/**
-	 * page controller condition container
-	 * @var	jQuery[]
-	 */
-	_pageSelectionContainer: null,
-	
-	/**
-	 * Initializes a new WCF.ACP.Ad.LocationHandler object.
-	 * 
-	 * @param	{object}	variablesDescriptions
-	 */
-	init: function(variablesDescriptions) {
-		this._variablesDescriptions = variablesDescriptions;
-		
-		this._pageConditions = $('#pageConditions');
-		this._pageInputs = $('input[name="pageIDs[]"]');
-		
-		this._variablesDescriptionsList = $('#ad').next('small').children('ul');
-		
-		this._pageSelectionContainer = $(this._pageInputs[0]).parents('dl:eq(0)');
-		
-		// hide the page controller elements
-		this._hidePageSelection(true);
-		
-		$('#objectTypeID').on('change', $.proxy(this._setPageController, this));
-		
-		this._setPageController();
-		
-		$('#adForm').submit($.proxy(this._submit, this));
-	},
-	
-	/**
-	 * Hides the page selection form field.
-	 * 
-	 * @since	5.2
-	 */
-	_hidePageSelection: function(addEventListeners) {
-		this._pageSelectionContainer.prev('dl').hide();
-		this._pageSelectionContainer.hide();
-		
-		// fix the margin of a potentially next page condition element
-		this._pageSelectionContainer.next('dl').css('margin-top', 0);
-		
-		var section = this._pageSelectionContainer.parent('section');
-		if (!section.children('dl:visible').length) {
-			section.hide();
-			
-			var nextSection = section.next('section');
-			if (nextSection) {
-				nextSection.css('margin-top', 0);
-				
-				if (addEventListeners) {
-					require(['EventHandler'], function(EventHandler) {
-						EventHandler.add('com.woltlab.wcf.pageConditionDependence', 'checkVisivility', function() {
-							if (section.is(':visible')) {
-								nextSection.css('margin-top', '40px');
-							}
-							else {
-								nextSection.css('margin-top', 0);
-							}
-						});
-					});
-				}
-			}
-		}
-	},
-	
-	/**
-	 * Shows the page selection form field.
-	 * 
-	 * @since	5.2
-	 */
-	_showPageSelection: function() {
-		this._pageSelectionContainer.prev('dl').show();
-		this._pageSelectionContainer.show();
-		this._pageSelectionContainer.next('dl').css('margin-top', '40px');
-		
-		var section = this._pageSelectionContainer.parent('section');
-		section.show();
-		
-		var nextSection = section.next('section');
-		if (nextSection) {
-			nextSection.css('margin-top', '40px');
-		}
-	},
-	
-	/**
-	 * Sets the page controller based on the selected ad location.
-	 */
-	_setPageController: function() {
-		var option = $('#objectTypeID').find('option:checked');
-		var parent = option.parent();
-		
-		// the page controller can be explicitly set for global positions
-		if (parent.is('optgroup') && parent.data('categoryName') === 'com.woltlab.wcf.global') {
-			this._showPageSelection();
-		}
-		else {
-			this._hidePageSelection();
-			
-			require(['Core'], function(Core) {
-				var input, triggerEvent;
-				
-				// select the related page
-				for (var i = 0, length = this._pageInputs.length; i < length; i++) {
-					input = this._pageInputs[i];
-					triggerEvent = false;
-					
-					if (option.data('page') && elData(input, 'identifier') === option.data('page')) {
-						if (!input.checked) triggerEvent = true;
-						
-						input.checked = true;
-					}
-					else {
-						if (input.checked) triggerEvent = true;
-						
-						input.checked = false;
-					}
-					
-					if (triggerEvent) Core.triggerEvent(this._pageInputs[i], 'change');
-				}
-			}.bind(this));
-		}
-		
-		this._variablesDescriptionsList.children(':not(.jsDefaultItem)').remove();
-		
-		var objectTypeId = $('#objectTypeID').val();
-		if (objectTypeId in this._variablesDescriptions) {
-			this._variablesDescriptionsList[0].innerHTML += this._variablesDescriptions[objectTypeId];
-		}
-	},
-	
-	/**
-	 * Handles submitting the ad form.
-	 */
-	_submit: function() {
-		if (this._pageConditions.is(':hidden')) {
-			// remove hidden page condition form elements to avoid creation
-			// of these conditions
-			this._pageConditions.find('select, input').remove();
-		}
-		else if (this._pageSelectionContainer.is(':hidden')) {
-			// reset page controller conditions to avoid creation of
-			// unnecessary conditions
-			for (var i = 0, length = this._pageInputs.length; i < length; i++) {
-				this._pageInputs[i].checked = false;
-			}
-		}
-	}
-});
diff --git a/wcfsetup/install/files/acp/templates/__adLocationVariables.tpl b/wcfsetup/install/files/acp/templates/__adLocationVariables.tpl
new file mode 100644
index 00000000000..90e8a8eab32
--- /dev/null
+++ b/wcfsetup/install/files/acp/templates/__adLocationVariables.tpl
@@ -0,0 +1,10 @@
+<dl>
+	<dt></dt>
+	<dd>
+		<small>
+			<ul class="nativeList">
+				{unsafe:$variablesDescription}
+			</ul>
+		</small>
+	</dd>
+</dl>
diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl
index 5e134fbfd65..984d35a4f2c 100644
--- a/wcfsetup/install/files/acp/templates/adAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/adAdd.tpl
@@ -1,21 +1,13 @@
 {include file='header' pageTitle='wcf.acp.ad.'|concat:$action}
 
-<script data-relocate="true">
-	$(function() {
-		new WCF.ACP.Ad.LocationHandler({
-			{implode from=$variablesDescriptions key=objectType item=description}'{$objectType}': '{unsafe:$description|encodeJS}'{/implode}
-		});
-	});
-</script>
-
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
 		<h1 class="contentTitle">{lang}wcf.acp.ad.{$action}{/lang}</h1>
 	</div>
-	
+
 	<nav class="contentHeaderNavigation">
 		<ul>
-			{if $action == 'edit'}
+			{if $action === 'edit'}
 				<li>
 					{unsafe:$interactionContextMenu->render()}
 				</li>
@@ -25,135 +17,6 @@
 	</nav>
 </header>
 
-{include file='shared_formNotice'}
-
-<form id="adForm" method="post" action="{if $action == 'add'}{link controller='AdAdd'}{/link}{else}{link controller='AdEdit' object=$adObject}{/link}{/if}">
-	<div class="section">
-		<dl{if $errorField == 'adName'} class="formError"{/if}>
-			<dt><label for="adName">{lang}wcf.global.name{/lang}</label></dt>
-			<dd>
-				<input type="text" id="adName" name="adName" value="{$adName}" required autofocus class="long">
-				{if $errorField == 'adName'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{else}
-							{lang}wcf.acp.ad.adName.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
-		
-		<dl{if $errorField == 'ad'} class="formError"{/if}>
-			<dt><label for="ad">{lang}wcf.acp.ad.ad{/lang}</label></dt>
-			<dd>
-				<textarea id="ad" name="ad" cols="40" rows="10">{$ad}</textarea>
-				<small>{lang}wcf.acp.ad.ad.description{/lang}</small>
-				{if $errorField == 'ad'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{else}
-							{lang}wcf.acp.ad.ad.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt></dt>
-			<dd>
-				<label><input type="checkbox" name="isDisabled" value="1"{if $isDisabled} checked{/if}> {lang}wcf.acp.ad.isDisabled{/lang}</label>
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt><label for="objectTypeID">{lang}wcf.acp.ad.location{/lang}</label></dt>
-			<dd>
-				<select name="objectTypeID" id="objectTypeID">
-					<option value="0"{if !$objectTypeID} selected{/if}>{lang}wcf.global.noSelection{/lang}</option>
-					{foreach from=$locations key='locationGroupLabel' item='locationGroup'}
-						{assign var='__firstLocationID' value=$locationGroup|key}
-						<optgroup label="{$locationGroupLabel}" data-category-name="{$locationObjectTypes[$__firstLocationID]->categoryname}">
-							{foreach from=$locationGroup key='locationID' item='location'}
-								<option value="{$locationID}"{if $locationObjectTypes[$locationID]->page} data-page="{$locationObjectTypes[$locationID]->page}"{/if}{if $objectTypeID == $locationID} selected{/if}>{$location}</option>
-							{/foreach}
-						</optgroup>
-					{/foreach}
-				</select>
-				{if $errorField == 'objectTypeID'}
-					<small class="innerError">
-						{if $errorType == 'empty'}
-							{lang}wcf.global.form.error.empty{/lang}
-						{elseif $errorType == 'noValidSelection'}
-							{lang}wcf.global.form.error.noValidSelection{/lang}
-						{else}
-							{lang}wcf.acp.ad.location.error.{$errorType}{/lang}
-						{/if}
-					</small>
-				{/if}
-			</dd>
-		</dl>
-		
-		<dl>
-			<dt><label for="showOrder">{lang}wcf.global.showOrder{/lang}</label></dt>
-			<dd>
-				<input type="number" id="showOrder" name="showOrder" value="{$showOrder}" class="tiny" min="0">
-				<small>{lang}wcf.acp.ad.showOrder.description{/lang}</small>
-			</dd>
-		</dl>
-		
-		{event name='dataFields'}
-	</div>
-	
-	{event name='sections'}
-	
-	<section class="section">
-		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.acp.ad.conditions{/lang}</h2>
-			<p class="sectionDescription">{lang}wcf.acp.ad.conditions.description{/lang}</p>
-		</header>
-		
-		<section class="section" id="pageConditions">
-			<header class="sectionHeader">
-				<h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.page{/lang}</h2>
-				<p class="sectionDescription">{lang}wcf.acp.ad.conditions.page.description{/lang}</p>
-			</header>
-			
-			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.page'] item='pageConditionObjectType'}
-				{unsafe:$pageConditionObjectType->getProcessor()->getHtml()}
-			{/foreach}
-		</section>
-		
-		<section class="section" id="pointInTimeConditions">
-			<header class="sectionHeader">
-				<h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.pointInTime{/lang}</h2>
-				<p class="sectionDescription">{lang}wcf.acp.ad.conditions.pointInTime.description{/lang}</p>
-			</header>
-				
-			{foreach from=$groupedConditionObjectTypes['com.woltlab.wcf.pointInTime'] item='pointInTimeConditionObjectType'}
-				{unsafe:$pointInTimeConditionObjectType->getProcessor()->getHtml()}
-			{/foreach}
-		</section>
-		
-		{event name='conditionTypeFieldsets'}
-	</section>
-	
-	<section class="section">
-		<header class="sectionHeader">
-			<h2 class="sectionTitle">{lang}wcf.acp.ad.conditions.user{/lang}</h2>
-			<p class="sectionDescription">{lang}wcf.acp.ad.conditions.user.description{/lang}</p>
-		</header>
-
-		{include file='shared_userConditions' groupedObjectTypes=$groupedConditionObjectTypes['com.woltlab.wcf.user']}
-	</section>
-	
-	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		{csrfToken}
-	</div>
-</form>
+{unsafe:$form->getHTML()}
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
index aebbc6d21f7..074fdc353f4 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * Migrates the legacy conditions of notices and user group assignments into
- * object filters. Conditions that cannot be converted, e.g. those of apps, are
- * kept and the affected notices and assignments are disabled.
+ * Migrates the legacy conditions of notices, ads and user group assignments
+ * into object filters. Conditions that cannot be converted, e.g. those of apps,
+ * are kept and the affected notices, ads and assignments are disabled.
  *
  * @author      Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
@@ -207,5 +207,7 @@
 
 (new LegacyConditionMigration('com.woltlab.wcf.condition.notice', 'wcf1_notice', 'noticeID'))
     ->migrate($converters);
+(new LegacyConditionMigration('com.woltlab.wcf.condition.ad', 'wcf1_ad', 'adID'))
+    ->migrate($converters);
 (new LegacyConditionMigration('com.woltlab.wcf.condition.userGroupAssignment', 'wcf1_user_group_assignment', 'assignmentID'))
     ->migrate($converters);
diff --git a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
index 00ecb9f9ff9..366f6cd4e45 100644
--- a/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
@@ -2,26 +2,37 @@
 
 namespace wcf\acp\form;
 
-use wcf\data\ad\AdAction;
-use wcf\data\object\type\ObjectType;
-use wcf\data\object\type\ObjectTypeCache;
-use wcf\form\AbstractForm;
+use wcf\command\ad\CreateAd;
+use wcf\command\ad\UpdateAd;
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\data\DatabaseObjectBuilder;
+use wcf\form\AbstractDatabaseObjectBuilderForm;
 use wcf\system\ad\AdHandler;
 use wcf\system\ad\location\IAdLocation;
-use wcf\system\condition\ConditionHandler;
-use wcf\system\exception\UserInputException;
-use wcf\system\request\LinkHandler;
-use wcf\system\WCF;
-use wcf\util\StringUtil;
+use wcf\system\form\builder\container\FormContainer;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
+use wcf\system\form\builder\field\IFormField;
+use wcf\system\form\builder\field\IntegerFormField;
+use wcf\system\form\builder\field\MultilineTextFormField;
+use wcf\system\form\builder\field\ObjectFilterFormField;
+use wcf\system\form\builder\field\SelectFormField;
+use wcf\system\form\builder\field\TextFormField;
+use wcf\system\form\builder\IFormChildNode;
+use wcf\system\form\builder\TemplateFormNode;
+use wcf\system\object\filter\builder\AdObjectFilterBuilder;
 
 /**
- * Shows the form to create a new ad notice.
+ * Shows the form to create a new ad.
  *
- * @author  Matthias Schmidt
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Matthias Schmidt, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ *
+ * @extends AbstractDatabaseObjectBuilderForm<Ad, AdBuilder>
  */
-class AdAddForm extends AbstractForm
+class AdAddForm extends AbstractDatabaseObjectBuilderForm
 {
     /**
      * @inheritDoc
@@ -39,229 +50,150 @@ class AdAddForm extends AbstractForm
     public $neededModules = ['MODULE_WCF_AD'];
 
     /**
-     * html code of the ad
-     * @var string
-     */
-    public $ad = '';
-
-    /**
-     * name of the notice
-     * @var string
-     */
-    public $adName = '';
-
-    /**
-     * grouped ad condition object types
-     * @var (ObjectType|ObjectType[])[][]
-     */
-    public $groupedConditionObjectTypes = [];
-
-    /**
-     * 1 if the ad is disabled
-     * @var int
-     */
-    public $isDisabled = 0;
-
-    /**
-     * list of available location object types
-     * @var ObjectType[]
-     */
-    public $locationObjectTypes = [];
-
-    /**
-     * list of available locations
-     * @var array<string, array<int, string>>
-     */
-    public $locations = [];
-
-    /**
-     * id of the selected location's object type
-     * @var int
-     */
-    public $objectTypeID = 0;
-
-    /**
-     * order used to the show the ads
-     * @var int
+     * @inheritDoc
      */
-    public $showOrder = 0;
+    public string $objectEditLinkController = AdEditForm::class;
 
     #[\Override]
-    public function assignVariables()
+    protected function getDatabaseObjectBuilder(): AdBuilder
     {
-        parent::assignVariables();
-
-        $variablesDescriptions = [];
-        foreach ($this->locationObjectTypes as $objectType) {
-            if ($objectType->className !== '' && \is_subclass_of($objectType->className, IAdLocation::class)) {
-                /** @var IAdLocation $adLocation */
-                $adLocation = $objectType->getProcessor();
-
-                $variablesDescriptions[$objectType->objectTypeID] = $adLocation->getVariablesDescription();
-            }
+        if ($this->formObject !== null) {
+            return AdBuilder::forUpdate($this->formObject);
         }
 
-        WCF::getTPL()->assign([
-            'action' => 'add',
-            'ad' => $this->ad,
-            'adName' => $this->adName,
-            'locationObjectTypes' => $this->locationObjectTypes,
-            'locations' => $this->locations,
-            'isDisabled' => $this->isDisabled,
-            'groupedConditionObjectTypes' => $this->groupedConditionObjectTypes,
-            'objectTypeID' => $this->objectTypeID,
-            'showOrder' => $this->showOrder,
-            'variablesDescriptions' => $variablesDescriptions,
-        ]);
+        return AdBuilder::forCreate();
     }
 
     #[\Override]
-    public function readData()
+    protected function getCommand(DatabaseObjectBuilder $builder): callable
     {
-        $objectTypes = ObjectTypeCache::getInstance()->getObjectTypes('com.woltlab.wcf.condition.ad');
-        foreach ($objectTypes as $objectType) {
-            if ($objectType->conditionobject === null) {
-                continue;
-            }
-
-            if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject])) {
-                $this->groupedConditionObjectTypes[$objectType->conditionobject] = [];
-            }
-
-            if ($objectType->conditiongroup !== null) {
-                if (!isset($this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup])) {
-                    $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup] = [];
-                }
-
-                $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->conditiongroup][$objectType->objectTypeID] = $objectType;
-            } else {
-                $this->groupedConditionObjectTypes[$objectType->conditionobject][$objectType->objectTypeID] = $objectType;
-            }
+        if ($this->formObject !== null) {
+            return new UpdateAd($builder);
         }
 
-        $this->locations = AdHandler::getInstance()->getLocationSelection();
-        foreach (AdHandler::getInstance()->getLocationObjectTypes() as $objectType) {
-            $this->locationObjectTypes[$objectType->objectTypeID] = $objectType;
-        }
-
-        parent::readData();
+        return new CreateAd($builder);
     }
 
     #[\Override]
-    public function readFormParameters()
+    protected function createForm(): void
     {
-        parent::readFormParameters();
-
-        if (isset($_POST['ad'])) {
-            $this->ad = StringUtil::trim($_POST['ad']);
-        }
-        if (isset($_POST['adName'])) {
-            $this->adName = StringUtil::trim($_POST['adName']);
-        }
-        if (isset($_POST['isDisabled'])) {
-            $this->isDisabled = 1;
-        }
-        if (isset($_POST['objectTypeID'])) {
-            $this->objectTypeID = \intval($_POST['objectTypeID']);
-        }
-        if (isset($_POST['showOrder'])) {
-            $this->showOrder = \intval($_POST['showOrder']);
-        }
-
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    foreach ($objectTypes as $objectType) {
-                        $objectType->getProcessor()->readFormParameters();
-                    }
-                } else {
-                    $objectTypes->getProcessor()->readFormParameters();
-                }
-            }
-        }
+        $location = SelectFormField::create('objectTypeID')
+            ->label('wcf.acp.ad.location')
+            ->options($this->getLocationOptions(), true, false)
+            ->ignoreInvalidValues()
+            ->required()
+            ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                $builder->setObjectTypeID((int)$field->getSaveValue());
+            });
+
+        $this->form->appendChildren([
+            FormContainer::create('data')
+                ->appendChildren([
+                    TextFormField::create('adName')
+                        ->label('wcf.global.name')
+                        ->maximumLength(255)
+                        ->required()
+                        ->autoFocus()
+                        ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                            $builder->setAdName($field->getSaveValue());
+                        }),
+                    MultilineTextFormField::create('ad')
+                        ->label('wcf.acp.ad.ad')
+                        ->description('wcf.acp.ad.ad.description')
+                        ->required()
+                        ->rows(10)
+                        ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                            $builder->setAd($field->getSaveValue());
+                        }),
+                    ...$this->getLocationVariablesNodes($location),
+                    $location,
+                    IntegerFormField::create('showOrder')
+                        ->label('wcf.global.showOrder')
+                        ->description('wcf.acp.ad.showOrder.description')
+                        ->minimum(0)
+                        ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                            $builder->setShowOrder($field->getSaveValue());
+                        }),
+                ]),
+            FormContainer::create('settings')
+                ->label('wcf.global.settings')
+                ->appendChildren([
+                    BooleanFormField::create('isDisabled')
+                        ->label('wcf.acp.ad.isDisabled')
+                        ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                            $builder->setIsDisabled((bool)$field->getSaveValue());
+                        }),
+                ]),
+            FormContainer::create('conditionsContainer')
+                ->label('wcf.acp.ad.conditions')
+                ->description('wcf.acp.ad.conditions.description')
+                ->appendChild(
+                    ObjectFilterFormField::create('conditions')
+                        ->builder(new AdObjectFilterBuilder())
+                        ->saveValueCallback(static function (AdBuilder $builder, IFormField $field) {
+                            $builder->setConditions($field->getSaveValue());
+                        })
+                ),
+        ]);
     }
 
-    #[\Override]
-    public function save()
+    /**
+     * Returns the available locations grouped by their category.
+     *
+     * @return list<array{label: string, value: int|string, depth: int, isSelectable?: bool}>
+     */
+    private function getLocationOptions(): array
     {
-        parent::save();
-
-        $this->objectAction = new AdAction([], 'create', [
-            'data' => \array_merge($this->additionalFields, [
-                'ad' => $this->ad,
-                'adName' => $this->adName,
-                'isDisabled' => $this->isDisabled,
-                'objectTypeID' => $this->objectTypeID,
-                'showOrder' => $this->showOrder,
-            ]),
-        ]);
-        $returnValues = $this->objectAction->executeAction();
-
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    $conditions = \array_merge($conditions, $objectTypes);
-                } else {
-                    $conditions[] = $objectTypes;
-                }
+        $options = [];
+        foreach (AdHandler::getInstance()->getLocationSelection() as $categoryLabel => $locations) {
+            $options[] = [
+                'label' => $categoryLabel,
+                'value' => 'category' . \count($options),
+                'depth' => 0,
+                'isSelectable' => false,
+            ];
+
+            foreach ($locations as $objectTypeID => $locationLabel) {
+                $options[] = [
+                    'label' => $locationLabel,
+                    'value' => $objectTypeID,
+                    'depth' => 1,
+                ];
             }
         }
 
-        ConditionHandler::getInstance()->createConditions($returnValues['returnValues']->adID, $conditions);
-
-        $this->saved();
-
-        // reset values
-        $this->ad = '';
-        $this->adName = '';
-        $this->isDisabled = 0;
-        $this->objectTypeID = 0;
-        $this->showOrder = 0;
-
-        foreach ($conditions as $condition) {
-            $condition->getProcessor()->reset();
-        }
-
-        WCF::getTPL()->assign([
-            'success' => true,
-            'objectEditLink' => LinkHandler::getInstance()->getControllerLink(
-                AdEditForm::class,
-                ['id' => $returnValues['returnValues']->adID]
-            ),
-        ]);
+        return $options;
     }
 
-    #[\Override]
-    public function validate()
+    /**
+     * Returns the nodes that list the location specific variables that are
+     * replaced within the ad, each is only shown while its location is selected.
+     *
+     * @return list<IFormChildNode>
+     */
+    private function getLocationVariablesNodes(SelectFormField $location): array
     {
-        parent::validate();
-
-        if (empty($this->adName)) {
-            throw new UserInputException('adName');
-        }
-
-        if (empty($this->ad)) {
-            throw new UserInputException('ad');
-        }
+        $nodes = [];
+        foreach (AdHandler::getInstance()->getLocationObjectTypes() as $objectType) {
+            if ($objectType->className === '' || !\is_subclass_of($objectType->className, IAdLocation::class)) {
+                continue;
+            }
 
-        if ($this->objectTypeID === 0) {
-            throw new UserInputException('objectTypeID');
-        } elseif (!isset($this->locationObjectTypes[$this->objectTypeID])) {
-            throw new UserInputException('objectTypeID', 'noValidSelection');
+            $adLocation = $objectType->getProcessor();
+            \assert($adLocation instanceof IAdLocation);
+
+            $nodes[] = TemplateFormNode::create('locationVariables' . $objectType->objectTypeID)
+                ->templateName('__adLocationVariables')
+                ->variables([
+                    'variablesDescription' => $adLocation->getVariablesDescription(),
+                ])
+                ->addDependency(
+                    ValueFormFieldDependency::create('objectTypeID')
+                        ->field($location)
+                        ->values([$objectType->objectTypeID])
+                );
         }
 
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    foreach ($objectTypes as $objectType) {
-                        $objectType->getProcessor()->validate();
-                    }
-                } else {
-                    $objectTypes->getProcessor()->validate();
-                }
-            }
-        }
+        return $nodes;
     }
 }
diff --git a/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
index 9456515bdbb..9065e06a865 100644
--- a/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AdEditForm.class.php
@@ -4,21 +4,18 @@
 
 use wcf\acp\page\AdListPage;
 use wcf\data\ad\Ad;
-use wcf\data\ad\AdAction;
-use wcf\form\AbstractForm;
 use wcf\http\Helper;
-use wcf\system\condition\ConditionHandler;
 use wcf\system\interaction\admin\AdInteractions;
 use wcf\system\interaction\StandaloneInteractionContextMenuComponent;
 use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 
 /**
- * Shows the form to edit an ad notice.
+ * Shows the form to edit an existing ad.
  *
- * @author  Matthias Schmidt
- * @copyright   2001-2019 WoltLab GmbH
- * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @author      Matthias Schmidt, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 class AdEditForm extends AdAddForm
 {
@@ -28,111 +25,29 @@ class AdEditForm extends AdAddForm
     public $activeMenuItem = 'wcf.acp.menu.link.ad.list';
 
     /**
-     * edited ad object
-     * @var ?Ad
+     * @inheritDoc
      */
-    public $adObject;
-
-    #[\Override]
-    public function assignVariables()
-    {
-        parent::assignVariables();
-
-        WCF::getTPL()->assign([
-            'action' => 'edit',
-            'adObject' => $this->adObject,
-            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
-                new AdInteractions(),
-                $this->adObject,
-                LinkHandler::getInstance()->getControllerLink(AdListPage::class)
-            ),
-        ]);
-    }
-
-    #[\Override]
-    public function readData()
-    {
-        parent::readData();
-
-        if ($_POST === []) {
-            $this->ad = $this->adObject->ad;
-            $this->adName = $this->adObject->adName;
-            $this->isDisabled = $this->adObject->isDisabled;
-            $this->objectTypeID = $this->adObject->objectTypeID;
-            $this->showOrder = $this->adObject->showOrder;
-
-            $conditions = $this->adObject->getConditions();
-            $conditionsByObjectTypeID = [];
-            foreach ($conditions as $condition) {
-                $conditionsByObjectTypeID[$condition->objectTypeID] = $condition;
-            }
-
-            foreach ($this->groupedConditionObjectTypes as $objectTypes1) {
-                foreach ($objectTypes1 as $objectTypes2) {
-                    if (\is_array($objectTypes2)) {
-                        foreach ($objectTypes2 as $objectType) {
-                            if (isset($conditionsByObjectTypeID[$objectType->objectTypeID])) {
-                                $conditionsByObjectTypeID[$objectType->objectTypeID]
-                                    ->getObjectType()
-                                    ->getProcessor()
-                                    ->setData($conditionsByObjectTypeID[$objectType->objectTypeID]);
-                            }
-                        }
-                    } elseif (isset($conditionsByObjectTypeID[$objectTypes2->objectTypeID])) {
-                        $conditionsByObjectTypeID[$objectTypes2->objectTypeID]
-                            ->getObjectType()
-                            ->getProcessor()
-                            ->setData($conditionsByObjectTypeID[$objectTypes2->objectTypeID]);
-                    }
-                }
-            }
-        }
-    }
+    public string $formAction = 'edit';
 
     #[\Override]
     public function readParameters()
     {
         parent::readParameters();
 
-        $this->adObject = Helper::fetchObjectFromQueryParameter(Ad::class);
+        $this->formObject = Helper::fetchObjectFromQueryParameter(Ad::class);
     }
 
     #[\Override]
-    public function save()
+    public function assignVariables()
     {
-        AbstractForm::save();
+        parent::assignVariables();
 
-        $this->objectAction = new AdAction([$this->adObject], 'update', [
-            'data' => \array_merge($this->additionalFields, [
-                'ad' => $this->ad,
-                'adName' => $this->adName,
-                'isDisabled' => $this->isDisabled,
-                'objectTypeID' => $this->objectTypeID,
-                'showOrder' => $this->showOrder,
-            ]),
+        WCF::getTPL()->assign([
+            'interactionContextMenu' => StandaloneInteractionContextMenuComponent::forContentHeaderButton(
+                new AdInteractions(),
+                $this->formObject,
+                LinkHandler::getInstance()->getControllerLink(AdListPage::class)
+            ),
         ]);
-        $this->objectAction->executeAction();
-
-        // transform conditions array into one-dimensional array
-        $conditions = [];
-        foreach ($this->groupedConditionObjectTypes as $groupedObjectTypes) {
-            foreach ($groupedObjectTypes as $objectTypes) {
-                if (\is_array($objectTypes)) {
-                    $conditions = \array_merge($conditions, $objectTypes);
-                } else {
-                    $conditions[] = $objectTypes;
-                }
-            }
-        }
-
-        ConditionHandler::getInstance()->updateConditions(
-            $this->adObject->adID,
-            $this->adObject->getConditions(),
-            $conditions
-        );
-
-        $this->saved();
-
-        WCF::getTPL()->assign('success', true);
     }
 }
diff --git a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
index a6a9303a162..bcc1a6eb8c2 100644
--- a/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
+++ b/wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php
@@ -181,6 +181,7 @@ private function initObjectFilters(): void
         EventHandler::getInstance()->register(
             \wcf\event\object\filter\ObjectFilterBuilderCollecting::class,
             static function (\wcf\event\object\filter\ObjectFilterBuilderCollecting $event) {
+                $event->register(new \wcf\system\object\filter\builder\AdObjectFilterBuilder());
                 $event->register(new \wcf\system\object\filter\builder\NoticeObjectFilterBuilder());
                 $event->register(new \wcf\system\object\filter\builder\UserGroupAssignmentObjectFilterBuilder());
             }
diff --git a/wcfsetup/install/files/lib/command/ad/CreateAd.class.php b/wcfsetup/install/files/lib/command/ad/CreateAd.class.php
new file mode 100644
index 00000000000..64650e49b4f
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/ad/CreateAd.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\ad;
+
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\event\ad\AdCreated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Creates a new ad.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class CreateAd
+{
+    public function __construct(
+        private readonly AdBuilder $builder,
+    ) {}
+
+    public function __invoke(): Ad
+    {
+        $ad = $this->builder->create();
+
+        AdBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new AdCreated($ad, $this->builder));
+
+        return $ad;
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/ad/DeleteAd.class.php b/wcfsetup/install/files/lib/command/ad/DeleteAd.class.php
new file mode 100644
index 00000000000..07481e18fbd
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/ad/DeleteAd.class.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\ad;
+
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\event\ad\AdDeleted;
+use wcf\system\event\EventHandler;
+
+/**
+ * Deletes an ad.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class DeleteAd
+{
+    public function __construct(
+        private readonly Ad $ad,
+    ) {}
+
+    public function __invoke(): void
+    {
+        AdBuilder::delete($this->ad);
+
+        AdBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new AdDeleted($this->ad));
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/ad/DisableAd.class.php b/wcfsetup/install/files/lib/command/ad/DisableAd.class.php
index e46894d8e82..2f067dac987 100644
--- a/wcfsetup/install/files/lib/command/ad/DisableAd.class.php
+++ b/wcfsetup/install/files/lib/command/ad/DisableAd.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\ad;
 
 use wcf\data\ad\Ad;
-use wcf\data\ad\AdEditor;
+use wcf\data\ad\AdBuilder;
 use wcf\event\ad\AdDisabled;
 use wcf\system\event\EventHandler;
 
@@ -23,11 +23,11 @@ public function __construct(
 
     public function __invoke(): void
     {
-        (new AdEditor($this->ad))->update([
-            'isDisabled' => 1,
-        ]);
+        AdBuilder::forUpdate($this->ad)
+            ->setIsDisabled(true)
+            ->update();
 
-        AdEditor::resetCache();
+        AdBuilder::resetCache();
 
         $event = new AdDisabled($this->ad);
         EventHandler::getInstance()->fire($event);
diff --git a/wcfsetup/install/files/lib/command/ad/EnableAd.class.php b/wcfsetup/install/files/lib/command/ad/EnableAd.class.php
index 295545bca7a..f1859a4a44c 100644
--- a/wcfsetup/install/files/lib/command/ad/EnableAd.class.php
+++ b/wcfsetup/install/files/lib/command/ad/EnableAd.class.php
@@ -3,7 +3,7 @@
 namespace wcf\command\ad;
 
 use wcf\data\ad\Ad;
-use wcf\data\ad\AdEditor;
+use wcf\data\ad\AdBuilder;
 use wcf\event\ad\AdEnabled;
 use wcf\system\event\EventHandler;
 
@@ -23,11 +23,11 @@ public function __construct(
 
     public function __invoke(): void
     {
-        (new AdEditor($this->ad))->update([
-            'isDisabled' => 0,
-        ]);
+        AdBuilder::forUpdate($this->ad)
+            ->setIsDisabled(false)
+            ->update();
 
-        AdEditor::resetCache();
+        AdBuilder::resetCache();
 
         $event = new AdEnabled($this->ad);
         EventHandler::getInstance()->fire($event);
diff --git a/wcfsetup/install/files/lib/command/ad/UpdateAd.class.php b/wcfsetup/install/files/lib/command/ad/UpdateAd.class.php
new file mode 100644
index 00000000000..3ba2320b589
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/ad/UpdateAd.class.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace wcf\command\ad;
+
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\event\ad\AdUpdated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Updates an ad.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UpdateAd
+{
+    public function __construct(
+        private readonly AdBuilder $builder,
+    ) {}
+
+    public function __invoke(): Ad
+    {
+        $ad = $this->builder->update();
+
+        AdBuilder::resetCache();
+
+        EventHandler::getInstance()->fire(new AdUpdated($ad, $this->builder));
+
+        return $ad;
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/ad/Ad.class.php b/wcfsetup/install/files/lib/data/ad/Ad.class.php
index 06ec15eca00..19d91ac4523 100644
--- a/wcfsetup/install/files/lib/data/ad/Ad.class.php
+++ b/wcfsetup/install/files/lib/data/ad/Ad.class.php
@@ -24,6 +24,7 @@
  * @property-read   ?string $ad             ad text
  * @property-read   0|1     $isDisabled     is `1` if the ad is disabled and thus not shown, otherwise `0`
  * @property-read   int     $showOrder      position of the ad in relation to the other ads at the same location
+ * @property-read   ?string $conditions     serialized object filters the active user must match or `null` if the ad has no filters
  */
 class Ad extends DatabaseObject implements IRouteController
 {
@@ -31,6 +32,7 @@ class Ad extends DatabaseObject implements IRouteController
      * Returns the conditions of the ad.
      *
      * @return  Condition[]
+     * @deprecated 6.3 Use object filter API instead.
      */
     public function getConditions()
     {
diff --git a/wcfsetup/install/files/lib/data/ad/AdAction.class.php b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
index 6782298dbed..0e1b511ddbb 100644
--- a/wcfsetup/install/files/lib/data/ad/AdAction.class.php
+++ b/wcfsetup/install/files/lib/data/ad/AdAction.class.php
@@ -16,6 +16,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @extends AbstractDatabaseObjectAction<Ad, AdEditor>
+ * @deprecated 6.3 use `AdBuilder` instead.
  */
 class AdAction extends AbstractDatabaseObjectAction implements IToggleAction
 {
diff --git a/wcfsetup/install/files/lib/data/ad/AdBuilder.class.php b/wcfsetup/install/files/lib/data/ad/AdBuilder.class.php
new file mode 100644
index 00000000000..a4b609213f8
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/ad/AdBuilder.class.php
@@ -0,0 +1,181 @@
+<?php
+
+namespace wcf\data\ad;
+
+use wcf\data\DatabaseObject;
+use wcf\data\DatabaseObjectBuilder;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\system\cache\builder\AdCacheBuilder;
+use wcf\system\cache\builder\ConditionCacheBuilder;
+use wcf\system\condition\ConditionHandler;
+use wcf\system\WCF;
+
+/**
+ * Builder for creating, updating and deleting ads.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectBuilder<Ad>
+ */
+final class AdBuilder extends DatabaseObjectBuilder
+{
+    private ?int $showOrder = null;
+
+    /**
+     * Sets the id of the `com.woltlab.wcf.adLocation` object type the ad is shown at.
+     */
+    public function setObjectTypeID(int $objectTypeID): static
+    {
+        $this->properties['objectTypeID'] = $objectTypeID;
+
+        return $this;
+    }
+
+    public function setAdName(string $adName): static
+    {
+        $this->properties['adName'] = $adName;
+
+        return $this;
+    }
+
+    /**
+     * Sets the HTML code of the ad.
+     */
+    public function setAd(string $ad): static
+    {
+        $this->properties['ad'] = $ad;
+
+        return $this;
+    }
+
+    public function setIsDisabled(bool $isDisabled): static
+    {
+        $this->properties['isDisabled'] = (int)$isDisabled;
+
+        return $this;
+    }
+
+    /**
+     * Sets the position of the ad in relation to the other ads at the same
+     * location.
+     *
+     * The other ads are shifted accordingly, a value of `0` appends the ad at
+     * the end.
+     */
+    public function setShowOrder(int $showOrder): static
+    {
+        $this->showOrder = $showOrder;
+
+        return $this;
+    }
+
+    /**
+     * Sets the serialized object filters that the active user must match.
+     *
+     * An ad without any filters is visible to everyone, therefore an empty
+     * list of filters is stored as `null`.
+     */
+    public function setConditions(?string $conditions): static
+    {
+        if ($conditions !== null && \json_decode($conditions, true) === []) {
+            $conditions = null;
+        }
+
+        $this->properties['conditions'] = $conditions;
+
+        return $this;
+    }
+
+    #[\Override]
+    protected function getRequiredProperties(): array
+    {
+        return ['objectTypeID', 'adName'];
+    }
+
+    #[\Override]
+    protected function afterCreate(DatabaseObject $object): void
+    {
+        self::applyShowOrder($object, $this->showOrder ?? 0);
+    }
+
+    #[\Override]
+    protected function afterUpdate(DatabaseObject $object): void
+    {
+        $previousAd = $this->getObject();
+
+        if ($object->objectTypeID !== $previousAd->objectTypeID) {
+            // The ad is moved to another location, therefore its position
+            // must be determined in relation to the ads at the new location.
+            self::applyShowOrder($object, $this->showOrder ?? 0);
+        } elseif ($this->showOrder !== null && $this->showOrder !== $previousAd->showOrder) {
+            self::applyShowOrder($object, $this->showOrder);
+        }
+    }
+
+    #[\Override]
+    protected static function beforeDeleteAll(array $objectIDs): void
+    {
+        ConditionHandler::getInstance()->deleteConditions('com.woltlab.wcf.condition.ad', $objectIDs);
+    }
+
+    /**
+     * Moves the ad to the given position among the ads at the same location,
+     * shifting the ads that follow it. A value of `0` appends the ad at the end.
+     */
+    private static function applyShowOrder(Ad $ad, int $showOrder): void
+    {
+        $sql = "SELECT  MAX(showOrder)
+                FROM    wcf1_ad
+                WHERE   objectTypeID = ?
+                    AND adID <> ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $ad->objectTypeID,
+            $ad->adID,
+        ]);
+        $maxShowOrder = $statement->fetchSingleColumn();
+        if ($maxShowOrder === null) {
+            $maxShowOrder = 0;
+        }
+
+        if ($showOrder === 0 || $showOrder > $maxShowOrder) {
+            $newShowOrder = $maxShowOrder + 1;
+        } else {
+            $sql = "UPDATE  wcf1_ad
+                    SET     showOrder = showOrder + 1
+                    WHERE   objectTypeID = ?
+                        AND showOrder >= ?
+                        AND adID <> ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([
+                $ad->objectTypeID,
+                $showOrder,
+                $ad->adID,
+            ]);
+
+            $newShowOrder = $showOrder;
+        }
+
+        $sql = "UPDATE  wcf1_ad
+                SET     showOrder = ?
+                WHERE   adID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $newShowOrder,
+            $ad->adID,
+        ]);
+    }
+
+    public static function resetCache(): void
+    {
+        AdCacheBuilder::getInstance()->reset();
+        ConditionCacheBuilder::getInstance()->reset([
+            'definitionID' => ObjectTypeCache::getInstance()
+                ->getDefinitionByName('com.woltlab.wcf.condition.ad')
+                ->definitionID,
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/ad/AdEditor.class.php b/wcfsetup/install/files/lib/data/ad/AdEditor.class.php
index 511e037d4c4..0bb14f4771d 100644
--- a/wcfsetup/install/files/lib/data/ad/AdEditor.class.php
+++ b/wcfsetup/install/files/lib/data/ad/AdEditor.class.php
@@ -19,6 +19,7 @@
  * @mixin       Ad
  * @extends DatabaseObjectEditor<Ad>
  * @implements IEditableCachedObject<Ad>
+ * @deprecated 6.3 use `AdBuilder` instead.
  */
 class AdEditor extends DatabaseObjectEditor implements IEditableCachedObject
 {
diff --git a/wcfsetup/install/files/lib/event/ad/AdCreated.class.php b/wcfsetup/install/files/lib/event/ad/AdCreated.class.php
new file mode 100644
index 00000000000..81d3694ed54
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/ad/AdCreated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\ad;
+
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that an ad has been created.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class AdCreated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Ad $ad,
+        public readonly AdBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/ad/AdDeleted.class.php b/wcfsetup/install/files/lib/event/ad/AdDeleted.class.php
new file mode 100644
index 00000000000..d7b638d250c
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/ad/AdDeleted.class.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace wcf\event\ad;
+
+use wcf\data\ad\Ad;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that an ad has been deleted.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class AdDeleted implements IPsr14Event
+{
+    public function __construct(
+        public readonly Ad $ad,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/ad/AdObjectFilterCollecting.class.php b/wcfsetup/install/files/lib/event/ad/AdObjectFilterCollecting.class.php
new file mode 100644
index 00000000000..7de0809b360
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/ad/AdObjectFilterCollecting.class.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace wcf\event\ad;
+
+use wcf\data\user\User;
+use wcf\event\IPsr14Event;
+use wcf\system\object\filter\IObjectFilter;
+
+/**
+ * Requests the collection of the filters that are available for the conditions of ads.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class AdObjectFilterCollecting implements IPsr14Event
+{
+    /**
+     * @var array<string, IObjectFilter<User, mixed>>
+     */
+    private array $filters = [];
+
+    /**
+     * Registers a new filter. An existing filter with the same identifier is replaced.
+     *
+     * @param IObjectFilter<User, mixed> $filter
+     */
+    public function register(IObjectFilter $filter): void
+    {
+        $this->filters[$filter->getIdentifier()] = $filter;
+    }
+
+    /**
+     * @return list<IObjectFilter<User, mixed>>
+     */
+    public function getFilters(): array
+    {
+        return \array_values($this->filters);
+    }
+}
diff --git a/wcfsetup/install/files/lib/event/ad/AdUpdated.class.php b/wcfsetup/install/files/lib/event/ad/AdUpdated.class.php
new file mode 100644
index 00000000000..0579f4a7268
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/ad/AdUpdated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\ad;
+
+use wcf\data\ad\Ad;
+use wcf\data\ad\AdBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that an ad has been updated.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class AdUpdated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Ad $ad,
+        public readonly AdBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/ad/AdHandler.class.php b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
index f0a975b94f0..1c5587fa8ec 100644
--- a/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
+++ b/wcfsetup/install/files/lib/system/ad/AdHandler.class.php
@@ -7,6 +7,7 @@
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\system\cache\builder\AdCacheBuilder;
 use wcf\system\exception\SystemException;
+use wcf\system\object\filter\builder\AdObjectFilterBuilder;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 
@@ -31,6 +32,11 @@ class AdHandler extends SingletonFactory
      */
     protected $objectTypes = [];
 
+    /**
+     * filter builder shared by all ad locations
+     */
+    private ?AdObjectFilterBuilder $filterBuilder = null;
+
     /**
      * Returns the ad output for the given ad location.
      *
@@ -57,13 +63,12 @@ public function getAds(string $adLocation)
             \shuffle($ads);
         }
 
+        $this->filterBuilder ??= new AdObjectFilterBuilder();
+
         $output = '';
         foreach ($ads as $ad) {
-            $conditions = $ad->getConditions();
-            foreach ($conditions as $condition) {
-                if (!$condition->getObjectType()->getProcessor()->showContent($condition)) {
-                    continue 2;
-                }
+            if (!$this->filterBuilder->testUser($ad, WCF::getUser())) {
+                continue;
             }
 
             $output .= '<div>' . $ad->getHtmlCode() . '</div>';
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/ads/DeleteAd.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/ads/DeleteAd.class.php
index 0dc81ff9ffb..267ff24509c 100644
--- a/wcfsetup/install/files/lib/system/endpoint/controller/core/ads/DeleteAd.class.php
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/ads/DeleteAd.class.php
@@ -5,8 +5,8 @@
 use Laminas\Diactoros\Response\JsonResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\ad\DeleteAd as DeleteAdCommand;
 use wcf\data\ad\Ad;
-use wcf\data\ad\AdAction;
 use wcf\http\Helper;
 use wcf\system\endpoint\DeleteRequest;
 use wcf\system\endpoint\IController;
@@ -31,7 +31,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
 
         $this->assertAdCanBeDeleted();
 
-        (new AdAction([$ad], 'delete'))->executeAction();
+        new DeleteAdCommand($ad)();
 
         return new JsonResponse([]);
     }
diff --git a/wcfsetup/install/files/lib/system/object/filter/builder/AdObjectFilterBuilder.class.php b/wcfsetup/install/files/lib/system/object/filter/builder/AdObjectFilterBuilder.class.php
new file mode 100644
index 00000000000..5440e48262d
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/object/filter/builder/AdObjectFilterBuilder.class.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace wcf\system\object\filter\builder;
+
+use wcf\data\ad\Ad;
+use wcf\data\user\User;
+use wcf\event\ad\AdObjectFilterCollecting;
+use wcf\system\event\EventHandler;
+use wcf\system\object\filter\EndDateObjectFilter;
+use wcf\system\object\filter\IObjectFilter;
+use wcf\system\object\filter\NotRequestedPageObjectFilter;
+use wcf\system\object\filter\ObjectFilterHandler;
+use wcf\system\object\filter\RequestedPageObjectFilter;
+use wcf\system\object\filter\StartDateObjectFilter;
+use wcf\system\object\filter\user\DaysOfWeekObjectFilter;
+use wcf\system\object\filter\user\UserActivatedObjectFilter;
+use wcf\system\object\filter\user\UserAvatarObjectFilter;
+use wcf\system\object\filter\user\UserBannedObjectFilter;
+use wcf\system\object\filter\user\UserBirthdayObjectFilter;
+use wcf\system\object\filter\user\UserCoverPhotoObjectFilter;
+use wcf\system\object\filter\user\UserEmailConfirmedObjectFilter;
+use wcf\system\object\filter\user\UserEmailObjectFilter;
+use wcf\system\object\filter\user\UserGroupObjectFilter;
+use wcf\system\object\filter\user\UserIntegerPropertyObjectFilter;
+use wcf\system\object\filter\user\UserLanguageObjectFilter;
+use wcf\system\object\filter\user\UserMobileBrowserObjectFilter;
+use wcf\system\object\filter\user\UserMultifactorObjectFilter;
+use wcf\system\object\filter\user\UserNotInGroupObjectFilter;
+use wcf\system\object\filter\user\UserNoTrophyObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDateObjectFilter;
+use wcf\system\object\filter\user\UserRegistrationDaysObjectFilter;
+use wcf\system\object\filter\user\UserSignatureObjectFilter;
+use wcf\system\object\filter\user\UserTrophyObjectFilter;
+use wcf\system\object\filter\user\UserUsernameObjectFilter;
+use wcf\system\WCF;
+
+/**
+ * Provides the filters for the conditions of ads, controlling which users an
+ * ad is shown to.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractObjectFilterBuilder<User, IObjectFilter<User, mixed>, ObjectFilterHandler<User>>
+ */
+final class AdObjectFilterBuilder extends AbstractObjectFilterBuilder
+{
+    #[\Override]
+    protected function createFilters(): array
+    {
+        $event = new AdObjectFilterCollecting();
+        $event->register(new RequestedPageObjectFilter());
+        $event->register(new NotRequestedPageObjectFilter());
+        $event->register(new DaysOfWeekObjectFilter());
+        $event->register(new StartDateObjectFilter());
+        $event->register(new EndDateObjectFilter());
+        $event->register(new UserUsernameObjectFilter());
+        $event->register(new UserEmailObjectFilter());
+        $event->register(new UserGroupObjectFilter(includeGuests: true));
+        $event->register(new UserNotInGroupObjectFilter(includeGuests: true));
+        $event->register(new UserLanguageObjectFilter());
+        $event->register(new UserRegistrationDateObjectFilter());
+        $event->register(new UserRegistrationDaysObjectFilter());
+        $event->register(new UserAvatarObjectFilter());
+        $event->register(new UserSignatureObjectFilter());
+        $event->register(new UserCoverPhotoObjectFilter());
+        $event->register(new UserBannedObjectFilter());
+        $event->register(new UserActivatedObjectFilter());
+        $event->register(new UserEmailConfirmedObjectFilter());
+        $event->register(new UserMultifactorObjectFilter());
+        $event->register(new UserBirthdayObjectFilter());
+        $event->register(new UserMobileBrowserObjectFilter());
+        $event->register(new UserIntegerPropertyObjectFilter('activityPoints', 'wcf.user.condition.activityPoints'));
+        $event->register(new UserIntegerPropertyObjectFilter('likesReceived', 'wcf.user.condition.likesReceived'));
+        $event->register(new UserIntegerPropertyObjectFilter('trophyPoints', 'wcf.user.condition.trophyPoints'));
+        $event->register(new UserTrophyObjectFilter());
+        $event->register(new UserNoTrophyObjectFilter());
+
+        EventHandler::getInstance()->fire($event);
+
+        return $event->getFilters();
+    }
+
+    #[\Override]
+    protected function createHandler(array $filters): ObjectFilterHandler
+    {
+        return new ObjectFilterHandler($filters);
+    }
+
+    #[\Override]
+    public function getIdentifier(): string
+    {
+        return 'com.woltlab.wcf.ad';
+    }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        return WCF::getSession()->hasPermission('admin.ad.canManageAd');
+    }
+
+    /**
+     * Returns whether the given user matches the filters of the ad.
+     *
+     * An ad without any filters is visible to everyone.
+     */
+    public function testUser(Ad $ad, User $user): bool
+    {
+        if ($ad->conditions === null) {
+            return true;
+        }
+
+        return $this->getHandler()->testObject($user, $ad->conditions);
+    }
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 0ac741013cb..cb3ad482d90 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -28,17 +28,11 @@
 		<item name="wcf.acp.ad.ad"><![CDATA[Werbung]]></item>
 		<item name="wcf.acp.ad.ad.description"><![CDATA[HTML-Code der Werbung. Die folgende Ausdrücke werden automatisch im HTML-Code ersetzt:
 <ul class="nativeList">
-	<li class="jsDefaultItem"><kbd>{literal}{$username}{/literal}</kbd> durch den Namen des aktiven Benutzers oder durch „Gast“</li>
+	<li><kbd>{literal}{$username}{/literal}</kbd> durch den Namen des aktiven Benutzers oder durch „Gast“</li>
 </ul>]]></item>
 		<item name="wcf.acp.ad.add"><![CDATA[Werbung hinzufügen]]></item>
 		<item name="wcf.acp.ad.conditions"><![CDATA[Bedingungen]]></item>
-		<item name="wcf.acp.ad.conditions.description"><![CDATA[Werden keine Bedingungen ausgewählt, wird die Werbung für jeden Benutzer angezeigt.]]></item>
-		<item name="wcf.acp.ad.conditions.page"><![CDATA[Seite]]></item>
-		<item name="wcf.acp.ad.conditions.page.description"><![CDATA[Die vom Benutzer aufgerufene Seite muss folgende Bedingungen erfüllen, damit die Werbung angezeigt wird.]]></item>
-		<item name="wcf.acp.ad.conditions.pointInTime"><![CDATA[Zeitpunkt]]></item>
-		<item name="wcf.acp.ad.conditions.pointInTime.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Leg{else}Legen Sie{/if} den Zeitpunkt fest, zu dem die Werbung angezeigt werden soll.]]></item>
-		<item name="wcf.acp.ad.conditions.user"><![CDATA[Aktiver Benutzer]]></item>
-		<item name="wcf.acp.ad.conditions.user.description"><![CDATA[Der aktive Benutzer muss die folgenden Bedingungen erfüllen, damit die Werbung angezeigt wird.]]></item>
+		<item name="wcf.acp.ad.conditions.description"><![CDATA[Die Werbung wird angezeigt, wenn ALLE nachfolgenden Bedingungen erfüllt sind. Werden keine Bedingungen ausgewählt, wird die Werbung für jeden Benutzer angezeigt.]]></item>
 		<item name="wcf.acp.ad.edit"><![CDATA[Werbung bearbeiten]]></item>
 		<item name="wcf.acp.ad.isDisabled"><![CDATA[Werbung deaktivieren]]></item>
 		<item name="wcf.acp.ad.list"><![CDATA[Werbung]]></item>
@@ -1268,12 +1262,6 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.notice.cssClassName.warning"><![CDATA[Warnung]]></item>
 		<item name="wcf.acp.notice.conditions"><![CDATA[Bedingungen]]></item>
 		<item name="wcf.acp.notice.conditions.description"><![CDATA[Der Hinweis wird angezeigt, wenn ALLE nachfolgenden Bedingungen erfüllt sind. Werden keine Bedingungen ausgewählt, wird der Hinweis für jeden Benutzer auf allen Seiten angezeigt.]]></item>
-		<item name="wcf.acp.notice.conditions.page"><![CDATA[Seite]]></item>
-		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[Die vom Benutzer aufgerufene Seite muss folgende Bedingungen erfüllen, damit der Hinweis angezeigt wird.]]></item>
-		<item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Zeitpunkt]]></item>
-		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Leg{else}Legen Sie{/if} den Zeitpunkt fest, zu dem der Hinweis angezeigt werden soll.]]></item>
-		<item name="wcf.acp.notice.conditions.user"><![CDATA[Aktiver Benutzer]]></item>
-		<item name="wcf.acp.notice.conditions.user.description"><![CDATA[Der aktive Benutzer muss die folgenden Bedingungen erfüllen, damit der Hinweis angezeigt wird.]]></item>
 		<item name="wcf.acp.notice.customCssClassName"><![CDATA[CSS-Klasse]]></item>
 		<item name="wcf.acp.notice.edit"><![CDATA[Hinweis bearbeiten]]></item>
 		<item name="wcf.acp.notice.example"><![CDATA[Beispieltext für einen Hinweis]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 04ac6561f7a..e84667adc03 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -28,17 +28,11 @@
 		<item name="wcf.acp.ad.ad"><![CDATA[Ad]]></item>
 		<item name="wcf.acp.ad.ad.description"><![CDATA[Enter the ad’s HTML code here. The following expressions will be automatically replace within the HTML code:
 <ul class="nativeList">
-	<li class="jsDefaultItem"><kbd>{literal}{$username}{/literal}</kbd> with the name of the active user or “Guest”</li>
+	<li><kbd>{literal}{$username}{/literal}</kbd> with the name of the active user or “Guest”</li>
 </ul>]]></item>
 		<item name="wcf.acp.ad.add"><![CDATA[Add Ad]]></item>
 		<item name="wcf.acp.ad.conditions"><![CDATA[Conditions]]></item>
-		<item name="wcf.acp.ad.conditions.description"><![CDATA[If no conditions are specified, the ad will display for every user.]]></item>
-		<item name="wcf.acp.ad.conditions.page"><![CDATA[Page]]></item>
-		<item name="wcf.acp.ad.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the ad to be displayed.]]></item>
-		<item name="wcf.acp.ad.conditions.pointInTime"><![CDATA[Time]]></item>
-		<item name="wcf.acp.ad.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the ad is displayed.]]></item>
-		<item name="wcf.acp.ad.conditions.user"><![CDATA[Active user]]></item>
-		<item name="wcf.acp.ad.conditions.user.description"><![CDATA[The active user has to fulfill the following conditions to see the ad.]]></item>
+		<item name="wcf.acp.ad.conditions.description"><![CDATA[The ad is displayed if ALL of the following conditions are met. If no conditions are selected, the ad is displayed to every user.]]></item>
 		<item name="wcf.acp.ad.edit"><![CDATA[Edit Ad]]></item>
 		<item name="wcf.acp.ad.isDisabled"><![CDATA[Disable ad]]></item>
 		<item name="wcf.acp.ad.list"><![CDATA[Ads]]></item>
@@ -1246,12 +1240,6 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.notice.cssClassName.warning"><![CDATA[Warning]]></item>
 		<item name="wcf.acp.notice.conditions"><![CDATA[Conditions]]></item>
 		<item name="wcf.acp.notice.conditions.description"><![CDATA[The notice is displayed if ALL of the following conditions are met. If no conditions are selected, the notice is displayed to every user on all pages.]]></item>
-		<item name="wcf.acp.notice.conditions.page"><![CDATA[Page]]></item>
-		<item name="wcf.acp.notice.conditions.page.description"><![CDATA[The requested page has to fulfill the following conditions for the notice to be displayed.]]></item>
-		<item name="wcf.acp.notice.conditions.pointInTime"><![CDATA[Time]]></item>
-		<item name="wcf.acp.notice.conditions.pointInTime.description"><![CDATA[Sets the point in time at which the notice is displayed.]]></item>
-		<item name="wcf.acp.notice.conditions.user"><![CDATA[Active user]]></item>
-		<item name="wcf.acp.notice.conditions.user.description"><![CDATA[The active user has to fulfill the following conditions to view the notice.]]></item>
 		<item name="wcf.acp.notice.customCssClassName"><![CDATA[CSS class]]></item>
 		<item name="wcf.acp.notice.edit"><![CDATA[Edit Notice]]></item>
 		<item name="wcf.acp.notice.example"><![CDATA[Example text of a notice]]></item>
diff --git a/wcfsetup/setup/db/install_com.woltlab.wcf.php b/wcfsetup/setup/db/install_com.woltlab.wcf.php
index fb20cdbc084..c780f612ba9 100644
--- a/wcfsetup/setup/db/install_com.woltlab.wcf.php
+++ b/wcfsetup/setup/db/install_com.woltlab.wcf.php
@@ -369,6 +369,7 @@
             DefaultFalseBooleanDatabaseTableColumn::create('isDisabled'),
             NotNullInt10DatabaseTableColumn::create('showOrder')
                 ->defaultValue(0),
+            JsonDatabaseTableColumn::create('conditions'),
         ])
         ->indices([
             DatabaseTablePrimaryIndex::create()

From c2031702052476ef3430c2c55644f9329fb45817 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 28 Sep 2026 15:42:07 +0200
Subject: [PATCH 44/47] Add dependency support to TemplateFormNode

---
 .../templates/shared_templateFormNode.tpl            |  5 +++++
 .../system/form/builder/TemplateFormNode.class.php   | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 com.woltlab.wcf/templates/shared_templateFormNode.tpl

diff --git a/com.woltlab.wcf/templates/shared_templateFormNode.tpl b/com.woltlab.wcf/templates/shared_templateFormNode.tpl
new file mode 100644
index 00000000000..962d54f9a6e
--- /dev/null
+++ b/com.woltlab.wcf/templates/shared_templateFormNode.tpl
@@ -0,0 +1,5 @@
+<div id="{$node->getPrefixedId()}Container"{if !$node->checkDependencies()} style="display: none;"{/if}>
+	{unsafe:$html}
+</div>
+
+{include file='shared_formFieldDependencies' field=$node}
diff --git a/wcfsetup/install/files/lib/system/form/builder/TemplateFormNode.class.php b/wcfsetup/install/files/lib/system/form/builder/TemplateFormNode.class.php
index 9b6a9d66846..343cf454677 100644
--- a/wcfsetup/install/files/lib/system/form/builder/TemplateFormNode.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/TemplateFormNode.class.php
@@ -77,11 +77,21 @@ public function getApplication()
     #[\Override]
     public function getHtml()
     {
-        return WCF::getTPL()->render(
+        $html = WCF::getTPL()->render(
             $this->getApplication(),
             $this->getTemplateName(),
             $this->getVariables(),
         );
+
+        if ($this->getDependencies() === []) {
+            return $html;
+        }
+
+        // Wraps the contents to allow the dependencies to toggle them on the client.
+        return WCF::getTPL()->render('wcf', 'shared_templateFormNode', [
+            'node' => $this,
+            'html' => $html,
+        ]);
     }
 
     /**

From 18d91d6d8194964f1757f1b988d7fa480d8cc094 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 28 Sep 2026 16:57:10 +0200
Subject: [PATCH 45/47] Re-enable objects once all legacy conditions are
 migrated

---
 .../update_com.woltlab.wcf_6.3_conditions.php |  23 +---
 .../LegacyConditionMigration.class.php        | 130 ++++++++++++++++--
 2 files changed, 124 insertions(+), 29 deletions(-)

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
index 074fdc353f4..354927af171 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_conditions.php
@@ -10,7 +10,6 @@
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
 
-use wcf\data\object\type\ObjectType;
 use wcf\system\condition\DaysOfWeekCondition;
 use wcf\system\condition\page\MultiPageCondition;
 use wcf\system\condition\UserAvatarCondition;
@@ -181,22 +180,12 @@
     UserMultifactorCondition::class => static function (array $data) use ($boolean): ?array {
         return $boolean('com.woltlab.wcf.userMultifactor', $data['multifactorActive'] ?? null);
     },
-    UserIntegerPropertyCondition::class => static function (array $data, ObjectType $objectType): ?array {
-        // Properties of apps are migrated by the apps, which provide the matching filters.
-        $propertyName = $objectType->propertyname;
-        if (!\in_array($propertyName, ['activityPoints', 'likesReceived', 'trophyPoints'], true)) {
-            return null;
-        }
-
-        // The legacy bounds are exclusive, the bounds of the filter are inclusive.
-        $from = isset($data['greaterThan']) ? (string)((int)$data['greaterThan'] + 1) : '';
-        $to = isset($data['lessThan']) ? (string)((int)$data['lessThan'] - 1) : '';
-        if ($from === '' && $to === '') {
-            return null;
-        }
-
-        return [['com.woltlab.wcf.user' . \ucfirst($propertyName), $from . ';' . $to]];
-    },
+    // Properties of apps are migrated by the apps, which provide the matching filters.
+    UserIntegerPropertyCondition::class => LegacyConditionMigration::getUserIntegerPropertyConverter([
+        'activityPoints',
+        'likesReceived',
+        'trophyPoints',
+    ]),
     UserTrophyCondition::class => static function (array $data) use ($filterPerID): array {
         return [
             ...$filterPerID('com.woltlab.wcf.userTrophy', $data['userTrophyIDs'] ?? null),
diff --git a/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php b/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php
index e8a28b97ba9..eb3e3d55e1a 100644
--- a/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/migration/LegacyConditionMigration.class.php
@@ -4,6 +4,7 @@
 
 use wcf\data\object\type\ObjectType;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
+use wcf\system\registry\RegistryHandler;
 use wcf\system\WCF;
 
 /**
@@ -17,6 +18,10 @@
  * conditions are disabled, as evaluating only a part of their conditions would
  * match more users than intended.
  *
+ * Objects disabled by the migration are remembered and enabled again once a
+ * later run, e.g. by the update of another package, has converted all their
+ * remaining conditions. Objects that were already disabled are never enabled.
+ *
  * @author      Marcel Werk
  * @copyright   2001-2026 WoltLab GmbH
  * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
@@ -53,7 +58,11 @@ public function migrate(array $converters): void
             return;
         }
 
-        foreach ($this->getConditionsByObject(\array_keys($objectTypes)) as $objectID => $conditions) {
+        $disabledObjectIDs = $this->getDisabledObjectIDs();
+
+        foreach ($this->getConditionsByObject(\array_keys($objectTypes)) as $objectID => $object) {
+            ['isDisabled' => $isDisabled, 'conditions' => $conditions] = $object;
+
             $filters = [];
             $convertedConditionIDs = [];
             $hasUnconvertedConditions = false;
@@ -82,10 +91,98 @@ public function migrate(array $converters): void
                 }
             }
 
-            $this->updateObject($objectID, $filters, $convertedConditionIDs, $hasUnconvertedConditions);
+            $newIsDisabled = null;
+            if ($hasUnconvertedConditions) {
+                if (!$isDisabled) {
+                    $newIsDisabled = true;
+                }
+            } elseif (\in_array($objectID, $disabledObjectIDs, true)) {
+                // All remaining conditions have been converted by this run.
+                $newIsDisabled = false;
+            }
+
+            $this->updateObject($objectID, $filters, $convertedConditionIDs, $newIsDisabled);
+
+            // Remembered after each object to keep the list in sync with the
+            // committed changes if a later object fails.
+            if ($newIsDisabled === true) {
+                $disabledObjectIDs[] = $objectID;
+                $this->setDisabledObjectIDs($disabledObjectIDs);
+            } elseif ($newIsDisabled === false) {
+                $disabledObjectIDs = \array_values(\array_diff($disabledObjectIDs, [$objectID]));
+                $this->setDisabledObjectIDs($disabledObjectIDs);
+            }
         }
     }
 
+    /**
+     * Returns a converter for conditions of `UserIntegerPropertyCondition`
+     * that handles the given properties. Conditions of other properties are
+     * left for the packages that provide them.
+     *
+     * The matching filter is `UserIntegerPropertyObjectFilter`, its bounds are
+     * inclusive while the legacy bounds are exclusive.
+     *
+     * @param list<string> $propertyNames
+     * @return \Closure(array<string, mixed>, ObjectType): ?list<array{0: string, 1: string}>
+     */
+    public static function getUserIntegerPropertyConverter(array $propertyNames): \Closure
+    {
+        return static function (array $data, ObjectType $objectType) use ($propertyNames): ?array {
+            $propertyName = $objectType->propertyname;
+            if (!\in_array($propertyName, $propertyNames, true)) {
+                return null;
+            }
+
+            $from = isset($data['greaterThan']) ? (string)((int)$data['greaterThan'] + 1) : '';
+            $to = isset($data['lessThan']) ? (string)((int)$data['lessThan'] - 1) : '';
+            if ($from === '' && $to === '') {
+                return null;
+            }
+
+            return [['com.woltlab.wcf.user' . \ucfirst($propertyName), $from . ';' . $to]];
+        };
+    }
+
+    /**
+     * Returns the ids of the objects that have been disabled by the migration.
+     *
+     * @return list<int>
+     */
+    private function getDisabledObjectIDs(): array
+    {
+        $value = RegistryHandler::getInstance()->get('com.woltlab.wcf', $this->getRegistryField());
+        if ($value === null) {
+            return [];
+        }
+
+        $objectIDs = \json_decode($value, true);
+        if (!\is_array($objectIDs)) {
+            return [];
+        }
+
+        return \array_values(\array_map(static fn($objectID) => (int)$objectID, $objectIDs));
+    }
+
+    /**
+     * Stores the ids of the objects that have been disabled by the migration.
+     *
+     * @param list<int> $objectIDs
+     */
+    private function setDisabledObjectIDs(array $objectIDs): void
+    {
+        RegistryHandler::getInstance()->set(
+            'com.woltlab.wcf',
+            $this->getRegistryField(),
+            \json_encode(\array_values(\array_unique($objectIDs)), \JSON_THROW_ON_ERROR)
+        );
+    }
+
+    private function getRegistryField(): string
+    {
+        return 'legacyConditionMigration.' . $this->definitionName;
+    }
+
     /**
      * Returns the condition object types of the definition, indexed by their id.
      *
@@ -110,10 +207,14 @@ private function getObjectTypes(): array
     }
 
     /**
-     * Returns the conditions of existing objects, grouped by the id of the object.
+     * Returns the conditions of existing objects and whether the objects are
+     * disabled, grouped by the id of the object.
      *
      * @param list<int> $objectTypeIDs
-     * @return array<int, list<array{conditionID: int, objectTypeID: int, conditionData: string}>>
+     * @return array<int, array{
+     *  isDisabled: bool,
+     *  conditions: list<array{conditionID: int, objectTypeID: int, conditionData: string}>,
+     * }>
      */
     private function getConditionsByObject(array $objectTypeIDs): array
     {
@@ -122,7 +223,8 @@ private function getConditionsByObject(array $objectTypeIDs): array
 
         // Conditions of deleted objects are skipped.
         $sql = "SELECT      condition_table.conditionID, condition_table.objectTypeID,
-                            condition_table.objectID, condition_table.conditionData
+                            condition_table.objectID, condition_table.conditionData,
+                            object_table.isDisabled
                 FROM        wcf1_condition condition_table
                 INNER JOIN  {$this->tableName} object_table
                 ON          object_table.{$this->idColumn} = condition_table.objectID
@@ -131,21 +233,25 @@ private function getConditionsByObject(array $objectTypeIDs): array
         $statement = WCF::getDB()->prepare($sql);
         $statement->execute($conditionBuilder->getParameters());
 
-        $conditions = [];
+        $objects = [];
         while ($row = $statement->fetchArray()) {
-            $conditions[$row['objectID']][] = [
+            $objects[$row['objectID']] ??= [
+                'isDisabled' => (bool)$row['isDisabled'],
+                'conditions' => [],
+            ];
+            $objects[$row['objectID']]['conditions'][] = [
                 'conditionID' => $row['conditionID'],
                 'objectTypeID' => $row['objectTypeID'],
                 'conditionData' => $row['conditionData'],
             ];
         }
 
-        return $conditions;
+        return $objects;
     }
 
     /**
      * Appends the given filters to the object, deletes the converted legacy
-     * conditions and disables the object if some conditions are left.
+     * conditions and updates the disabled state unless it is `null`.
      *
      * @param list<array{0: string, 1: string}> $filters
      * @param list<int> $convertedConditionIDs
@@ -154,7 +260,7 @@ private function updateObject(
         int $objectID,
         array $filters,
         array $convertedConditionIDs,
-        bool $hasUnconvertedConditions
+        ?bool $isDisabled
     ): void {
         WCF::getDB()->beginTransaction();
         try {
@@ -192,12 +298,12 @@ private function updateObject(
                 $statement->execute($conditionBuilder->getParameters());
             }
 
-            if ($hasUnconvertedConditions) {
+            if ($isDisabled !== null) {
                 $sql = "UPDATE  {$this->tableName}
                         SET     isDisabled = ?
                         WHERE   {$this->idColumn} = ?";
                 $statement = WCF::getDB()->prepare($sql);
-                $statement->execute([1, $objectID]);
+                $statement->execute([(int)$isDisabled, $objectID]);
             }
 
             WCF::getDB()->commitTransaction();

From 17416b2cb07930feb1f87908c81f106060e8ab2b Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 29 Sep 2026 14:27:14 +0200
Subject: [PATCH 46/47] Allow language item variables for
 UserIntegerPropertyObjectFilter titles

---
 .../user/UserIntegerPropertyObjectFilter.class.php     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
index aa61340f7bb..e3518808221 100644
--- a/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
+++ b/wcfsetup/install/files/lib/system/object/filter/user/UserIntegerPropertyObjectFilter.class.php
@@ -28,10 +28,12 @@ final class UserIntegerPropertyObjectFilter extends AbstractRangeObjectFilter im
     /**
      * @param string $propertyName name of the integer column in `wcf1_user`
      * @param string $languageItem language item of the title of the property
+     * @param array<string, mixed> $languageItemVariables variables of the language item of the title
      */
     public function __construct(
         private readonly string $propertyName,
         private readonly string $languageItem,
+        private readonly array $languageItemVariables = [],
     ) {}
 
     #[\Override]
@@ -46,11 +48,17 @@ protected function getLanguageItem(): string
         return $this->languageItem;
     }
 
+    #[\Override]
+    public function getTitle(): string
+    {
+        return WCF::getLanguage()->getDynamicVariable($this->languageItem, $this->languageItemVariables);
+    }
+
     #[\Override]
     protected function createFormField(): NumericRangeFormField
     {
         return NumericRangeFormField::create('user' . \ucfirst($this->propertyName))
-            ->label($this->languageItem)
+            ->label($this->languageItem, $this->languageItemVariables)
             ->integerValues()
             ->minimum(0);
     }

From b1dd0931d6205a32a564691a537b7e167d05914b Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 29 Sep 2026 17:40:27 +0200
Subject: [PATCH 47/47] Remove legacy notice, ad and group assignment condition
 object types

---
 com.woltlab.wcf/objectType.xml                | 536 ++++++------------
 com.woltlab.wcf/objectTypeDefinition.xml      |   3 +
 com.woltlab.wcf/package.xml                   |   3 +
 .../templates/shared_multiPageCondition.tpl   |   1 +
 .../condition/DaysOfWeekCondition.class.php   |   1 +
 .../system/condition/TimeCondition.class.php  |   1 +
 .../condition/UserBirthdayCondition.class.php |   1 +
 .../UserMobileBrowserCondition.class.php      |   1 +
 .../page/MultiPageCondition.class.php         |   1 +
 9 files changed, 172 insertions(+), 376 deletions(-)

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 1aab4d228eb..2e47222f793 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -585,104 +585,6 @@
 			<categoryname>com.woltlab.wcf.user</categoryname>
 		</type>
 		<!-- /stat handlers -->
-		<!-- user group assignment conditions -->
-		<type>
-			<name>com.woltlab.wcf.username</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserUsernameCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.email</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserEmailCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.userGroup</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserGroupCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.languages</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserLanguageCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.registrationDate</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.registrationDateInterval</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.avatar</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserAvatarCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.signature</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserSignatureCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.coverPhoto</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserCoverPhotoCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.state</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserStateCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.activityPoints</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>activityPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.likesReceived</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>likesReceived</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.userOptions</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserOptionsCondition</classname>
-			<conditiongroup>userOptions</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.userTrophyCondition</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserTrophyCondition</classname>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.trophyPoints</name>
-			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>trophyPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<!-- /user group assignment conditions -->
 		<!-- trophy conditions -->
 		<type>
 			<name>com.woltlab.wcf.username</name>
@@ -781,145 +683,6 @@
 			<minvalue>0</minvalue>
 		</type>
 		<!-- /trophy conditions -->
-		<!-- notice conditions -->
-		<type>
-			<name>com.woltlab.wcf.page</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\page\MultiPageCondition</classname>
-			<conditionobject>com.woltlab.wcf.page</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.pointInTime.daysOfWeek</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\DaysOfWeekCondition</classname>
-			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.pointInTime.time</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\TimeCondition</classname>
-			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.username</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserUsernameCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.email</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserEmailCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.userGroup</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserGroupCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-			<includeguests>1</includeguests>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.languages</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserLanguageCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.registrationDate</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.registrationDateInterval</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.avatar</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserAvatarCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.state</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserStateCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.mobileBrowser</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserMobileBrowserCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.birthday</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserBirthdayCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.activityPoints</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>activityPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.likesReceived</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>likesReceived</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.userOptions</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserOptionsCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>userOptions</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.userTrophyCondition</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserTrophyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.trophyPoints</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>trophyPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.multifactor</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\UserMultifactorCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<!-- /notice conditions -->
 		<!-- ad locations -->
 		<type>
 			<name>com.woltlab.wcf.logo</name>
@@ -994,131 +757,6 @@
 			<cssclassname>wcfAdLocationArticleList wcfAdLocationAfterEvery10thArticle</cssclassname>
 		</type>
 		<!-- /ad locations -->
-		<!-- ad conditions -->
-		<type>
-			<name>com.woltlab.wcf.page</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\page\MultiPageCondition</classname>
-			<conditionobject>com.woltlab.wcf.page</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.pointInTime.daysOfWeek</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\DaysOfWeekCondition</classname>
-			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.pointInTime.time</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\TimeCondition</classname>
-			<conditionobject>com.woltlab.wcf.pointInTime</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.username</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserUsernameCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.email</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserEmailCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.userGroup</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserGroupCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-			<includeguests>1</includeguests>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.languages</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserLanguageCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.registrationDate</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.registrationDateInterval</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.avatar</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserAvatarCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.state</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserStateCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.mobileBrowser</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserMobileBrowserCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.activityPoints</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>activityPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.likesReceived</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>likesReceived</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.user.userOptions</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserOptionsCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>userOptions</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.userTrophyCondition</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserTrophyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>general</conditiongroup>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.trophyPoints</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
-			<conditionobject>com.woltlab.wcf.user</conditionobject>
-			<conditiongroup>contents</conditiongroup>
-			<propertyname>trophyPoints</propertyname>
-			<minvalue>0</minvalue>
-		</type>
-		<!-- /ad conditions -->
 		<!-- captcha types -->
 		<type>
 			<name>com.woltlab.wcf.recaptcha</name>
@@ -1750,20 +1388,6 @@
 			<definitionname>com.woltlab.wcf.file</definitionname>
 			<classname>wcf\system\file\processor\ReactionTypeIconFileProcessor</classname>
 		</type>
-		<!-- deprecated -->
-		<type>
-			<name>com.woltlab.wcf.page.controller</name>
-			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
-			<classname>wcf\system\condition\MultiPageControllerCondition</classname>
-			<conditionobject>com.woltlab.wcf.page</conditionobject>
-		</type>
-		<type>
-			<name>com.woltlab.wcf.page.controller</name>
-			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
-			<classname>wcf\system\condition\MultiPageControllerCondition</classname>
-			<conditionobject>com.woltlab.wcf.page</conditionobject>
-		</type>
-		<!-- /deprecated -->
 	</import>
 	<delete>
 		<!-- sitemap objects are registered through `wcf\event\sitemap\SitemapObjectCollecting` since 6.3 -->
@@ -1824,5 +1448,165 @@
 		<type name="com.woltlab.wcf.moderation.queue">
 			<definitionname>com.woltlab.wcf.clipboardItem</definitionname>
 		</type>
+		<!-- legacy conditions of notices, ads and user group assignments are replaced by object filters since 6.3 -->
+		<type name="com.woltlab.wcf.username">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.email">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.userGroup">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.languages">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.registrationDate">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.registrationDateInterval">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.avatar">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.signature">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.coverPhoto">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.state">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.activityPoints">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.likesReceived">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.userOptions">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.userTrophyCondition">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.trophyPoints">
+			<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.page">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.pointInTime.daysOfWeek">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.pointInTime.time">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.username">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.email">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.userGroup">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.languages">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.registrationDate">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.registrationDateInterval">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.avatar">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.state">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.mobileBrowser">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.birthday">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.activityPoints">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.likesReceived">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.userOptions">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.userTrophyCondition">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.trophyPoints">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.multifactor">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.page.controller">
+			<definitionname>com.woltlab.wcf.condition.notice</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.page">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.pointInTime.daysOfWeek">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.pointInTime.time">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.username">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.email">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.userGroup">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.languages">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.registrationDate">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.registrationDateInterval">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.avatar">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.state">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.mobileBrowser">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.activityPoints">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.likesReceived">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.user.userOptions">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.userTrophyCondition">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.trophyPoints">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
+		<type name="com.woltlab.wcf.page.controller">
+			<definitionname>com.woltlab.wcf.condition.ad</definitionname>
+		</type>
 	</delete>
 </data>
diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index f3bd5c6159b..a9348bec6b4 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -117,6 +117,7 @@
 			<name>com.woltlab.wcf.condition.box</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.userGroupAssignment</name>
 			<interfacename>wcf\system\condition\IUserCondition</interfacename>
@@ -125,6 +126,7 @@
 			<name>com.woltlab.wcf.condition.trophy</name>
 			<interfacename>wcf\system\condition\IUserCondition</interfacename>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.notice</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>
@@ -136,6 +138,7 @@
 		<definition>
 			<name>com.woltlab.wcf.adLocation</name>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.ad</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 69eaa4bcdc8..1f51200606b 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -70,6 +70,9 @@
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_likeObject.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step1.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_conditions.php</instruction>
+	The `objectType` PIP must run after `update_com.woltlab.wcf_6.3_conditions.php`,
+	because deleting the legacy condition object types cascades to `wcf1_condition`.
+	<instruction type="objectType" />
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_styleTemplateGroup.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step2.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_embeddedObjects.php</instruction>
diff --git a/com.woltlab.wcf/templates/shared_multiPageCondition.tpl b/com.woltlab.wcf/templates/shared_multiPageCondition.tpl
index a097b57fdc0..b7936ae9006 100644
--- a/com.woltlab.wcf/templates/shared_multiPageCondition.tpl
+++ b/com.woltlab.wcf/templates/shared_multiPageCondition.tpl
@@ -1,3 +1,4 @@
+{* @deprecated 6.3 Only used by the deprecated `MultiPageCondition`. *}
 <dl>
 	<dt></dt>
 	<dd>
diff --git a/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php b/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php
index 2964e649782..86964ebb2e5 100644
--- a/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/DaysOfWeekCondition.class.php
@@ -12,6 +12,7 @@
  * @author  Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated  6.3 Use `wcf\system\object\filter\user\DaysOfWeekObjectFilter` instead.
  */
 class DaysOfWeekCondition extends AbstractMultiSelectCondition implements IContentCondition
 {
diff --git a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
index e5029cd5d04..636369e8fed 100644
--- a/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/TimeCondition.class.php
@@ -14,6 +14,7 @@
  * @author  Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated  6.3 The time of day is no longer supported as a condition.
  */
 class TimeCondition extends AbstractMultipleFieldsCondition implements IContentCondition
 {
diff --git a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
index 15dc5584e8c..0ecb4e85ce9 100644
--- a/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserBirthdayCondition.class.php
@@ -12,6 +12,7 @@
  * @author  Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated  6.3 Use `wcf\system\object\filter\user\UserBirthdayObjectFilter` instead.
  */
 class UserBirthdayCondition extends AbstractCondition implements IContentCondition
 {
diff --git a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
index 3dd7ad6deff..acc6ed2772b 100644
--- a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php
@@ -13,6 +13,7 @@
  * @author  Joshua Ruesweg, Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated  6.3 Use `wcf\system\object\filter\user\UserMobileBrowserObjectFilter` instead.
  */
 class UserMobileBrowserCondition extends AbstractSingleFieldCondition implements IContentCondition
 {
diff --git a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
index 06c491f2f42..6f4fc1a0aac 100644
--- a/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/page/MultiPageCondition.class.php
@@ -18,6 +18,7 @@
  * @author  Matthias Schmidt
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated  6.3 Use `wcf\system\object\filter\RequestedPageObjectFilter` or `wcf\system\object\filter\NotRequestedPageObjectFilter` instead.
  */
 class MultiPageCondition extends AbstractMultiSelectCondition implements IContentCondition
 {