1 files changed, 32 insertions, 22 deletions

diff --git a/webapp/utils/channel_utils.jsx b/webapp/utils/channel_utils.jsx
index 22c428cb8..2bb30af5c 100644
--- a/webapp/utils/channel_utils.jsx
+++ b/webapp/utils/channel_utils.jsx
@@ -5,7 +5,6 @@ const Preferences = Constants.Preferences;
 import * as Utils from 'utils/utils.jsx';
 
 import UserStore from 'stores/user_store.jsx';
-import TeamStore from 'stores/team_store.jsx';
 import PreferenceStore from 'stores/preference_store.jsx';
 import LocalizationStore from 'stores/localization_store.jsx';
 
@@ -15,30 +14,28 @@ import LocalizationStore from 'stores/localization_store.jsx';
  * Example: {
  *  publicChannels: [...],
  *  privateChannels: [...],
- *  directChannels: [...],
- *  directNonTeamChannels: [...],
+ *  directAndGroupChannels: [...],
  *  favoriteChannels: [...]
  * }
  */
 export function buildDisplayableChannelList(persistentChannels) {
-    const missingDMChannels = createMissingDirectChannels(persistentChannels);
+    const missingDirectChannels = createMissingDirectChannels(persistentChannels);
 
     const channels = persistentChannels.
-        concat(missingDMChannels).
+        concat(missingDirectChannels).
         map(completeDirectChannelInfo).
         filter(isNotDeletedChannel).
         sort(sortChannelsByDisplayName);
 
     const favoriteChannels = channels.filter(isFavoriteChannel);
     const notFavoriteChannels = channels.filter(not(isFavoriteChannel));
-    const directChannels = notFavoriteChannels.filter(andX(isDirectChannel, isDirectChannelVisible));
+    const directAndGroupChannels = notFavoriteChannels.filter(orX(andX(isGroupChannel, isGroupChannelVisible), andX(isDirectChannel, isDirectChannelVisible)));
 
     return {
         favoriteChannels,
         publicChannels: notFavoriteChannels.filter(isOpenChannel),
         privateChannels: notFavoriteChannels.filter(isPrivateChannel),
-        directChannels: directChannels.filter(isConnectedToTeamMember),
-        directNonTeamChannels: directChannels.filter(isNotConnectedToTeamMember)
+        directAndGroupChannels
     };
 }
 
@@ -62,6 +59,14 @@ export function isPrivateChannel(channel) {
     return channel.type === Constants.PRIVATE_CHANNEL;
 }
 
+export function isGroupChannel(channel) {
+    return channel.type === Constants.GM_CHANNEL;
+}
+
+export function isGroupChannelVisible(channel) {
+    return PreferenceStore.getBool(Preferences.CATEGORY_GROUP_CHANNEL_SHOW, channel.id);
+}
+
 export function isDirectChannel(channel) {
     return channel.type === Constants.DM_CHANNEL;
 }
@@ -88,12 +93,12 @@ export function completeDirectChannelInfo(channel) {
 }
 
 const defaultPrefix = 'D'; // fallback for future types
-const typeToPrefixMap = {[Constants.OPEN_CHANNEL]: 'A', [Constants.PRIVATE_CHANNEL]: 'B', [Constants.DM_CHANNEL]: 'C'};
+const typeToPrefixMap = {[Constants.OPEN_CHANNEL]: 'A', [Constants.PRIVATE_CHANNEL]: 'B', [Constants.DM_CHANNEL]: 'C', [Constants.GM_CHANNEL]: 'C'};
 
 export function sortChannelsByDisplayName(a, b) {
     const locale = LocalizationStore.getLocale();
 
-    if (a.type !== b.type) {
+    if (a.type !== b.type && typeToPrefixMap[a.type] !== typeToPrefixMap[b.type]) {
         return (typeToPrefixMap[a.type] || defaultPrefix).localeCompare((typeToPrefixMap[b.type] || defaultPrefix), locale);
     }
 
@@ -186,6 +191,19 @@ export function showDeleteOption(channel, isAdmin, isSystemAdmin, isChannelAdmin
     return true;
 }
 
+export function buildGroupChannelName(channelId) {
+    const profiles = UserStore.getProfileListInChannel(channelId, true);
+    let displayName = '';
+    for (let i = 0; i < profiles.length; i++) {
+        displayName += Utils.displayUsernameForUser(profiles[i]);
+        if (i !== profiles.length - 1) {
+            displayName += ', ';
+        }
+    }
+
+    return displayName;
+}
+
 /*
  * not exported helpers
  */
@@ -215,22 +233,14 @@ function createFakeChannelCurried(userId) {
     return (otherUserId) => createFakeChannel(userId, otherUserId);
 }
 
-function isConnectedToTeamMember(channel) {
-    return isTeamMember(channel.teammate_id);
-}
-
-function isTeamMember(userId) {
-    return TeamStore.hasActiveMemberInTeam(TeamStore.getCurrentId(), userId);
-}
-
-function isNotConnectedToTeamMember(channel) {
-    return TeamStore.hasMemberNotInTeam(TeamStore.getCurrentId(), channel.teammate_id);
-}
-
 function not(f) {
     return (...args) => !f(...args);
 }
 
+function orX(...fns) {
+    return (...args) => fns.some((f) => f(...args));
+}
+
 function andX(...fns) {
     return (...args) => fns.every((f) => f(...args));
 }