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

Merge pull request #3052 from matrix-org/travis/bc-debounce-notifs

Browse source 
Add local echo on badges in breadcrumbs
This commit is contained in:
Travis Ralston 2019-06-03 07:10:13 -06:00 • committed by GitHub
commit 78a0488317
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/rooms/RoomBreadcrumbs.js
View file

@ -96,6 +96,14 @@ export default class RoomBreadcrumbs extends React.Component {
case 'view_room': case 'view_room':
this._appendRoomId(payload.room_id); this._appendRoomId(payload.room_id);
break; break;
// XXX: slight hack in order to zero the notification count when a room
// is read. Copied from RoomTile
case 'on_room_read': {
const room = MatrixClientPeg.get().getRoom(payload.roomId);
this._calculateRoomBadges(room, /*zero=*/true);
break;
}
} }
} }
@ -164,7 +172,7 @@ export default class RoomBreadcrumbs extends React.Component {
}); });
} }
_calculateBadgesForRoom(room) { _calculateBadgesForRoom(room, zero=false) {
if (!room) return null; if (!room) return null;
// Reset the notification variables for simplicity // Reset the notification variables for simplicity
@ -174,6 +182,8 @@ export default class RoomBreadcrumbs extends React.Component {
showCount: false, showCount: false,
}; };
if (zero) return roomModel;
const notifState = RoomNotifs.getRoomNotifsState(room.roomId); const notifState = RoomNotifs.getRoomNotifsState(room.roomId);
if (RoomNotifs.MENTION_BADGE_STATES.includes(notifState)) { if (RoomNotifs.MENTION_BADGE_STATES.includes(notifState)) {
const highlightNotifs = RoomNotifs.getUnreadNotificationCount(room, 'highlight'); const highlightNotifs = RoomNotifs.getUnreadNotificationCount(room, 'highlight');
@ -195,14 +205,14 @@ export default class RoomBreadcrumbs extends React.Component {
return roomModel; return roomModel;
} }
_calculateRoomBadges(room) { _calculateRoomBadges(room, zero=false) {
if (!room) return; if (!room) return;
const rooms = this.state.rooms.slice(); const rooms = this.state.rooms.slice();
const roomModel = rooms.find((r) => r.room.roomId === room.roomId); const roomModel = rooms.find((r) => r.room.roomId === room.roomId);
if (!roomModel) return; // No applicable room, so don't do math on it if (!roomModel) return; // No applicable room, so don't do math on it
const badges = this._calculateBadgesForRoom(room); const badges = this._calculateBadgesForRoom(room, zero);
if (!badges) return; // No badges for some reason if (!badges) return; // No badges for some reason
Object.assign(roomModel, badges); Object.assign(roomModel, badges);