From 1c9ec861fd39ea3bb3361813c3a44483da3e3f56 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Fri, 2 Jun 2017 12:00:58 -0400
Subject: Properly filter in more channels search (#6513)

---
 webapp/actions/channel_actions.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'webapp/actions')

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});
-- 
cgit v1.2.3-1-g7c22