fix: move isDelete into inbox poll if statement

fixed some comments
pull/2971/head
William Grant 2 years ago
parent ef50a9f7a5
commit d4aacd3159

@ -883,7 +883,7 @@ export async function handleDataExtractionNotification(
? changeToDisappearingMessageType(convo, expireTimer, expirationMode) ? changeToDisappearingMessageType(convo, expireTimer, expirationMode)
: undefined; : undefined;
// NOTE Trigger for an incoming message // NOTE Triggers disappearing for an incoming DataExtractionNotification message
// TODO legacy messages support will be removed in a future release // TODO legacy messages support will be removed in a future release
if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') { if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') {
expirationStartTimestamp = setExpirationStartTimestamp( expirationStartTimestamp = setExpirationStartTimestamp(

@ -113,7 +113,7 @@ export function cleanIncomingDataMessage(
if (rawDataMessage.flags == null) { if (rawDataMessage.flags == null) {
rawDataMessage.flags = 0; rawDataMessage.flags = 0;
} }
// TODO This should be removed 2 weeks after the release // TODO legacy messages support will be removed in a future release
if (rawDataMessage.expireTimer == null) { if (rawDataMessage.expireTimer == null) {
rawDataMessage.expireTimer = 0; rawDataMessage.expireTimer = 0;
} }

@ -257,8 +257,7 @@ const makeBatchRequestPayload = (
break; break;
case 'inbox': case 'inbox':
const isDelete = Boolean(options.inbox?.type === 'delete'); if (options.inbox?.type === 'delete') {
if (isDelete) {
return { return {
method: 'DELETE', method: 'DELETE',
path: '/inbox', path: '/inbox',

@ -184,7 +184,7 @@ export async function addUpdateMessage(
? changeToDisappearingMessageType(convo, expireTimer, expirationMode) ? changeToDisappearingMessageType(convo, expireTimer, expirationMode)
: undefined; : undefined;
// NOTE Trigger for an incoming message // NOTE Triggers disappearing for an incoming groupUpdate message
// TODO legacy messages support will be removed in a future release // TODO legacy messages support will be removed in a future release
if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') { if (expirationMode === 'legacy' || expirationMode === 'deleteAfterSend') {
expirationStartTimestamp = setExpirationStartTimestamp( expirationStartTimestamp = setExpirationStartTimestamp(

Loading…
Cancel
Save