[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 <marcos.defendi@ulbra.inf.br>
pull/12684/head
Marcos Spessatto Defendi 7 years ago committed by Rodrigo Nascimento
parent 9289e5b7be
commit dc70e803b4
  1. 6
      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;
}

Loading…
Cancel
Save