OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #710 from vector-im/unread_sync 

Use read receipts to calculate unread room status
pull/716/head
David Baker 2016-01-21 13:29:49 +00:00
parent 568f9bb19d 4d4c6e06ec
commit 1a248c8e5c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/RoomSubList.js
View File

@ -20,7 +20,7 @@ var React = require('react');
var DropTarget = require('react-dnd').DropTarget; var DropTarget = require('react-dnd').DropTarget;
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');
var UnreadStatus = require('matrix-react-sdk/lib/UnreadStatus'); var Unread = require('matrix-react-sdk/lib/Unread');
// turn this on for drop & drag console debugging galore // turn this on for drop & drag console debugging galore
var debug = false; var debug = false;
@ -62,7 +62,6 @@ var RoomSubList = React.createClass({
editable: React.PropTypes.bool, editable: React.PropTypes.bool,
order: React.PropTypes.string.isRequired, order: React.PropTypes.string.isRequired,
selectedRoom: React.PropTypes.string.isRequired, selectedRoom: React.PropTypes.string.isRequired,
activityMap: React.PropTypes.object.isRequired,
startAsHidden: React.PropTypes.bool, startAsHidden: React.PropTypes.bool,
showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
@ -108,8 +107,7 @@ var RoomSubList = React.createClass({
tsOfNewestEvent: function(room) { tsOfNewestEvent: function(room) {
for (var i = room.timeline.length - 1; i >= 0; --i) { for (var i = room.timeline.length - 1; i >= 0; --i) {
var ev = room.timeline[i]; var ev = room.timeline[i];
// logic copied from RoomList.js for when we do/don't highlight if (Unread.eventTriggersUnreadCount(ev)) {
if (UnreadStatus.eventTriggersUnreadCount(ev)) {
return ev.getTs(); return ev.getTs();
} }
} }
@ -254,7 +252,7 @@ var RoomSubList = React.createClass({
key={ room.roomId } key={ room.roomId }
collapsed={ self.props.collapsed || false} collapsed={ self.props.collapsed || false}
selected={ selected } selected={ selected }
unread={ self.props.activityMap[room.roomId] === 1 } unread={ Unread.doesRoomHaveUnreadMessages(room) }
highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' } highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
isInvite={ self.props.label === 'Invites' } isInvite={ self.props.label === 'Invites' }
incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } /> incomingCall={ self.props.incomingCall && (self.props.incomingCall.roomId === room.roomId) ? self.props.incomingCall : null } />