diff options
author | Corey Hulen <corey@hulen.com> | 2017-01-06 12:13:22 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-01-06 12:13:22 -0500 |
commit | e82bcea0d06b2173ed286f394ee33a393469eeaf (patch) | |
tree | 2280b8b8d030675e916d1e9fc5b89fa24aee1b50 /webapp/components/webrtc | |
parent | 1aa235b10d298926f2d683b2d1a5c82f6a9591e9 (diff) | |
download | chat-e82bcea0d06b2173ed286f394ee33a393469eeaf.tar.gz chat-e82bcea0d06b2173ed286f394ee33a393469eeaf.tar.bz2 chat-e82bcea0d06b2173ed286f394ee33a393469eeaf.zip |
PLT-5118 moving to last_picture_update for the profile img (#4985)
Diffstat (limited to 'webapp/components/webrtc')
-rw-r--r-- | webapp/components/webrtc/components/webrtc_notification.jsx | 2 | ||||
-rw-r--r-- | webapp/components/webrtc/webrtc_controller.jsx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/webrtc/components/webrtc_notification.jsx b/webapp/components/webrtc/components/webrtc_notification.jsx index 5456d6cb8..f69e731f8 100644 --- a/webapp/components/webrtc/components/webrtc_notification.jsx +++ b/webapp/components/webrtc/components/webrtc_notification.jsx @@ -197,7 +197,7 @@ export default class WebrtcNotification extends React.Component { const user = this.state.userCalling; if (user) { const username = Utils.displayUsername(user.id); - const profileImgSrc = Client.getUsersRoute() + '/' + user.id + '/image?time=' + (user.update_at || new Date().getTime()); + const profileImgSrc = Client.getUsersRoute() + '/' + user.id + '/image?time=' + (user.last_picture_update || new Date().getTime()); const profileImg = ( <img className='user-popover__image' diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx index 94e5b3475..03953a19a 100644 --- a/webapp/components/webrtc/webrtc_controller.jsx +++ b/webapp/components/webrtc/webrtc_controller.jsx @@ -81,14 +81,14 @@ export default class WebrtcController extends React.Component { const currentUser = UserStore.getCurrentUser(); const remoteUser = UserStore.getProfile(props.userId); - const remoteUserImage = Client.getUsersRoute() + '/' + remoteUser.id + '/image?time=' + remoteUser.update_at; + const remoteUserImage = Client.getUsersRoute() + '/' + remoteUser.id + '/image?time=' + remoteUser.last_picture_update; this.state = { windowWidth: Utils.windowWidth(), windowHeight: Utils.windowHeight(), channelId: ChannelStore.getCurrentId(), currentUser, - currentUserImage: Client.getUsersRoute() + '/' + currentUser.id + '/image?time=' + currentUser.update_at, + currentUserImage: Client.getUsersRoute() + '/' + currentUser.id + '/image?time=' + currentUser.last_picture_update, remoteUserImage, localMediaLoaded: false, isPaused: false, @@ -130,7 +130,7 @@ export default class WebrtcController extends React.Component { (nextProps.userId !== this.props.userId) || (nextProps.isCaller !== this.props.isCaller)) { const remoteUser = UserStore.getProfile(nextProps.userId); - const remoteUserImage = Client.getUsersRoute() + '/' + remoteUser.id + '/image?time=' + remoteUser.update_at; + const remoteUserImage = Client.getUsersRoute() + '/' + remoteUser.id + '/image?time=' + remoteUser.last_picture_update; this.setState({ error: null, remoteUserImage |