diff options
author | JoramWilander <jwawilander@gmail.com> | 2016-04-01 11:53:49 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2016-04-04 08:30:11 -0400 |
commit | 0f3d62364b7efaa553c711f2a63852a09b34277c (patch) | |
tree | 1e04f5fbd081dc32025784ccc1e990a1507632b3 /webapp/components/rhs_root_post.jsx | |
parent | 785553384fe96027b0e9274b6ccc8623092eda70 (diff) | |
download | chat-0f3d62364b7efaa553c711f2a63852a09b34277c.tar.gz chat-0f3d62364b7efaa553c711f2a63852a09b34277c.tar.bz2 chat-0f3d62364b7efaa553c711f2a63852a09b34277c.zip |
Properly display webhook username/icon in search results
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
-rw-r--r-- | webapp/components/rhs_root_post.jsx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index 7a7c5f692..9a207e429 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -213,21 +213,10 @@ export default class RhsRootPost extends React.Component { ); } - let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp; - if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') { - if (post.props.override_icon_url) { - src = post.props.override_icon_url; - } else { - src = Constants.DEFAULT_WEBHOOK_LOGO; - } - } else if (Utils.isSystemMessage(post)) { - src = Constants.SYSTEM_MESSAGE_PROFILE_IMAGE; - } - const profilePic = ( <img className='post-profile-img' - src={src} + src={Utils.getProfilePicSrcForPost(post, timestamp)} height='36' width='36' /> |