Skip to content

[stable25] fix: mention search issues #3143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 4 commits into from
Oct 11, 2022
Merged

[stable25] fix: mention search issues #3143

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20718bc
fix: mention search issues
luka-nextcloud Sep 28, 2022
6b43389
fix: feedback
luka-nextcloud Oct 3, 2022
476d01e
fix: feedback
luka-nextcloud Oct 5, 2022
30c68a4
Remove unneeded IUserSession from UserApiController
mejo- Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: mention search issues 
Signed-off-by: Luka Trovic <[email protected]>
  • Loading branch information
@luka-nextcloud @mejo-
luka-nextcloud authored and mejo- committed Oct 11, 2022
commit 20718bc23a886182c7bae1e79d1fd01a92ff251d
12 changes: 7 additions & 5 deletions lib/Controller/UserApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Share\IShare;
use Psr\Log\LoggerInterface;

class UserApiController extends ApiController {
private ISearch $collaboratorSearch;
Expand Down Expand Up @@ -43,24 +44,25 @@ public function index(int $documentId, int $sessionId, string $sessionToken, str
foreach ($sessions as $session) {
$sessionUserId = $session['userId'];
if ($sessionUserId !== null && !isset($users[$sessionUserId])) {
$users[$sessionUserId] = $this->userManager->getDisplayName($sessionUserId);
$displayName = $this->userManager->getDisplayName($sessionUserId);
if (stripos($displayName, $filter) !== false) {
$users[$sessionUserId] = $displayName;
}
}
}

$currentSession = $this->sessionService->getSession($documentId, $sessionId, $sessionToken);
if ($currentSession->getUserId() !== null) {
// Add other users to the autocomplete list
[$result] = $this->collaboratorSearch->search($filter, [IShare::TYPE_USER], false, $limit, 0);
$userSearch = array_merge($result['users'], $result['exact']['users']);

foreach ($result['users'] as ['label' => $label, 'value' => $value]) {
foreach ($userSearch as ['label' => $label, 'value' => $value]) {
if (isset($value['shareWith'])) {
$id = $value['shareWith'];
$users[$id] = $label;
}
}

$user = $this->userSession->getUser();
$users[$user->getUID()] = $user->getDisplayName();
}

return new DataResponse($users);
Expand Down