From db1901ed1edffe5c9fe823b72688728f288c9cfb Mon Sep 17 00:00:00 2001
From: Skylar Sadlier <skylord123@gmail.com>
Date: Thu, 17 Mar 2022 14:30:10 -0600
Subject: [PATCH] Closes #29 - msg.isDM is now returned on received messages to
 help determine if it originated from a direct message room

---
 src/matrix-receive.html     | 5 +++++
 src/matrix-server-config.js | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/matrix-receive.html b/src/matrix-receive.html
index 616dc94..9eaaf24 100644
--- a/src/matrix-receive.html
+++ b/src/matrix-receive.html
@@ -116,6 +116,11 @@
                 </dd>
             </dl>
 
+            <dl class="message-properties">
+                <dt>msg.isDM <span class="property-type">bool</span></dt>
+                <dd> returns true if message is from a direct message room.</dd>
+            </dl>
+
             <dl class="message-properties">
                 <dt>msg.encrypted <span class="property-type">bool</span></dt>
                 <dd> returns true if message was encrypted (e2ee).</dd>
diff --git a/src/matrix-server-config.js b/src/matrix-server-config.js
index f46e818..6aca572 100644
--- a/src/matrix-server-config.js
+++ b/src/matrix-server-config.js
@@ -183,19 +183,17 @@ module.exports = function(RED) {
                     return allMembers.length <= 2 && isDM;
                 };
 
-                node.matrixClient.getRoom(event.getRoomId())
-
                 let msg = {
                     encrypted : event.isEncrypted(),
                     redacted  : event.isRedacted(),
                     content   : event.getContent(),
                     type      : (event.getContent()['msgtype'] || event.getType()) || null,
                     payload   : (event.getContent()['body'] || event.getContent()) || null,
+                    isDM      : isDmRoom(room),
                     userId    : event.getSender(),
                     topic     : event.getRoomId(),
                     eventId   : event.getId(),
-                    event     : event,
-                    isDirectMessage: isDmRoom(event.getRoomId())
+                    event     : event
                 };
 
                 node.log("Received" + (msg.encrypted ? ' encrypted' : '') +" timeline event [" + msg.type + "]: (" + room.name + ") " + event.getSender() + " :: " + msg.content.body + (toStartOfTimeline ? ' [PAGINATED]' : ''));