Skip to content
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

[FIX] MessageBox mention shouldn't show group DMs #2049

Merged
merged 21 commits into from
Apr 30, 2020
Merged

[FIX] MessageBox mention shouldn't show group DMs #2049

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d0af3c0
Merge pull request #1 from RocketChat/develop
Prateek93a Oct 29, 2019
5eeb5ce
Merge pull request #2 from RocketChat/develop
Prateek93a Dec 5, 2019
eb42238
Merge branch 'develop' of https://github.com/Prateek93a/Rocket.Chat.R…
Prateek93a Feb 22, 2020
45ac82a
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Feb 22, 2020
827cd42
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Mar 2, 2020
169c159
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Mar 4, 2020
4350cde
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Mar 11, 2020
9d0c8ec
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Mar 14, 2020
bb4d912
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Mar 22, 2020
bee1920
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 1, 2020
d48214d
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 1, 2020
e25eb0f
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 1, 2020
fa773ae
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 3, 2020
c2e3dc1
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 4, 2020
28d0419
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 8, 2020
0aff35f
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 10, 2020
bc57534
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 14, 2020
3bc743a
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Apr 15, 2020
f47bb2a
fixed-issue
Prateek93a Apr 20, 2020
f4b9cab
[FIX] Filter users only if it's not a group chat
djorkaeffalexandre Apr 29, 2020
fcce85b
Merge branch 'develop' into fix-group-mention
diegolmello Apr 30, 2020
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
4 changes: 2 additions & 2 deletions app/lib/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,9 @@ const RocketChat = {
).fetch();

if (filterUsers && !filterRooms) {
data = data.filter(item => item.t === 'd');
data = data.filter(item => item.t === 'd' && !RocketChat.isGroupChat(item));
} else if (!filterUsers && filterRooms) {
data = data.filter(item => item.t !== 'd');
data = data.filter(item => item.t !== 'd' || RocketChat.isGroupChat(item));
}
data = data.slice(0, 7);

Expand Down