1 files changed, 32 insertions, 1 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
@@ -12,12 +12,13 @@ IRCLiteralMessageParserStruct IRCMessageParser::literalParserProcTable[] = {
     { "PART",    FUNC(parseLiteralPart) },
     { "QUIT",    FUNC(parseLiteralQuit) },
     { "ERROR",   FUNC(parseLiteralError) },
     { "ERROR:",  FUNC(parseLiteralError) },
     { "MODE",    FUNC(parseLiteralMode) },
     { "KICK",    FUNC(parseLiteralKick) },
+    { "TOPIC",   FUNC(parseLiteralTopic) },
     { 0 , 0 }
 };
 
 /* Lookup table for literal commands */
 IRCCTCPMessageParserStruct IRCMessageParser::ctcpParserProcTable[] = { 
     { "PING",    FUNC(parseCTCPPing) },
@@ -33,12 +34,14 @@ IRCNumericalMessageParserStruct IRCMessageParser::numericalParserProcTable[] = {
     { 3,   FUNC(parseNumerical003) },           // RPL_CREATED
     { 4,   FUNC(parseNumerical004) },           // RPL_MYINFO
     { 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
     { 376, FUNC(parseNumericalStats) },         // RPL_ENDOFMOTD
     { 377, FUNC(parseNumericalStats) },         // RPL_MOTD2
@@ -188,13 +191,13 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
                 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")));
+            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")));
     }
 }
 
@@ -239,12 +242,24 @@ void IRCMessageParser::parseLiteralQuit(IRCMessage *message) {
         delete person;
     } else {
          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()));
 }
 
 void IRCMessageParser::parseCTCPPing(IRCMessage *message) {
     IRCPerson mask(message->prefix());
@@ -481,6 +496,22 @@ void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) {
     m_session->endSession();
 }
 
 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) {
+}