mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Do not set conversation expire timer on incoming story msgs

Browse source
This commit is contained in:
Josh Perez 2022-03-09 21:20:01 -05:00 • committed by GitHub
parent 5c5a7b3b36
commit d0898cb0c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/models/messages.ts
View file

@ -2431,7 +2431,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
message.set({ expireTimer: dataMessage.expireTimer }); message.set({ expireTimer: dataMessage.expireTimer });
} }
if (!hasGroupV2Prop) { if (!hasGroupV2Prop && !isStory(message.attributes)) {
if (isExpirationTimerUpdate(message.attributes)) { if (isExpirationTimerUpdate(message.attributes)) {
message.set({ message.set({
expirationTimerUpdate: { expirationTimerUpdate: {

5
ts/textsecure/MessageReceiver.ts
View file

@ -1811,7 +1811,10 @@ export default class MessageReceiver
return; return;
} }
const expireTimer = envelope.timestamp + durations.DAY - Date.now(); const expireTimer = Math.min(
(envelope.serverTimestamp + durations.DAY - Date.now()) / 1000,
durations.DAY / 1000
);
if (expireTimer <= 0) { if (expireTimer <= 0) {
log.info( log.info(