Merge branch 'develop' into release-0.2.0

matrix-org · Oct 20, 2018 · 5c6965e · 5c6965e
2 parents be2920f + c439541
commit 5c6965e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/Main.js b/lib/Main.js
@@ -853,7 +853,7 @@ Provisioning.commands.logout = new Provisioning.Command({
             return;
         }
         const store = main._bridge.getUserStore();
-        return store.getMatrixUser(userId).then((matrixUser) => {
+        return store.getMatrixUser(user_id).then((matrixUser) => {
             matrixUser = matrixUser ? matrixUser : new BridgeLib.MatrixUser(userId);
             const accounts = matrixUser.get("accounts") || {};
             delete accounts[slack_id];

diff --git a/lib/SlackHookHandler.js b/lib/SlackHookHandler.js
@@ -369,7 +369,7 @@ SlackHookHandler.prototype.lookupMessage = function(channelID, timestamp, token)
         var message = response.messages[0];
         log.debug("Looked up message from history as " + JSON.stringify(message));
 
-        if (messages.subtype !== "file_share") {
+        if (message.subtype !== "file_share") {
             return message;
         }
         return this.enablePublicSharing(message.file, token)

diff --git a/lib/substitutions.js b/lib/substitutions.js
@@ -92,6 +92,7 @@ var slackToMatrix = function(body, file) {
             return emojiChar;
         }
         log.warn("Failed to recognise emoji sequence: " + emojiKey);
+        return emojiKey;
     });
     return body;
 };