Fixed a bug in nickname handling with networks using nickname:password for auth

1 files changed, 28 insertions, 20 deletions

diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index fde156c..cfad2c1 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -73,6 +73,6 @@ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
     { 412, "%1", "1", 0 },                                  // ERR_NOTEXTTOSEND
-    { 421, QT_TR_NOOP("Unknown command: %1"), "1", 0 },                 // ERR_NOMOTD
-    { 422, QT_TR_NOOP("You're not on channel %1"), "1", 0},             // ERR_NOTONCHANNEL
+    { 421, QT_TR_NOOP("Unknown command: %1"), "1", 0 },     // ERR_ERR_UNKNOWNCOMMAND
     { 422, "%1", "1", 0 },                                  // ERR_NOMOTD
     { 433, QT_TR_NOOP("Can't change nick to %1: %2"), "1,2", FUNC(parseNumericalNicknameInUse) }, // ERR_NICKNAMEINUSE
+    { 442, QT_TR_NOOP("You're not on channel %1"), "1", 0}, // ERR_NOTONCHANNEL
     { 477, "%1", "1", 0 },                                  // ERR_NOCHANMODES || ERR_NEEDREGGEDNICK
@@ -138,2 +138,6 @@ void IRCMessageParser::parseNumericalServerName(IRCMessage *message) {
     emit outputReady(IRCOutput(OUTPUT_TITLE, tr("Connected to")+" <b>" + message->prefix() + "</b>"));
+    /* Register EFFECTIVE nickname, some networks (as irc-hispano) uses nick:password
+     * for authentication and the parser gets confused */
+    m_session->m_server->setNick(message->param(0));
+
 }
@@ -251,21 +255,25 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
         emit outputReady(output);
-    } else if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') {
-        /* IRC Channel message detected, verify sender, channel and display it */
-        IRCChannel *channel = m_session->getChannel(message->param(0).lower());
-        if (channel) {
-            IRCPerson mask(message->prefix());
-            IRCChannelPerson *person = channel->getPerson(mask.nick());
-            if (person) {
-                IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1));
-                output.addParam(channel);
-                output.addParam(person);
-                emit outputReady(output);
-            } else {
-                emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender")));
+    } 
+    else 
+        if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') {
+            /* IRC Channel message detected, verify sender, channel and display it */
+            IRCChannel *channel = m_session->getChannel(message->param(0).lower());
+            if (channel) {
+                IRCPerson mask(message->prefix());
+                IRCChannelPerson *person = channel->getPerson(mask.nick());
+                if (person) {
+                    IRCOutput output(OUTPUT_CHANPRIVMSG, message->param(1));
+                    output.addParam(channel);
+                    output.addParam(person);
+                    emit outputReady(output);
+                } 
+                else {
+                    emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender")));
+                }
+            } 
+            else {
+                emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) ));
             }
-        } else {
-            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel %1").arg(message->param(0).lower()) ));
-        }
-    } else {
-        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type")));
+        } 
+        else {emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type")));
     }