From 8e3f2f326221f0c0214ab52404716de18aa5e6f7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 6 Jul 2023 07:09:39 +0100
Subject: [PATCH] Log message ID for undecryptable to-device messages (#3543)

... to help with debugging.
---
 src/models/event.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/models/event.ts b/src/models/event.ts
index 992044f9fba..55e923c6f14 100644
--- a/src/models/event.ts
+++ b/src/models/event.ts
@@ -29,6 +29,7 @@ import {
     EventType,
     MsgType,
     RelationType,
+    ToDeviceMessageId,
     UNSIGNED_THREAD_ID_FIELD,
 } from "../@types/event";
 import { Crypto } from "../crypto";
@@ -517,16 +518,15 @@ export class MatrixEvent extends TypedEventEmitter<MatrixEventEmittedEvents, Mat
      * ```
      */
     public getDetails(): string {
-        let details = `id=${this.getId()} type=${this.getWireType()} sender=${this.getSender()}`;
         const room = this.getRoomId();
         if (room) {
-            details += ` room=${room}`;
-        }
-        const date = this.getDate();
-        if (date) {
-            details += ` ts=${date.toISOString()}`;
+            // in-room event
+            return `id=${this.getId()} type=${this.getWireType()} sender=${this.getSender()} room=${room} ts=${this.getDate()?.toISOString()}`;
+        } else {
+            // to-device event
+            const msgid = this.getContent()[ToDeviceMessageId];
+            return `msgid=${msgid} type=${this.getWireType()} sender=${this.getSender()}`;
         }
-        return details;
     }
 
     /**