imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #226 from matrix-org/matthew/fix-last-active

Browse source 
fix last_active_ago timestamps, tab completion ordering, and implement currently_active semantics
This commit is contained in:
Matthew Hodgson 2016-03-17 14:36:52 +00:00
commit c51dac2f29
8 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/views/rooms/MemberTile.js
View file

@ -84,14 +84,14 @@ module.exports = React.createClass({
this.user_last_modified_time = member.user.getLastModifiedTime();
// FIXME: make presence data update whenever User.presence changes...
active = (
(Date.now() - (member.user.lastPresenceTs - member.user.lastActiveAgo)) || -1
);
active = member.user.lastActiveAgo ?
(Date.now() - (member.user.lastPresenceTs - member.user.lastActiveAgo)) : -1;
}
this.member_last_modified_time = member.getLastModifiedTime();
return (
<EntityTile {...this.props} presenceActiveAgo={active} presenceState={presenceState}
presenceCurrentlyActive={ member.user ? member.user.currentlyActive : false }
avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
name={name} powerLevel={this.props.member.powerLevel} />
);