fixup! feat(chat): Autocomplete for mentions of federated users

nextcloud · Feb 15, 2024 · a8bc489 · a8bc489
1 parent fe093a4
commit a8bc489
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Chat/AutoComplete/SearchPlugin.php b/lib/Chat/AutoComplete/SearchPlugin.php
@@ -71,7 +71,11 @@ public function search($search, $limit, $offset, ISearchResult $searchResult): b
 		if ($this->room->getObjectType() === 'file') {
 			$usersWithFileAccess = $this->util->getUsersWithAccessFile($this->room->getObjectId());
 			if (!empty($usersWithFileAccess)) {
-				$this->searchUsers($search, $usersWithFileAccess, $searchResult);
+				$users = [];
+				foreach ($usersWithFileAccess as $userId) {
+					$users[$userId] = $this->userManager->getDisplayName($userId) ?? $userId;
+				}
+				$this->searchUsers($search, $users, $searchResult);
 			}
 		}
 

diff --git a/lib/Files/Util.php b/lib/Files/Util.php
@@ -48,6 +48,9 @@ public function __construct(
 	) {
 	}
 
+	/**
+	 * @return string[]
+	 */
 	public function getUsersWithAccessFile(string $fileId): array {
 		if (!isset($this->accessLists[$fileId])) {
 			$nodes = $this->rootFolder->getById((int) $fileId);