Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange

Browse Source 
Don't mark rooms as unread on m.room.member changes
This commit is contained in:
Richard van der Hoff 2015-11-19 13:22:37 +00:00
commit 3a003341ad
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -50,6 +50,7 @@
"parallelshell": "^1.2.0", "parallelshell": "^1.2.0",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",
"source-map-loader": "^0.1.5", "source-map-loader": "^0.1.5",
"uglifycss": "0.0.15" "uglifycss": "0.0.15",
"webpack": "^1.12.6"
} }
} }

15
src/controllers/organisms/RoomList.js
View File

@ -88,24 +88,33 @@ module.exports = {
onRoomTimeline: function(ev, room, toStartOfTimeline) { onRoomTimeline: function(ev, room, toStartOfTimeline) {
if (toStartOfTimeline) return; if (toStartOfTimeline) return;
var newState = this.getRoomLists(); var hl = 0;
if ( if (
room.roomId != this.props.selectedRoom && room.roomId != this.props.selectedRoom &&
ev.getSender() != MatrixClientPeg.get().credentials.userId) ev.getSender() != MatrixClientPeg.get().credentials.userId)
{ {
var hl = 1; // don't mark rooms as unread for just member changes
if (ev.getType() != "m.room.member") {
hl = 1;
}
var actions = MatrixClientPeg.get().getPushActionsForEvent(ev); var actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
if (actions && actions.tweaks && actions.tweaks.highlight) { if (actions && actions.tweaks && actions.tweaks.highlight) {
hl = 2; hl = 2;
} }
}
if (hl > 0) {
var newState = this.getRoomLists();
// obviously this won't deep copy but this shouldn't be necessary // obviously this won't deep copy but this shouldn't be necessary
var amap = this.state.activityMap; var amap = this.state.activityMap;
amap[room.roomId] = Math.max(amap[room.roomId] || 0, hl); amap[room.roomId] = Math.max(amap[room.roomId] || 0, hl);
newState.activityMap = amap; newState.activityMap = amap;
}
this.setState(newState); this.setState(newState);
}
}, },
onRoomName: function(room) { onRoomName: function(room) {