diff --git a/js/expiring_messages.js b/js/expiring_messages.js index 6c8dd6420..1b019efef 100644 --- a/js/expiring_messages.js +++ b/js/expiring_messages.js @@ -6,7 +6,9 @@ // Load messages that have expired and destroy them var expired = new Whisper.MessageCollection(); expired.on('add', function(message) { - console.log('message', message.get('sent_at'), 'expired'); + console.log('Message expired', { + sentAt: message.get('sent_at'), + }); var conversation = message.getConversation(); if (conversation) { conversation.trigger('expired', message); diff --git a/js/models/messages.js b/js/models/messages.js index 9b743cd37..67431eea6 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -845,7 +845,10 @@ } Whisper.ExpiringMessagesListener.update(); - console.log('message', this.get('sent_at'), 'expires at', expiresAt); + console.log('Set message expiration', { + expiresAt, + sentAt: this.get('sent_at'), + }); } }, }); @@ -959,7 +962,7 @@ }, fetchExpired() { - console.log('loading expired messages'); + console.log('Load expired messages'); this.fetch({ conditions: { expires_at: { $lte: Date.now() } }, addIndividually: true, diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 0cea33394..63336b3d7 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -815,11 +815,9 @@ }, async onExpiredCollection(message) { const removeMessage = () => { - console.log( - 'removing message', - message.get('sent_at'), - 'from collection' - ); + console.log('Remove expired message from message collection', { + sentAt: message.get('sent_at'), + }); this.model.messageCollection.remove(message.id); };