Merge pull request #1652 from hmhealey/plt1319

PLT-1319 Fixed direct channels not being visible when no actual channel exists

2 files changed, 8 insertions, 1 deletions

diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 891bc4624..d23c18b5d 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -35,6 +35,7 @@ export default {
         RECIEVED_AUDITS: null,
         RECIEVED_TEAMS: null,
         RECIEVED_STATUSES: null,
+        RECIEVED_PREFERENCE: null,
         RECIEVED_PREFERENCES: null,
 
         RECIEVED_MSG: null,
@@ -74,7 +75,8 @@ export default {
         NEW_USER: 'new_user',
         USER_ADDED: 'user_added',
         USER_REMOVED: 'user_removed',
-        TYPING: 'typing'
+        TYPING: 'typing',
+        PREFERENCE_CHANGED: 'preference_changed'
     },
 
     //SPECIAL_MENTIONS: ['all', 'channel'],
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index c2e4276b0..fb8b89252 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -1138,6 +1138,11 @@ export function getUserIdFromChannelName(channel) {
     return otherUserId;
 }
 
+// Returns true if the given channel is a direct channel between the current user and the given one
+export function isDirectChannelForUser(otherUserId, channel) {
+    return channel.type === Constants.DM_CHANNEL && getUserIdFromChannelName(channel) === otherUserId;
+}
+
 export function importSlack(file, success, error) {
     var formData = new FormData();
     formData.append('file', file, file.name);