matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge pull request #886 from matrix-org/travis/e2e-notifs-2

Browse Source 
Track e2e highlights better, particularly in 'Mentions Only' rooms
This commit is contained in:
Travis Ralston
2019-04-08 07:40:31 -06:00
committed by GitHub
parent 0a82c84006 1d6f7f862f
commit f585c80491
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/client.js
View File

@@ -242,19 +242,32 @@ function MatrixClient(opts) {
const actions = this._pushProcessor.actionsForEvent(event); const actions = this._pushProcessor.actionsForEvent(event);
event.setPushActions(actions); // Might as well while we're here event.setPushActions(actions); // Might as well while we're here
const room = this.getRoom(event.getRoomId());
if (!room) return;
const currentCount = room.getUnreadNotificationCount("highlight");
// Ensure the unread counts are kept up to date if the event is encrypted // Ensure the unread counts are kept up to date if the event is encrypted
// We also want to make sure that the notification count goes up if we already
// have encrypted events to avoid other code from resetting 'highlight' to zero.
const oldHighlight = oldActions && oldActions.tweaks const oldHighlight = oldActions && oldActions.tweaks
? !!oldActions.tweaks.highlight : false; ? !!oldActions.tweaks.highlight : false;
const newHighlight = actions && actions.tweaks const newHighlight = actions && actions.tweaks
? !!actions.tweaks.highlight : false; ? !!actions.tweaks.highlight : false;
if (oldHighlight !== newHighlight) { if (oldHighlight !== newHighlight || currentCount > 0) {
const room = this.getRoom(event.getRoomId());
// TODO: Handle mentions received while the client is offline // TODO: Handle mentions received while the client is offline
// See also https://github.com/vector-im/riot-web/issues/9069 // See also https://github.com/vector-im/riot-web/issues/9069
if (room && !room.hasUserReadEvent(this.getUserId(), event.getId())) { if (!room.hasUserReadEvent(this.getUserId(), event.getId())) {
const current = room.getUnreadNotificationCount("highlight"); let newCount = currentCount;
const newCount = newHighlight ? current + 1 : current - 1; if (newHighlight && !oldHighlight) newCount++;
if (!newHighlight && oldHighlight) newCount--;
room.setUnreadNotificationCount("highlight", newCount); room.setUnreadNotificationCount("highlight", newCount);
// Fix 'Mentions Only' rooms from not having the right badge count
const totalCount = room.getUnreadNotificationCount('total');
if (totalCount < newCount) {
room.setUnreadNotificationCount('total', newCount);
}
} }
} }
}); });

14
src/sync.js
View File

@@ -1076,9 +1076,17 @@ SyncApi.prototype._processSyncResponse = async function(
room.setUnreadNotificationCount( room.setUnreadNotificationCount(
'total', joinObj.unread_notifications.notification_count, 'total', joinObj.unread_notifications.notification_count,
); );
room.setUnreadNotificationCount(
'highlight', joinObj.unread_notifications.highlight_count, // We track unread notifications ourselves in encrypted rooms, so don't
); // bother setting it here. We trust our calculations better than the
// server's for this case, and therefore will assume that our non-zero
// count is accurate.
if (client.isRoomEncrypted(room.roomId)
&& room.getUnreadNotificationCount('highlight') <= 0) {
room.setUnreadNotificationCount(
'highlight', joinObj.unread_notifications.highlight_count,
);
}
} }
room.updateMyMembership("join"); room.updateMyMembership("join");