Merge branch 'hiqua-no_lower_limit_query' into next-beta

2021-04-14 13:43:24 -05:00 · 2021-04-14 13:43:24 -05:00 · ea6562b7ac
commit ea6562b7ac
parent cb75e8b5f7 08905e1386
9 changed files with 111 additions and 93 deletions
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@ -3814,8 +3814,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
            Math.min(readSync.get('read_at'), Date.now())
          );
        }
-      }
-      if (readSync || message.isExpirationTimerUpdate()) {
+
        message.unset('unread');
        // This is primarily to allow the conversation to mark all older
        // messages as read, as is done when we receive a read sync for