Handle /query and /join without args nicely

Adapts MR84 to the refactored ClientUserInputHandler
Thanks johu for the initial fix!

Fixes #831 and renders MR84 obsolete.

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 8abc79d..3e7ece3 100644 (file)
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -29,6 +29,7 @@
 #include "network.h"
 #include "types.h"
 #include "bufferinfo.h"
+#include "messagemodel.h"
 
 #include <QDateTime>
 
@@ -81,12 +82,20 @@ void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QStr
 }
 
 void ClientUserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/JOIN expects a channel"));
+    return;
+  }
   switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
   // send to core
   defaultHandler("JOIN", bufferInfo, text);
 }
 
 void ClientUserInputHandler::handleQuery(const BufferInfo &bufferInfo, const QString &text) {
+  if(text.isEmpty()) {
+    Client::messageModel()->insertErrorMessage(bufferInfo, tr("/QUERY expects at least a nick"));
+    return;
+  }
   switchBuffer(bufferInfo.networkId(), text.section(' ', 0, 0));
   // send to core
   defaultHandler("QUERY", bufferInfo, text);

diff --git a/src/client/clientuserinputhandler.h b/src/client/clientuserinputhandler.h
index 0b44c91..e27f26e 100644 (file)
--- a/src/client/clientuserinputhandler.h
+++ b/src/client/clientuserinputhandler.h
@@ -21,7 +21,6 @@
 #ifndef CLIENTUSERINPUTHANDLER_H_
 #define CLIENTUSERINPUTHANDLER_H_
 
-//#include "bufferinfo.h"
 #include "basichandler.h"
 
 class BufferInfo;