From b8927e4bfa388337c5911264b3df81738137df7e Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 6 Sep 2016 15:22:12 -0400
Subject: Look at direct profiles when viewing a direct channel thread in the
 RHS (#3971)

---
 webapp/components/rhs_thread.jsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'webapp')

diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx
index b51a12792..e4267dc04 100644
--- a/webapp/components/rhs_thread.jsx
+++ b/webapp/components/rhs_thread.jsx
@@ -8,6 +8,7 @@ import RootPost from './rhs_root_post.jsx';
 import Comment from './rhs_comment.jsx';
 import FileUploadOverlay from './file_upload_overlay.jsx';
 
+import ChannelStore from 'stores/channel_store.jsx';
 import PostStore from 'stores/post_store.jsx';
 import UserStore from 'stores/user_store.jsx';
 import PreferenceStore from 'stores/preference_store.jsx';
@@ -237,7 +238,12 @@ export default class RhsThread extends React.Component {
     render() {
         const postsArray = this.state.postsArray;
         const selected = this.state.selected;
-        const profiles = this.state.profiles || {};
+        const channel = ChannelStore.get(this.state.selected.channel_id);
+
+        let profiles = this.state.profiles || {};
+        if (channel && channel.type === Constants.DM_CHANNEL) {
+            profiles = Object.assign({}, profiles, UserStore.getDirectProfiles());
+        }
 
         if (postsArray == null || selected == null) {
             return (
@@ -265,7 +271,7 @@ export default class RhsThread extends React.Component {
 
         let rootStatus = 'offline';
         if (this.state.statuses) {
-            rootStatus = this.state.statuses[profile.id] || 'offline';
+            rootStatus = this.state.statuses[selected.user_id] || 'offline';
         }
 
         return (
-- 
cgit v1.2.3-1-g7c22