Przeglądaj źródła

Bugfix. First match for MUC commands

JC Brand 6 lat temu
rodzic
commit
ccb8662ef7
3 zmienionych plików z 9 dodań i 12 usunięć
  1. 5 1
      CHANGES.md
  2. 2 6
      dist/converse.js
  3. 2 5
      src/converse-muc-views.js

+ 5 - 1
CHANGES.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 4.0.6 (unreleased)
+## 4.0.7 (Unreleased)
+
+- Bugfix: MUC commands were being ignored
+
+## 4.0.6 (2018-12-07)
 
 - Updated translations: ar, cs, de, es, eu, fr, gl, hu, id, it, ja, nb, pt_BR
 - Don't render http (i.e. non-TLS) resources

+ 2 - 6
dist/converse.js

@@ -54300,12 +54300,8 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
       },
 
       parseMessageForCommands(text) {
-        if (_converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments)) {
-          return true;
-        }
-
         if (_converse.muc_disable_moderator_commands) {
-          return false;
+          return _converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments);
         }
 
         const match = text.replace(/^\s*/, "").match(/^\/(.*?)(?: (.*))?$/) || [false, '', ''],
@@ -54463,7 +54459,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_3__["default"].plugins
             break;
 
           default:
-            return false;
+            return _converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments);
         }
 
         return true;

+ 2 - 5
src/converse-muc-views.js

@@ -859,11 +859,8 @@ converse.plugins.add('converse-muc-views', {
             },
 
             parseMessageForCommands (text) {
-                if (_converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments)) {
-                    return true;
-                }
                 if (_converse.muc_disable_moderator_commands) {
-                    return false;
+                    return _converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments);
                 }
                 const match = text.replace(/^\s*/, "").match(/^\/(.*?)(?: (.*))?$/) || [false, '', ''],
                       args = match[2] && match[2].splitOnce(' ').filter(s => s) || [],
@@ -1026,7 +1023,7 @@ converse.plugins.add('converse-muc-views', {
                                 undefined, this.onCommandError.bind(this));
                         break;
                     default:
-                        return false;
+                        return _converse.ChatBoxView.prototype.parseMessageForCommands.apply(this, arguments);
                 }
                 return true;
             },