Use structured log

js/models/conversations.js

@@ -860,14 +860,12 @@
         return Promise.resolve();
       }
 
-      console.log(
-        'Updating expireTimer for conversation',
-        this.idForLogging(),
-        'to',
+      console.log("Update conversation 'expireTimer'", {
+        id: this.idForLogging(),
         expireTimer,
-        'via',
-        source
-      );
+        source,
+      });
+
       source = source || textsecure.storage.user.getNumber();
       const timestamp = receivedAt || Date.now();
 

js/models/messages.js

@@ -632,13 +632,11 @@
             const shouldLogExpireTimerChange =
               message.isExpirationTimerUpdate() || expireTimer;
             if (shouldLogExpireTimerChange) {
-              console.log(
-                'Updating expireTimer for conversation',
-                conversation.idForLogging(),
-                'to',
+              console.log("Update conversation 'expireTimer'", {
+                id: conversation.idForLogging(),
                 expireTimer,
-                'via `handleDataMessage`'
-              );
+                source: 'handleDataMessage',
+              });
             }
 
             if (!message.isEndSession() && !message.isGroupUpdate()) {