[IMPROVE] Improve unreads and unreadsFrom response, prevent it to be …

…equal null (#12563) * Improve unreads and unreadsFrom response, prevent it to be equal null * Add timestamp or last seen in groups.counter Co-Authored-By: MarcosSpessatto <[email protected]>
RocketChat · Nov 21, 2018 · dc70e80 · dc70e80
1 parent 9289e5b
commit dc70e80
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js
@@ -151,10 +151,8 @@ RocketChat.API.v1.addRoute('groups.counters', { authRequired: true }, {
 		const lm = room.lm ? room.lm : room._updatedAt;
 
 		if (typeof subscription !== 'undefined' && subscription.open) {
-			if (subscription.ls) {
-				unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(subscription.rid, subscription.ls, lm);
-				unreadsFrom = subscription.ls;
-			}
+			unreads = RocketChat.models.Messages.countVisibleByRoomIdBetweenTimestampsInclusive(subscription.rid, (subscription.ls || subscription.ts), lm);
+			unreadsFrom = subscription.ls || subscription.ts;
 			userMentions = subscription.userMentions;
 			joined = true;
 		}