Merge branch 'develop' into release-0.3.0

matrix-org · Jul 12, 2019 · 6a15557 · 6a15557
2 parents cdd04d6 + 4463767
commit 6a15557
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/BridgedRoom.js b/lib/BridgedRoom.js
@@ -510,11 +510,10 @@ BridgedRoom.prototype._handleSlackMessage = async function(message, ghost) {
     }
     // emotes
     else if (subtype === "me_message") {
-        const message = {
+        return ghost.sendMessage(roomID, {
             msgtype: "m.emote",
             body: message.text
-        };
-        return ghost.sendMessage(roomID, message, slackRoomID, eventTS);
+        }, slackRoomID, eventTS);
     }
     // edits
     else if (subtype === "message_changed") {

diff --git a/lib/substitutions.js b/lib/substitutions.js
@@ -39,8 +39,6 @@ function onMissingEmoji(name) {
  * @param {Object} file options slack file object
  */
 var slackToMatrix = function(body, file) {
-    log.info("running substitutions on: " + body);
-
     if (undefined != body) {
         for (var i = 0; i < SUBSTITUTION_PAIRS.length; ++i) {
             var pair = SUBSTITUTION_PAIRS[i];