From cf0b6a0de9d1d92c49477ae7b86eb07e9b8ca1fe Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 18 Aug 2008 15:30:36 +0200 Subject: [PATCH] Ignore whitespace in join handler (cf. Bug #290) Thanks to xAFFE for providing the patch! --- src/core/userinputhandler.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp index 61671707..b760957f 100644 --- a/src/core/userinputhandler.cpp +++ b/src/core/userinputhandler.cpp @@ -27,6 +27,7 @@ #include "ircuser.h" #include +#include 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(","); -- 2.20.1