Disappearing message cleanups

This commit is contained in:
Evan Hahn 2021-06-16 17:20:17 -05:00 committed by GitHub
parent dfa6fb5d61
commit 03a187097f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 149 additions and 268 deletions

View file

@ -42,46 +42,3 @@ export function getExpiresAt(
? messageAttrs.expirationStartTimestamp + expireTimerMs
: undefined;
}
export function setToExpire(
messageAttrs: MessageAttributesType,
{ force = false, skipSave = false } = {}
): MessageAttributesType {
if (!isExpiring(messageAttrs) || (!force && messageAttrs.expires_at)) {
return messageAttrs;
}
const expiresAt = getExpiresAt(messageAttrs);
if (!expiresAt) {
return messageAttrs;
}
const nextMessageAttributes = {
...messageAttrs,
expires_at: expiresAt,
};
window.log.info('Set message expiration', {
start: messageAttrs.expirationStartTimestamp,
expiresAt,
sentAt: messageAttrs.sent_at,
});
if (messageAttrs.id && !skipSave) {
window.Signal.Util.queueUpdateMessage(nextMessageAttributes);
}
return nextMessageAttributes;
}
function isExpiring(
messageAttrs: Pick<
MessageAttributesType,
'expireTimer' | 'expirationStartTimestamp'
>
): boolean {
return Boolean(
messageAttrs.expireTimer && messageAttrs.expirationStartTimestamp
);
}