Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1e37164
Add support for public shares to file rooms
danxuliu Jul 18, 2018
37f2f71
Add integration tests for files shared by link
danxuliu Aug 14, 2019
d1a3e69
Add integration tests for self-joined users in files shared by link
danxuliu Aug 14, 2019
f2e7806
Add self-joined users and guests to the candidate mentions in file rooms
danxuliu Aug 14, 2019
fc6d2a4
Add integration tests for mentions in a file shared by link
danxuliu Aug 14, 2019
6b04fb7
Fix avatar container height during calls
danxuliu Sep 16, 2019
094b9b3
Add support for Talk sidebar in public share pages
danxuliu Aug 15, 2019
18a1037
Add basic acceptance tests for the Talk sidebar in the public share page
danxuliu Aug 16, 2019
465059d
Add acceptance tests for Talk sidebar in public share page to Drone
danxuliu Aug 16, 2019
1521c5f
Add acceptance tests for registered users in the public share page
danxuliu Aug 16, 2019
f6ac589
Add acceptance tests for mentioning users in the Files app
danxuliu Aug 16, 2019
b8be6a7
Add acceptance tests for mentions in the public share page
danxuliu Aug 16, 2019
3361774
Add acceptance tests for chats in a file shared by link
danxuliu Aug 16, 2019
bab3557
Add acceptance tests for chats in a file shared by link with a password
danxuliu Aug 16, 2019
744de08
Correctly check if the share has a password and if it was entered cor…
nickvergessen Aug 16, 2019
2f58186
Add integration tests for getting the room for link share with password
danxuliu Aug 17, 2019
6b0a0dc
Do not add system message for self joined users to file rooms
danxuliu Aug 19, 2019
ad37a86
Add integration tests for the "user_added" system message
danxuliu Aug 19, 2019
2f12dc9
Add wrapper around "OC.getCurrentUser()" to be able to override the user
danxuliu Sep 25, 2019
4b9a47a
Override the current user when getting the room for a public share page
danxuliu Sep 25, 2019
68797f3
Fix guest avatars in public share page
danxuliu Sep 25, 2019
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
Prev Previous commit
Next Next commit
Add self-joined users and guests to the candidate mentions in file rooms
File rooms were available only to users with direct access to the file,
so those were the users that could be mentioned. Now file rooms are
publicly available if the file is shared by link, so the mentions now
include all the users with direct access to the file like before plus
all the self-joined users and guests currently in the room.

Note, however, that self-joined users and guests can still not mention
users with direct access to the file that have not joined the room yet,
but only those that joined the room already (plus any participant that
is currently in the room).

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
danxuliu committed Sep 27, 2019
commit f2e780617a80a029c7bfe4b678ece2af2b97a504
9 changes: 6 additions & 3 deletions lib/Chat/AutoComplete/SearchPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
if (!empty($usersWithFileAccess)) {
$this->searchUsers($search, $usersWithFileAccess, $searchResult);
}

return false;
}

$userIds = $guestSessionHashes = [];
Expand Down Expand Up @@ -113,13 +111,19 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
protected function searchUsers(string $search, array $userIds, ISearchResult $searchResult): void {
$search = strtolower($search);

$type = new SearchResultType('users');

$matches = $exactMatches = [];
foreach ($userIds as $userId) {
if ($this->userId !== '' && $this->userId === $userId) {
// Do not suggest the current user
continue;
}

if ($searchResult->hasResult($type, $userId)) {
continue;
}

if ($search === '') {
$matches[] = $this->createResult('user', $userId, '');
continue;
Expand Down Expand Up @@ -151,7 +155,6 @@ protected function searchUsers(string $search, array $userIds, ISearchResult $se
}
}

$type = new SearchResultType('users');
$searchResult->addResultSet($type, $matches, $exactMatches);
}

Expand Down