- matrix-crypt-file documentation updated (it cannot encrypt, only decrypts)

- matrix-js-sdk update from 15.5.0 to 16.0.0
- Fixed matrix-js-sdk breaking changes
- @matrix-org_olm-3.2.8.tgz added to package since there is no npm release for this. It fixes some errors so we need it.

src/matrix-crypt-file.html

@@ -25,7 +25,7 @@
 
 <script type="text/html" data-help-name="matrix-decrypt-file">
     <h3>Details</h3>
-    <p>Files sent in an encrypted room are themselves encrypted. Use this node to encrypt/decrypt files. Note: This node will download the encrypted file so be cautious of large downloads.</p>
+    <p>Files sent in an encrypted room are themselves encrypted. Use this node to decrypt files. Note: This node will download the encrypted file so be cautious of large downloads.</p>
 
     <h3>Inputs</h3>
     <dl class="message-properties">

src/matrix-delete-event.js

@@ -55,7 +55,7 @@ module.exports = function(RED) {
                 msg.reason = '';
             }
 
-            node.server.matrixClient.redactEvent(msg.topic,msg.eventId,undefined ,{
+            node.server.matrixClient.redactEvent(msg.topic, msg.eventId, undefined,{
                 reason: msg.reason
             })
 

src/matrix-server-config.js

@@ -4,6 +4,7 @@ const sdk = require("matrix-js-sdk");
 const { resolve } = require('path');
 const { LocalStorage } = require('node-localstorage');
 const { LocalStorageCryptoStore } = require('matrix-js-sdk/lib/crypto/store/localStorage-crypto-store');
+const {RoomEvent, RoomMemberEvent, HttpApiEvent, ClientEvent} = require("matrix-js-sdk");
 
 module.exports = function(RED) {
     function MatrixFolderNameFromUserId(name) {
@@ -146,7 +147,7 @@ module.exports = function(RED) {
                 return node.connected;
             };
 
-            node.matrixClient.on("Room.timeline", async function(event, room, toStartOfTimeline, removed, data) {
+            node.matrixClient.on(RoomEvent.Timeline, async function(event, room, toStartOfTimeline, removed, data) {
                 if (toStartOfTimeline) {
                     return; // ignore paginated results
                 }
@@ -167,6 +168,23 @@ module.exports = function(RED) {
                     return;
                 }
 
+                const isDmRoom = (room) => {
+                    // Find out if this is a direct message room.
+                    let isDM = !!room.getDMInviter();
+                    const allMembers = room.currentState.getMembers();
+                    if (!isDM && allMembers.length <= 2) {
+                        // if not a DM, but there are 2 users only
+                        // double check DM (needed because getDMInviter works only if you were invited, not if you invite)
+                        // hence why we check for each member
+                        if (allMembers.some((m) => m.getDMInviter())) {
+                            return true;
+                        }
+                    }
+                    return allMembers.length <= 2 && isDM;
+                };
+
+                node.matrixClient.getRoom(event.getRoomId())
+
                 let msg = {
                     encrypted : event.isEncrypted(),
                     redacted  : event.isRedacted(),
@@ -177,6 +195,7 @@ module.exports = function(RED) {
                     topic     : event.getRoomId(),
                     eventId   : event.getId(),
                     event     : event,
+                    isDirectMessage: isDmRoom(event.getRoomId())
                 };
 
                 node.log("Received" + (msg.encrypted ? ' encrypted' : '') +" timeline event [" + msg.type + "]: (" + room.name + ") " + event.getSender() + " :: " + msg.content.body + (toStartOfTimeline ? ' [PAGINATED]' : ''));
@@ -189,9 +208,9 @@ module.exports = function(RED) {
              *
              * @event module:client~MatrixClient#"crypto.suggestKeyRestore"
              */
-            node.matrixClient.on("crypto.suggestKeyRestore", function(){
-
-            });
+            // node.matrixClient.on("crypto.suggestKeyRestore", function(){
+            //
+            // });
 
             // node.matrixClient.on("RoomMember.typing", async function(event, member) {
             //     let isTyping = member.typing;
@@ -210,7 +229,8 @@ module.exports = function(RED) {
             // });
 
             // handle auto-joining rooms
-            node.matrixClient.on("RoomMember.membership", async function(event, member) {
+
+            node.matrixClient.on(RoomMemberEvent.Membership, async function(event, member) {
                 if (member.membership === "invite" && member.userId === node.userId) {
                     if(node.autoAcceptRoomInvites) {
                         node.matrixClient.joinRoom(member.roomId).then(function() {
@@ -224,7 +244,7 @@ module.exports = function(RED) {
                 }
             });
 
-            node.matrixClient.on("sync", async function(state, prevState, data) {
+            node.matrixClient.on(ClientEvent.Sync, async function(state, prevState, data) {
                 node.debug("SYNC [STATE=" + state + "] [PREVSTATE=" + prevState + "]");
                 if(prevState === null && state === "PREPARED" ) {
                     // Occurs when the initial sync is completed first time.
@@ -292,7 +312,8 @@ module.exports = function(RED) {
                 }
             });
 
-            node.matrixClient.on("Session.logged_out", async function(errorObj){
+
+            node.matrixClient.on(HttpApiEvent.SessionLoggedOut, async function(errorObj){
                 // Example if user auth token incorrect:
                 // {
                 //     errcode: 'M_UNKNOWN_TOKEN',