Merge pull request #95 from Skylar-Tech/dev

Release v0.7.1

README.md

@@ -26,9 +26,7 @@ The following is supported from this package:
 - Get a user list from a room
 - Kick user from room
 - Ban user from room
-- Join a room
-- Create a room
-- Invite to a room
+- Join, Create, Invite, and Leave rooms
 - Synapse admin API to force add user to room (requires bot to be in same room already)
 
 

package.json

@@ -1,16 +1,16 @@
 {
   "name": "node-red-contrib-matrix-chat",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Matrix chat server client for Node-RED",
   "dependencies": {
     "abort-controller": "^3.0.0",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^11.1.0",
     "got": "^12.0.2",
     "isomorphic-webcrypto": "^2.3.8",
-    "matrix-js-sdk": "^21.2.0",
+    "matrix-js-sdk": "^28.0.0",
     "node-fetch": "^3.3.0",
     "node-localstorage": "^2.2.1",
-    "olm": "https://gitlab.matrix.org/matrix-org/olm/-/package_files/472/download",
+    "olm": "https://gitlab.matrix.org/matrix-org/olm/-/package_files/2572/download",
     "request": "^2.88.2",
     "utf8": "^3.0.0"
   },
@@ -47,9 +47,9 @@
   "keywords": [
     "node-red",
     "matrix",
-    "support",
-    "bot",
-    "chat"
+    "chat",
+    "chatbot",
+    "federated"
   ],
   "repository": {
     "type": "git",

src/matrix-receive.html

@@ -17,6 +17,7 @@
             acceptFiles: {"value": true},
             acceptAudio: {"value": true},
             acceptImages: {"value": true},
+            acceptVideos: {"value": true},
             acceptLocations: {"value": true},
         },
         label: function() {
@@ -114,6 +115,16 @@
             Accept images <code style="text-transform: none;">m.image</code>
         </label>
     </div>
+    <div class="form-row">
+        <input
+                type="checkbox"
+                id="node-input-acceptVideos"
+                style="width: auto; margin-left: 125px; vertical-align: top"
+        />
+        <label for="node-input-acceptVideos" style="width: auto">
+            Accept videos <code style="text-transform: none;">m.video</code>
+        </label>
+    </div>
     <div class="form-row">
         <input
                 type="checkbox"

src/matrix-receive.js

@@ -13,6 +13,7 @@ module.exports = function(RED) {
         this.acceptFiles = n.acceptFiles;
         this.acceptAudio = n.acceptAudio;
         this.acceptImages = n.acceptImages;
+        this.acceptVideos = n.acceptVideos;
         this.acceptLocations = n.acceptLocations;
         this.roomId = n.roomId;
         this.roomIds = this.roomId ? this.roomId.split(',') : [];
@@ -111,6 +112,23 @@ module.exports = function(RED) {
                     }
                     break;
 
+
+                case 'm.video':
+                    if(!node.acceptVideos) return;
+                    msg.filename = msg.content.filename || msg.content.body;
+                    if(msg.encrypted) {
+                        msg.url = node.server.matrixClient.mxcUrlToHttp(msg.content.file.url);
+                        msg.mxc_url = msg.content.file.url;
+                        msg.thumbnail_url = node.server.matrixClient.mxcUrlToHttp(msg.content.info.thumbnail_file.url);
+                        msg.thumbnail_mxc_url = msg.content.info.thumbnail_file.url;
+                    } else {
+                        msg.url = node.server.matrixClient.mxcUrlToHttp(msg.content.url);
+                        msg.mxc_url = msg.content.url;
+                        msg.thumbnail_url = node.server.matrixClient.mxcUrlToHttp(msg.content.info.thumbnail_url);
+                        msg.thumbnail_mxc_url = msg.content.info.thumbnail_url;
+                    }
+                    break;
+
                 case 'm.location':
                     if(!node.acceptLocations) return;
                     msg.geo_uri = msg.content.geo_uri;

src/matrix-server-config.js

@@ -4,7 +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");
+const {RoomEvent, RoomMemberEvent, HttpApiEvent, ClientEvent, MemoryStore} = require("matrix-js-sdk");
 const request = require("request");
 require("abort-controller/polyfill"); // polyfill abort-controller if we don't have it
 if (!globalThis.fetch) {
@@ -138,6 +138,9 @@ module.exports = function(RED) {
                 baseUrl: this.url,
                 accessToken: this.credentials.accessToken,
                 cryptoStore: new LocalStorageCryptoStore(localStorage),
+                store: new MemoryStore({
+                    localStorage: localStorage,
+                }),
                 userId: this.userId,
                 deviceId: (this.deviceId || getStoredDeviceId(localStorage)) || undefined,
                 request

src/matrix-synapse-create-edit-user.js

@@ -52,7 +52,6 @@ module.exports = function(RED) {
 
             node.server.matrixClient.http
                 .authedRequest(
-                    undefined,
                     'PUT',
                     node.encodeUri(
                         "/_synapse/admin/v2/users/$userId",

src/matrix-synapse-deactivate-user.js

@@ -56,7 +56,6 @@ module.exports = function(RED) {
             );
             node.server.matrixClient.http
                 .authedRequest(
-                    undefined,
                     'POST',
                     path,
                     undefined,

src/matrix-synapse-join-room.js

@@ -60,7 +60,6 @@ module.exports = function(RED) {
             // we need the status code, so set onlydata to false for this request
             node.server.matrixClient.http
                 .authedRequest(
-                    undefined,
                     'POST',
                     node.encodeUri(
                         "/_synapse/admin/v1/join/$room_id_or_alias",

src/matrix-synapse-users.js

@@ -48,7 +48,6 @@ module.exports = function(RED) {
 
             node.server.matrixClient.http
                 .authedRequest(
-                    undefined,
                     'GET',
                     "/_synapse/admin/v2/users",
                     queryParams,

src/matrix-whois-user.js

@@ -53,7 +53,6 @@ module.exports = function(RED) {
             // we need the status code, so set onlydata to false for this request
             node.server.matrixClient.http
                 .authedRequest(
-                    undefined,
                     'GET',
                     node.encodeUri(
                         "/_matrix/client/r0/admin/whois/$userId",