diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-06 15:22:12 -0400 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-09-06 16:22:12 -0300 |
| commit | b8927e4bfa388337c5911264b3df81738137df7e (patch) | |
| tree | cfd995eaf253d84dec098e4426d03c4fe33d20bd /webapp | |
| parent | cf9ff0988b6e962498f10e144fc4416b83f70f18 (diff) | |
| download | chat-b8927e4bfa388337c5911264b3df81738137df7e.tar.gz chat-b8927e4bfa388337c5911264b3df81738137df7e.tar.bz2 chat-b8927e4bfa388337c5911264b3df81738137df7e.zip | |
Look at direct profiles when viewing a direct channel thread in the RHS (#3971)
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/rhs_thread.jsx | 10 |
1 files changed, 8 insertions, 2 deletions
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 ( |