fix: comment out some unnecessary logging

pull/2971/head
William Grant 2 years ago
parent 32b7870e07
commit ee5503585a

@ -194,7 +194,7 @@ function updateReadStatus(message: MessageModel) {
); );
if (expirationMode === 'legacy' || expirationMode === 'deleteAfterRead') { if (expirationMode === 'legacy' || expirationMode === 'deleteAfterRead') {
window.log.debug(`WIP: updateReadStatus setExpirationStartTimestamp is starting`); // window.log.debug(`WIP: updateReadStatus setExpirationStartTimestamp is starting`);
message.set({ message.set({
expirationStartTimestamp: setExpirationStartTimestamp(expirationMode), expirationStartTimestamp: setExpirationStartTimestamp(expirationMode),
}); });
@ -384,9 +384,9 @@ async function markConvoAsReadIfOutgoingMessage(
); );
if (expirationMode !== 'off') { if (expirationMode !== 'off') {
window.log.debug( // window.log.debug(
`WIP: markConvoAsReadIfOutgoingMessage setExpirationStartTimestamp is starting` // `WIP: markConvoAsReadIfOutgoingMessage setExpirationStartTimestamp is starting`
); // );
message.set({ message.set({
expirationStartTimestamp: setExpirationStartTimestamp( expirationStartTimestamp: setExpirationStartTimestamp(
expirationMode, expirationMode,
@ -435,29 +435,17 @@ export async function handleMessageJob(
messageModel.get('expireTimer') messageModel.get('expireTimer')
); );
// TODO legacy messages support will be removed in a future release
// NOTE if the expirationMode is deleteAfterRead then legacy sync messages need to explicitly set the expirationStartTimestamp since they are alread marked as read
// NOTE 2: Not sure about this code needs retested
// const legacySyncMessageMustDisappearAfterRead =
// expirationMode === 'deleteAfterRead' &&
// source === UserUtils.getOurPubKeyStrFromCache() &&
// messageModel.get('type') === 'outgoing';
// TODO legacy messages support will be removed in a future release // TODO legacy messages support will be removed in a future release
const canBeDeleteAfterSend = conversation && (conversation.isMe() || conversation.isGroup()); const canBeDeleteAfterSend = conversation && (conversation.isMe() || conversation.isGroup());
// TODO legacy support could be broken after V2 is released on a modern client on a 1-1 with disapearAfterRead
if ( if (
(canBeDeleteAfterSend && expirationMode === 'legacy') || (canBeDeleteAfterSend && expirationMode === 'legacy') ||
expirationMode === 'deleteAfterSend' expirationMode === 'deleteAfterSend'
// ||
// legacySyncMessageMustDisappearAfterRead
) { ) {
window.log.debug(`WIP: handleMessageJob setExpirationStartTimestamp is starting`); // window.log.debug(`WIP: handleMessageJob setExpirationStartTimestamp is starting`);
messageModel.set({ messageModel.set({
expirationStartTimestamp: setExpirationStartTimestamp( expirationStartTimestamp: setExpirationStartTimestamp(
expirationMode, expirationMode,
messageModel.get('sent_at') messageModel.get('sent_at')
// !legacySyncMessageMustDisappearAfterRead ? messageModel.get('sent_at') : undefined
), ),
}); });
} }

@ -148,7 +148,7 @@ async function handleMessageSentSuccess(
// NOTE starting disappearing messages timer for all outbound messages // NOTE starting disappearing messages timer for all outbound messages
if (expirationMode !== 'off') { if (expirationMode !== 'off') {
window.log.debug(`WIP: handleMessageSentSuccess setExpirationStartTimestamp is starting`); // window.log.debug(`WIP: handleMessageSentSuccess setExpirationStartTimestamp is starting`);
fetchedMessage.set({ fetchedMessage.set({
expirationStartTimestamp: setExpirationStartTimestamp( expirationStartTimestamp: setExpirationStartTimestamp(
expirationMode, expirationMode,

@ -404,9 +404,9 @@ export const buildSyncMessage = (
syncTarget syncTarget
); );
window.log.warn( // window.log.warn(
`WIP: buildSyncMessage: \nexpireTimerSyncMessage: ${JSON.stringify(expireTimerSyncMessage)}` // `WIP: buildSyncMessage: \nexpireTimerSyncMessage: ${JSON.stringify(expireTimerSyncMessage)}`
); // );
return expireTimerSyncMessage; return expireTimerSyncMessage;
} }
@ -416,8 +416,8 @@ export const buildSyncMessage = (
timestamp, timestamp,
syncTarget syncTarget
); );
window.log.warn( // window.log.warn(
`WIP: buildSyncMessage: \nvisibleSyncMessage: ${JSON.stringify(visibleSyncMessage)}` // `WIP: buildSyncMessage: \nvisibleSyncMessage: ${JSON.stringify(visibleSyncMessage)}`
); // );
return visibleSyncMessage; return visibleSyncMessage;
}; };

Loading…
Cancel
Save