X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientuserinputhandler.cpp;h=aa614f2acf5db245e1c50eac102d4b5d9f414ed9;hp=8abc79dd3e3527e4ee2441617288ad293ef19171;hb=ed178d5c517ad031444fc64f1f85f9ea7a926e15;hpb=1cb98a44044e7756fa58ae67a6065015d776ba0c

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 8abc79dd..aa614f2a 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -29,6 +29,9 @@
 #include "network.h"
 #include "types.h"
 #include "bufferinfo.h"
+#include "clientbufferviewconfig.h"
+#include "clientbufferviewmanager.h"
+#include "messagemodel.h"
 
 #include <QDateTime>
 
@@ -81,12 +84,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);
@@ -99,5 +110,18 @@ void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QStr
   }
   else {
     Client::bufferModel()->switchToBuffer(newBufId);
+    // unhide the buffer
+    ClientBufferViewManager *clientBufferViewManager = Client::bufferViewManager();
+    QList<ClientBufferViewConfig*> bufferViewConfigList = clientBufferViewManager->clientBufferViewConfigs();
+    foreach (ClientBufferViewConfig *bufferViewConfig, bufferViewConfigList) {
+      if (bufferViewConfig->temporarilyRemovedBuffers().contains(newBufId)) {
+        bufferViewConfig->addBuffer(newBufId, bufferViewConfig->bufferList().length());
+        //if (bufferViewConfig->sortAlphabetically()) {
+          // TODO we need to trigger a sort here, but can't reach the model required
+          // to get a bufferviewfilter, as the bufferviewmanager only managers configs
+          //BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
+        //}
+      }
+    }
   }
 }