From 7c7b6677457e2ca247f250afb092f000d1fdc16a Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 14 Feb 2022 15:16:51 +0100
Subject: [PATCH] MUC: Register handler to parse for commands in the plugin
 index.js

---
 src/plugins/muc-views/index.js        | 4 +++-
 src/plugins/muc-views/message-form.js | 3 +--
 src/plugins/muc-views/utils.js        | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/muc-views/index.js b/src/plugins/muc-views/index.js
index c39aea5f6..7fb88f059 100644
--- a/src/plugins/muc-views/index.js
+++ b/src/plugins/muc-views/index.js
@@ -8,7 +8,7 @@ import 'plugins/modal/index.js';
 import './adhoc-commands.js';
 import MUCView from './muc.js';
 import { api, converse } from '@converse/headless/core';
-import { clearHistory, fetchAndSetMUCDomain } from './utils.js';
+import { clearHistory, fetchAndSetMUCDomain, parseMessageForMUCCommands } from './utils.js';
 
 import './styles/index.scss';
 
@@ -80,5 +80,7 @@ converse.plugins.add('converse-muc-views', {
                 clearHistory(model.get('jid'));
             }
         });
+
+        api.listen.on('parseMessageForCommands', parseMessageForMUCCommands);
     }
 });
diff --git a/src/plugins/muc-views/message-form.js b/src/plugins/muc-views/message-form.js
index 1841892df..3325f344b 100644
--- a/src/plugins/muc-views/message-form.js
+++ b/src/plugins/muc-views/message-form.js
@@ -1,7 +1,7 @@
 import MessageForm from 'plugins/chatview/message-form.js';
 import tpl_muc_message_form from './templates/message-form.js';
 import { _converse, api, converse } from "@converse/headless/core";
-import { getAutoCompleteListItem, parseMessageForMUCCommands } from './utils.js';
+import { getAutoCompleteListItem } from './utils.js';
 
 
 export default class MUCMessageForm extends MessageForm {
@@ -9,7 +9,6 @@ export default class MUCMessageForm extends MessageForm {
     async connectedCallback () {
         super.connectedCallback();
         await this.model.initialized;
-        api.listen.on('parseMessageForCommands', parseMessageForMUCCommands);
     }
 
     toHTML () {
diff --git a/src/plugins/muc-views/utils.js b/src/plugins/muc-views/utils.js
index 2e0835fe9..934e48c2e 100644
--- a/src/plugins/muc-views/utils.js
+++ b/src/plugins/muc-views/utils.js
@@ -296,7 +296,9 @@ export function showOccupantModal (ev, occupant) {
 
 
 export function parseMessageForMUCCommands (data, handled) {
-    if (handled || (
+    const model = data.model;
+    if (handled ||
+            model.get('type') !== _converse.CHATROOMS_TYPE || (
             api.settings.get('muc_disable_slash_commands') &&
             !Array.isArray(api.settings.get('muc_disable_slash_commands'))
     )) {
@@ -310,7 +312,6 @@ export function parseMessageForMUCCommands (data, handled) {
         return false;
     }
 
-    const model = data.model;
     const args = text.slice(('/' + command).length + 1).trim();
     const allowed_commands = model.getAllowedCommands() ?? [];