diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-02 12:00:58 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-06-02 12:00:58 -0400 |
commit | 1c9ec861fd39ea3bb3361813c3a44483da3e3f56 (patch) | |
tree | 27c4c89df5ca7fb844d78c0cf5ed1f578ae80983 | |
parent | 2f88bcb2232e1e24456ac9ddfd72fd38727519f2 (diff) | |
download | chat-1c9ec861fd39ea3bb3361813c3a44483da3e3f56.tar.gz chat-1c9ec861fd39ea3bb3361813c3a44483da3e3f56.tar.bz2 chat-1c9ec861fd39ea3bb3361813c3a44483da3e3f56.zip |
Properly filter in more channels search (#6513)
-rw-r--r-- | webapp/actions/channel_actions.jsx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/actions/channel_actions.jsx b/webapp/actions/channel_actions.jsx index 6acb05454..e756275bc 100644 --- a/webapp/actions/channel_actions.jsx +++ b/webapp/actions/channel_actions.jsx @@ -43,6 +43,8 @@ import { deleteChannel as deleteChannelRedux } from 'mattermost-redux/actions/channels'; +import {getMyChannelMemberships} from 'mattermost-redux/selectors/entities/channels'; + export function goToChannel(channel) { if (channel.fake) { const user = UserStore.getProfileByUsername(channel.display_name); @@ -294,7 +296,9 @@ export function searchMoreChannels(term, success, error) { searchChannels(TeamStore.getCurrentId(), term)(dispatch, getState).then( (data) => { if (data && success) { - success(data); + const myMembers = getMyChannelMemberships(getState()); + const channels = data.filter((c) => !myMembers[c.id]); + success(channels); } else if (data == null && error) { const serverError = getState().requests.channels.getChannels.error; error({id: serverError.server_error_id, ...serverError}); |