some more message types supported to make this work more smoothly with freenode.net

4 files changed, 49 insertions, 2 deletions

diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp
index 5c70753..d1b70a5 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -14,8 +14,9 @@ IRCLiteralMessageParserStruct IRCMessageParser::literalParserProcTable[] = {
     { "ERROR",   FUNC(parseLiteralError) },
     { "ERROR:",  FUNC(parseLiteralError) },
     { "MODE",    FUNC(parseLiteralMode) },
     { "KICK",    FUNC(parseLiteralKick) },
+    { "TOPIC",   FUNC(parseLiteralTopic) },
     { 0 , 0 }
 };
 
 /* Lookup table for literal commands */
@@ -35,8 +36,10 @@ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
     { 5,   FUNC(parseNumerical005) },           // RPL_BOUNCE, RPL_PROTOCTL
     { 251, FUNC(parseNumericalStats) },         // RPL_LUSERCLIENT
     { 254, FUNC(nullFunc)},                     // RPL_LUSERCHANNELS
     { 255, FUNC(parseNumericalStats) },         // RPL_LUSERNAME
+    { 332, FUNC(parseNumericalTopic) },         // RPL_TOPIC
+    { 333, FUNC(parseNumericalTopicWhoTime) },  // RPL_TOPICWHOTIME
     { 353, FUNC(parseNumericalNames) },         // RPL_NAMREPLY
     { 366, FUNC(parseNumericalEndOfNames) },    // RPL_ENDOFNAMES
     { 375, FUNC(parseNumericalStats) },         // RPL_MOTDSTART
     { 372, FUNC(parseNumericalStats) },         // RPL_MOTD
@@ -190,9 +193,9 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
             } else {
                 emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown sender")));
             }
         } else {
-            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel")));
+            emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Channel message with unknown channel ") + message->param(0)));
         }
     } else {
         emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Received PRIVMSG of unknown type")));
     }
@@ -241,8 +244,20 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
          emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown person quit - desynchronized?")));
     }
 }
 
+void IRCMessageParser::parseLiteralTopic(IRCMessage *message) {
+    IRCPerson mask(message->prefix());
+    IRCChannel *channel = m_session->getChannel(message->param(0));
+    if (channel) {
+        IRCOutput output(OUTPUT_TOPIC, mask.nick() + tr(" changed topic to ") + "\"" + message->param(1) + "\"");
+        output.addParam(channel);
+        emit outputReady(output);
+    } else {
+        emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Unknown channel topic - desynchronized?")));
+    }
+}
+
 void IRCMessageParser::parseLiteralError(IRCMessage *message) {
     emit outputReady(IRCOutput(OUTPUT_ERROR, message->allParameters()));
 }
 
@@ -483,4 +498,20 @@ void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) {
 
 void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
     emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname")));
 }
+
+void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
+    IRCChannel *channel = m_session->getChannel(message->param(1));
+    if (channel) {
+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\""));
+        output.addParam(channel);
+        emit outputReady(output);
+    } else {
+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\""));
+        output.addParam(0);
+        emit outputReady(output);
+    }
+}
+
+void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *message) {
+}
diff --git a/noncore/net/opieirc/ircmessageparser.h b/noncore/net/opieirc/ircmessageparser.h
index f774047..c4dd96c 100644
--- a/noncore/net/opieirc/ircmessageparser.h
+++ b/noncore/net/opieirc/ircmessageparser.h
@@ -71,8 +71,9 @@ private:
     void parseLiteralQuit(IRCMessage *message);
     void parseLiteralError(IRCMessage *message);
     void parseLiteralMode(IRCMessage *message);
     void parseLiteralKick(IRCMessage *message);
+    void parseLiteralTopic(IRCMessage *message);
     void parseNumerical001(IRCMessage *message);
     void parseNumerical002(IRCMessage *message);
     void parseNumerical003(IRCMessage *message);
     void parseNumerical004(IRCMessage *message);
@@ -81,8 +82,10 @@ private:
     void parseNumericalNames(IRCMessage *message);
     void parseNumericalEndOfNames(IRCMessage *message);
     void parseNumericalNicknameInUse(IRCMessage *message);
     void parseNumericalNoSuchNick(IRCMessage *message);
+    void parseNumericalTopic(IRCMessage *message);
+    void parseNumericalTopicWhoTime(IRCMessage *message);
     void parseCTCPPing(IRCMessage *message);
     void parseCTCPVersion(IRCMessage *message);
     void parseCTCPAction(IRCMessage *message);
 protected:
diff --git a/noncore/net/opieirc/ircoutput.h b/noncore/net/opieirc/ircoutput.h
index e8cc524..9c0b8bb 100644
--- a/noncore/net/opieirc/ircoutput.h
+++ b/noncore/net/opieirc/ircoutput.h
@@ -43,9 +43,10 @@ enum IRCOutputType {
     OUTPUT_SELFKICK       = 12,  /* parameters : channel (IRCChannel) */
     OUTPUT_OTHERKICK      = 13,  /* parameters : channel (IRCChannel) person (IRCChannelPerson) */
     OUTPUT_CHANACTION     = 14,  /* parameters : channel (IRCChannel) person (IRCChannelPerson) */
     OUTPUT_QUERYACTION    = 15,  /* parameters : person (IRCPerson) */
-    OUTPUT_CHANPERSONMODE = 16   /* parameters : channel (IRCCHannel) person (IRCChannelPerson) */
+    OUTPUT_CHANPERSONMODE = 16,  /* parameters : channel (IRCCHannel) person (IRCChannelPerson) */
+    OUTPUT_TOPIC          = 17   /* parameters : channel (IRCChannel) */
 };
 
 /* The IRCOutput class is used as a kind of message which is sent by the
    IRC parser to inform the GUI of changes. This could for example be a 
diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index 4be60ef..aea58a3 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -218,8 +218,20 @@ void IRCServerTab::display(IRCOutput output) {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
                 channelTab->appendText("<font color=\"" + m_otherColor + "\">"+output.htmlMessage()+"</font><br>");
             }
             break;
+        case OUTPUT_TOPIC: {
+                IRCChannel *channel = (IRCChannel *) output.getParam(0);
+                if (channel) {
+                    IRCChannelTab *channelTab = getTabForChannel(channel);
+                    if (channelTab) {
+                        channelTab->appendText("<font color=\"" + m_notificationColor + "\">"+output.htmlMessage()+"</font><br>");
+                        return;
+                    }
+                }
+                appendText("<font color=\"" + m_notificationColor + "\">"+output.htmlMessage()+"</font><br>");
+            }
+            break;
         case OUTPUT_QUIT: {
                 QString nick = ((IRCPerson *)output.getParam(0))->nick();
                 QListIterator<IRCChannelTab> it(m_channelTabs);
                 for (; it.current(); ++it) {