Add a logic class to determine whether an event affects a room's unread count / status & use it

pull/21833/head
David Baker 2015-12-04 16:20:05 +00:00
parent 29b3b237d5
commit 142ac67799
2 changed files with 31 additions and 2 deletions

30
src/UnreadStatus.js Normal file
View File

@ -0,0 +1,30 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
module.exports = {
/**
* Returns true iff this event arriving in a room should affect the room's
* count of unread messages
*/
eventTriggersUnreadCount: function(ev) {
if (ev.getType() == "m.room.member") {
return false;
} else if (ev.getType == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
return false;
}
return true;
}
};

View File

@ -98,8 +98,7 @@ module.exports = React.createClass({
room.roomId != this.props.selectedRoom && room.roomId != this.props.selectedRoom &&
ev.getSender() != MatrixClientPeg.get().credentials.userId) ev.getSender() != MatrixClientPeg.get().credentials.userId)
{ {
// don't mark rooms as unread for just member changes if (UnreadStatus.eventTriggersUnreadCount(ev)) {
if (ev.getType() != "m.room.member") {
hl = 1; hl = 1;
} }