X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fuserinputhandler.cpp;h=64e71ea9a6ea7371b007d71fc4f8ed999bb9cdac;hb=dd72455b0cdade40fe5ff0cef7d464d71cdca45f;hp=bc3bb6545bc6499cfdc95f5907371adfd280ce3d;hpb=a6266326a5ba6952d574cda16720e69275d2884e;p=quassel.git

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index bc3bb654..64e71ea9 100644
--- 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) {
 }
@@ -152,14 +153,18 @@ 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 (chans.at(i)[0].isLetterOrNumber())
-      chans[i].prepend(QChar('#'));
+    if(!network()->isChannelName(chans[i]))
+      chans[i].prepend('#');
   }
   params[0] = chans.join(",");
   if(params.count() > 1) keys = params[1].split(",");
@@ -203,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) {
@@ -368,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);