diff options
author | Chris <ccbrown112@gmail.com> | 2017-07-19 13:54:16 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-07-19 13:54:16 -0700 |
commit | 673f3a1144884373540030a8f5cca3bad3d00b63 (patch) | |
tree | a7555e741730e9af34b56b194aac3c05b5ab206a /webapp/components/post_view | |
parent | 23a59b03dd272ea26878622a3f46576fcf9e59c8 (diff) | |
download | chat-673f3a1144884373540030a8f5cca3bad3d00b63.tar.gz chat-673f3a1144884373540030a8f5cca3bad3d00b63.tar.bz2 chat-673f3a1144884373540030a8f5cca3bad3d00b63.zip |
PLT-6689: fix user image requests (#6946)
* fix user image requests
* fix eslint errors and a few more cache busters
Diffstat (limited to 'webapp/components/post_view')
-rw-r--r-- | webapp/components/post_view/post/post.jsx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/webapp/components/post_view/post/post.jsx b/webapp/components/post_view/post/post.jsx index eda4405bb..4491d888c 100644 --- a/webapp/components/post_view/post/post.jsx +++ b/webapp/components/post_view/post/post.jsx @@ -199,13 +199,6 @@ export default class Post extends React.PureComponent { const isSystemMessage = PostUtils.isSystemMessage(post); const fromWebhook = post.props && post.props.from_webhook === 'true'; - let timestamp = 0; - if (!this.props.user || this.props.user.last_picture_update == null) { - timestamp = this.props.currentUser.last_picture_update; - } else { - timestamp = this.props.user.last_picture_update; - } - let status = this.props.status; if (fromWebhook) { status = null; @@ -213,7 +206,7 @@ export default class Post extends React.PureComponent { let profilePic = ( <ProfilePicture - src={PostUtils.getProfilePicSrcForPost(post, timestamp)} + src={PostUtils.getProfilePicSrcForPost(post, this.props.user)} status={status} user={this.props.user} isBusy={this.props.isBusy} @@ -223,7 +216,7 @@ export default class Post extends React.PureComponent { if (fromWebhook) { profilePic = ( <ProfilePicture - src={PostUtils.getProfilePicSrcForPost(post, timestamp)} + src={PostUtils.getProfilePicSrcForPost(post, this.props.user)} /> ); } else if (PostUtils.isSystemMessage(post)) { |