Don't expire incoming expiration timer updates

This commit is contained in:
Evan Hahn 2021-07-01 18:48:40 -05:00 committed by GitHub
parent 75cb7b6b13
commit 7dac480df5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 5 deletions

View file

@ -2855,7 +2855,10 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
attributes.active_at = now;
conversation.set(attributes);
if (dataMessage.expireTimer) {
if (
dataMessage.expireTimer &&
!isExpirationTimerUpdate(dataMessage)
) {
message.set({ expireTimer: dataMessage.expireTimer });
}