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

diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 3ecf3c42..aa614f2a 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -18,19 +18,25 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#include <QDateTime>
+#include "clientuserinputhandler.h"
 
 #include "buffermodel.h"
 #include "client.h"
 #include "clientaliasmanager.h"
-#include "clientuserinputhandler.h"
 #include "clientsettings.h"
 #include "execwrapper.h"
 #include "ircuser.h"
 #include "network.h"
+#include "types.h"
+#include "bufferinfo.h"
+#include "clientbufferviewconfig.h"
+#include "clientbufferviewmanager.h"
+#include "messagemodel.h"
+
+#include <QDateTime>
 
 ClientUserInputHandler::ClientUserInputHandler(QObject *parent)
-: QObject(parent)
+: BasicHandler(parent)
 {
   TabCompletionSettings s;
   s.notify("CompletionSuffix", this, SLOT(completionSuffixChanged(QVariant)));
@@ -46,6 +52,8 @@ void ClientUserInputHandler::completionSuffixChanged(const QVariant &v) {
 
 // this would be the place for a client-side hook
 void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QString &msg) {
+  if(msg.isEmpty())
+    return;
 
   if(!msg.startsWith('/')) {
     if(_nickRx.indexIn(msg) == 0) {
@@ -60,25 +68,60 @@ void ClientUserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const
 
   for(int i = 0; i < clist.count(); i++) {
     QString cmd = clist.at(i).second.section(' ', 0, 0).remove(0, 1).toUpper();
-    QString args = clist.at(i).second.section(' ', 1);
-    if(cmd == "EXEC")
-      handleExec(clist.at(i).first, args);
-    else {
-      if(cmd == "JOIN" || cmd == "QUERY") {
-        BufferId newBufId = Client::networkModel()->bufferId(bufferInfo.networkId(), args.section(' ', 0, 0));
-        if(!newBufId.isValid()) {
-          Client::bufferModel()->switchToBufferAfterCreation(bufferInfo.networkId(), args.section(' ', 0, 0));
-        }
-        else {
-          Client::bufferModel()->switchToBuffer(newBufId);
-        }
-      }
-      emit sendInput(clist.at(i).first, clist.at(i).second);
-    }
+    QString payload = clist.at(i).second.section(' ', 1);
+    handle(cmd, Q_ARG(BufferInfo, clist.at(i).first), Q_ARG(QString, payload));
   }
 }
 
+void ClientUserInputHandler::defaultHandler(const QString &cmd, const BufferInfo &bufferInfo, const QString &text) {
+  QString command = QString("/%1 %2").arg(cmd, text);
+  emit sendInput(bufferInfo, command);
+}
+
 void ClientUserInputHandler::handleExec(const BufferInfo &bufferInfo, const QString &execString) {
   ExecWrapper *exec = new ExecWrapper(this); // gets suicidal when it's done
   exec->start(bufferInfo, execString);
 }
+
+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);
+}
+
+void ClientUserInputHandler::switchBuffer(const NetworkId &networkId, const QString &bufferName) {
+  BufferId newBufId = Client::networkModel()->bufferId(networkId, bufferName);
+  if(!newBufId.isValid()) {
+    Client::bufferModel()->switchToBufferAfterCreation(networkId, bufferName);
+  }
+  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());
+        //}
+      }
+    }
+  }
+}