From 188d840ea717b2d4f3f2cf0e3053e73fa5168adb Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 18 May 2022 17:33:45 +0200
Subject: [PATCH] Support search for multiple authors

---
 com.woltlab.wcf/templates/search.tpl          |  8 +++++---
 ts/WoltLabSuite/Core/Ui/Search/Extended.ts    | 20 ++++++++++++++++++-
 .../WoltLabSuite/Core/Ui/Search/Extended.js   | 14 ++++++++++++-
 .../lib/data/search/SearchAction.class.php    |  4 ++--
 .../lib/system/search/SearchHandler.class.php | 16 +++++++--------
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index a3233bbfd8..699119cda2 100644
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -30,7 +30,7 @@
 				<dl>
 					<dt><label for="searchAuthor">{lang}wcf.search.author{/lang}</label></dt>
 					<dd>
-						<input type="text" id="searchAuthor" name="username" value="" class="medium" maxlength="255" autocomplete="off">
+						<input type="text" id="searchAuthor" name="usernames" value="" class="medium" autocomplete="off">
 						{* deprecated *}{event name='authorOptions'}
 					</dd>
 				</dl>
@@ -80,8 +80,10 @@
 </form>
 
 <script data-relocate="true">
-	require(['WoltLabSuite/Core/Ui/User/Search/Input'], (UiUserSearchInput) => {
-		new UiUserSearchInput(document.getElementById('searchAuthor'));
+	require(['WoltLabSuite/Core/Ui/ItemList/User'], function(UiItemListUser) {
+		UiItemListUser.init('searchAuthor', {
+			maxItems: 5
+		});
 	});
 	require(['WoltLabSuite/Core/Ui/Search/Extended'], ({ UiSearchExtended }) => {
 		new UiSearchExtended();
diff --git a/ts/WoltLabSuite/Core/Ui/Search/Extended.ts b/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
index 9f544e3ad8..640de5ec46 100644
--- a/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
+++ b/ts/WoltLabSuite/Core/Ui/Search/Extended.ts
@@ -14,7 +14,8 @@ import * as DomUtil from "../../Dom/Util";
 import { ucfirst } from "../../StringUtil";
 import UiPagination from "../Pagination";
 import UiSearchInput from "./Input";
-import * as UiScroll from "./../Scroll";
+import * as UiScroll from "../Scroll";
+import { setValues as setItemListValues } from "../ItemList";
 
 type ResponseSearch = {
   count: number;
@@ -196,6 +197,23 @@ export class UiSearchExtended {
             DatePicker.setDate(id, new Date(value));
           }
         } else if (element instanceof HTMLInputElement) {
+          if (element.classList.contains("itemListInputShadow")) {
+            const itemList = element.nextElementSibling as HTMLElement;
+            if (itemList?.classList.contains("inputItemList")) {
+              setItemListValues(
+                itemList.dataset.elementId!,
+                value.split(",").map((value) => {
+                  return {
+                    objectId: 0,
+                    value: value.trim(),
+                  };
+                }),
+              );
+            }
+
+            return;
+          }
+
           if (element.type === "checkbox") {
             element.checked = true;
           } else {
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
index 95b89cc9d4..fe4b2af6f9 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Search/Extended.js
@@ -7,7 +7,7 @@
  * @module  WoltLabSuite/Core/Ui/Search/Extended
  * @woltlabExcludeBundle all
  */
-define(["require", "exports", "tslib", "../../Ajax", "../../Date/Picker", "../../Dom/Util", "../../StringUtil", "../Pagination", "./Input", "./../Scroll"], function (require, exports, tslib_1, Ajax_1, Picker_1, DomUtil, StringUtil_1, Pagination_1, Input_1, UiScroll) {
+define(["require", "exports", "tslib", "../../Ajax", "../../Date/Picker", "../../Dom/Util", "../../StringUtil", "../Pagination", "./Input", "../Scroll", "../ItemList"], function (require, exports, tslib_1, Ajax_1, Picker_1, DomUtil, StringUtil_1, Pagination_1, Input_1, UiScroll, ItemList_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.UiSearchExtended = void 0;
@@ -152,6 +152,18 @@ define(["require", "exports", "tslib", "../../Ajax", "../../Date/Picker", "../..
                         }
                     }
                     else if (element instanceof HTMLInputElement) {
+                        if (element.classList.contains("itemListInputShadow")) {
+                            const itemList = element.nextElementSibling;
+                            if (itemList === null || itemList === void 0 ? void 0 : itemList.classList.contains("inputItemList")) {
+                                (0, ItemList_1.setValues)(itemList.dataset.elementId, value.split(",").map((value) => {
+                                    return {
+                                        objectId: 0,
+                                        value: value.trim(),
+                                    };
+                                }));
+                            }
+                            return;
+                        }
                         if (element.type === "checkbox") {
                             element.checked = true;
                         }
diff --git a/wcfsetup/install/files/lib/data/search/SearchAction.class.php b/wcfsetup/install/files/lib/data/search/SearchAction.class.php
index 18d7caa8c5..4016205ae2 100644
--- a/wcfsetup/install/files/lib/data/search/SearchAction.class.php
+++ b/wcfsetup/install/files/lib/data/search/SearchAction.class.php
@@ -53,7 +53,7 @@ class SearchAction extends AbstractDatabaseObjectAction
     {
         $this->readString('q', true);
         $this->readString('type', true);
-        $this->readString('username', true);
+        $this->readString('usernames', true);
         $this->readBoolean('subjectOnly', true);
         $this->readString('startDate', true);
         $this->readString('endDate', true);
@@ -61,7 +61,7 @@ class SearchAction extends AbstractDatabaseObjectAction
         $this->readString('sortOrder', true);
         $this->readInteger('pageNo', true);
 
-        if (empty($this->parameters['q']) && empty($this->parameters['username'])) {
+        if (empty($this->parameters['q']) && empty($this->parameters['usernames'])) {
             throw new UserInputException('q');
         }
 
diff --git a/wcfsetup/install/files/lib/system/search/SearchHandler.class.php b/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
index 523ea0f315..71c7abbd7d 100644
--- a/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
+++ b/wcfsetup/install/files/lib/system/search/SearchHandler.class.php
@@ -5,11 +5,13 @@ namespace wcf\system\search;
 use wcf\data\search\keyword\SearchKeywordAction;
 use wcf\data\search\Search;
 use wcf\data\search\SearchAction;
+use wcf\data\user\UserList;
 use wcf\form\SearchForm;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
+use wcf\util\ArrayUtil;
 
 /**
  * Performs full-text search.
@@ -221,13 +223,11 @@ final class SearchHandler
         if ($this->userIDs === null) {
             $this->userIDs = [];
 
-            if (!empty($this->parameters['username'])) {
-                $sql = "SELECT  userID
-                        FROM    wcf" . WCF_N . "_user
-                        WHERE   username = ?";
-                $statement = WCF::getDB()->prepareStatement($sql, 100);
-                $statement->execute([$this->parameters['username']]);
-                $this->userIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+            if (!empty($this->parameters['usernames'])) {
+                $userList = new UserList();
+                $userList->getConditionBuilder()->add('username IN (?)', [ArrayUtil::trim(\explode(',', $this->parameters['usernames']))]);
+                $userList->readObjectIDs();
+                $this->userIDs = $userList->getObjectIDs();
             }
 
             if (!empty($this->parameters['userID'])) {
@@ -314,7 +314,7 @@ final class SearchHandler
             'subjectOnly' => $this->parameters['subjectOnly'] ?? '',
             'startDate' => $this->parameters['startDate'] ?? '',
             'endDate' => $this->parameters['endDate'] ?? '',
-            'username' => $this->parameters['username'] ?? '',
+            'usernames' => $this->parameters['usernames'] ?? '',
             'userID' => $this->parameters['userID'] ?? '',
             'objectTypeNames' => $this->objectTypeNames,
         ];
-- 
2.20.1