adding Message::Self flag to /me style messages

[quassel.git] / src / core / userinputhandler.cpp

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 00aabc2..64e71ea 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -27,6 +27,7 @@
 #include "ircuser.h"
 
 #include <QDebug>
+#include <QRegExp>
 
 UserInputHandler::UserInputHandler(NetworkConnection *parent) : BasicHandler(parent) {
 }
@@ -41,7 +42,7 @@ void UserInputHandler::handleUserInput(const BufferInfo &bufferInfo, const QStri
     int secondSlashPos = msg.indexOf('/', 1);
     int firstSpacePos = msg.indexOf(' ');
     if(!msg.startsWith('/') || (secondSlashPos != -1 && (secondSlashPos < firstSpacePos || firstSpacePos == -1))) {
-      if(secondSlashPos == 1)
+      if(msg.startsWith("//"))
        msg.remove(0, 1); // //asdf is transformed to /asdf
       cmd = QString("SAY");
     } else {
@@ -152,13 +153,23 @@ void UserInputHandler::handleInvite(const BufferInfo &bufferInfo, const QString
 }
 
 void UserInputHandler::handleJoin(const BufferInfo &bufferInfo, const QString &msg) {
-  Q_UNUSED(bufferInfo)
-  QStringList params = msg.trimmed().split(" ");
+  Q_UNUSED(bufferInfo);
+
+  // trim spaces before chans or keys
+  QString sane_msg = msg;
+  sane_msg.replace(QRegExp(", +"), ",");
+  QStringList params = sane_msg.trimmed().split(" ");
   QStringList chans = params[0].split(",");
   QStringList keys;
+  int i;
+  for(i = 0; i < chans.count(); i++) {
+    if(!network()->isChannelName(chans[i]))
+      chans[i].prepend('#');
+  }
+  params[0] = chans.join(",");
   if(params.count() > 1) keys = params[1].split(",");
   emit putCmd("JOIN", serverEncode(params)); // FIXME handle messages longer than 512 bytes!
-  int i = 0;
+  i = 0;
   for(; i < keys.count(); i++) {
     if(i >= chans.count()) break;
     networkConnection()->addChannelKey(chans[i], keys[i]);
@@ -197,7 +208,7 @@ void UserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &m
 void UserInputHandler::handleMe(const BufferInfo &bufferInfo, const QString &msg) {
   if(bufferInfo.bufferName().isEmpty()) return; // server buffer
   networkConnection()->ctcpHandler()->query(bufferInfo.bufferName(), "ACTION", msg);
-  emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick());
+  emit displayMsg(Message::Action, bufferInfo.type(), bufferInfo.bufferName(), msg, network()->myNick(), Message::Self);
 }
 
 void UserInputHandler::handleMode(const BufferInfo &bufferInfo, const QString &msg) {
@@ -362,6 +373,8 @@ void UserInputHandler::expand(const QString &alias, const BufferInfo &bufferInfo
   for(int i = 0; i < commands.count(); i++) {
     QString command = commands[i];
     for(int j = params.count(); j > 0; j--) {
+      IrcUser *ircUser = network()->ircUser(params[j - 1]);
+      command = command.replace(QString("$%1:hostname").arg(j), ircUser ? ircUser->host() : QString("*"));
       command = command.replace(QString("$%1").arg(j), params[j - 1]);
     }
     command = command.replace("$0", msg);