X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Feventstringifier.cpp;h=a7238b277d0dbb39d1eb7b4e90f6e76aea3611ce;hp=96cb0546d65fdecd1ae159b22b3451f43d156120;hb=3ec6f311bb4fff1540a01c26069300ad17f6d134;hpb=615c5621f63360ef11c9cc3519c0462d8b5ec85b

diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp
index 96cb0546..a7238b27 100644
--- a/src/core/eventstringifier.cpp
+++ b/src/core/eventstringifier.cpp
@@ -50,6 +50,20 @@ void EventStringifier::sendMessageEvent(MessageEvent *event) {
   coreSession()->eventManager()->sendEvent(event);
 }
 
+bool EventStringifier::checkParamCount(IrcEvent *e, int minParams) {
+  if(e->params().count() < minParams) {
+    if(e->type() == EventManager::IrcEventNumeric) {
+      qWarning() << "Command " << static_cast<IrcEventNumeric *>(e)->number() << " requires " << minParams << "params, got: " << e->params();
+    } else {
+      QString name = coreSession()->eventManager()->enumName(e->type());
+      qWarning() << qPrintable(name) << "requires" << minParams << "params, got:" << e->params();
+    }
+    e->stop();
+    return false;
+  }
+  return true;
+}
+
 void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) {
   //qDebug() << e->number();
   switch(e->number()) {
@@ -91,11 +105,11 @@ void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) {
   }
 
   // Ignore these commands.
-  case 321: case 366: case 376:
+  case 321: case 353: case 366: case 376:
     break;
 
   // CAP stuff
-  case 903: case 904: case 905: case 906: case 907:
+  case 900: case 903: case 904: case 905: case 906: case 907:
   {
     displayMsg(e, Message::Info, "CAP: " + e->params().join(""));
     break;
@@ -134,7 +148,7 @@ void EventStringifier::earlyProcessIrcEventKick(IrcEvent *e) {
 
 // this needs to be called before the ircuser is renamed!
 void EventStringifier::earlyProcessIrcEventNick(IrcEvent *e) {
-  if(e->params().count() < 1)
+  if(!checkParamCount(e, 1))
     return;
 
   IrcUser *ircuser = e->network()->updateNickFromMask(e->prefix());
@@ -152,7 +166,7 @@ void EventStringifier::earlyProcessIrcEventNick(IrcEvent *e) {
 }
 
 void EventStringifier::earlyProcessIrcEventPart(IrcEvent *e) {
-  if(e->params().count() < 1)
+  if(!checkParamCount(e, 1))
     return;
 
   QString channel = e->params().at(0);
@@ -173,6 +187,14 @@ void EventStringifier::processIrcEventTopic(IrcEvent *e) {
              .arg(e->nick(), e->params().at(0), e->params().at(1)), QString(), e->params().at(0));
 }
 
+/* RPL_ISUPPORT */
+void EventStringifier::processIrcEvent005(IrcEvent *e) {
+  if(!e->params().last().contains(QRegExp("are supported (by|on) this server")))
+    displayMsg(e, Message::Error, tr("Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected behavior!"), e->prefix());
+  displayMsg(e, Message::Server, e->params().join(" "), e->prefix());
+}
+
+/* RPL_AWAY - "<nick> :<away message>" */
 void EventStringifier::processIrcEvent301(IrcEvent *e) {
   QString nick = e->params().at(0);
   QString awayMsg = e->params().at(1);
@@ -197,12 +219,12 @@ void EventStringifier::processIrcEvent301(IrcEvent *e) {
     displayMsg(e, Message::Server, msg + tr("%1 is away: \"%2\"").arg(nick, awayMsg), QString(), target);
 }
 
-/* RPL_UNAWAY */
+/* RPL_UNAWAY - ":You are no longer marked as being away" */
 void EventStringifier::processIrcEvent305(IrcEvent *e) {
   displayMsg(e, Message::Server, tr("You are no longer marked as being away"));
 }
 
-/* RPL_NOWAWAY */
+/* RPL_NOWAWAY - ":You have been marked as being away" */
 void EventStringifier::processIrcEvent306(IrcEvent *e) {
   if(!e->network()->autoAwayActive())
     displayMsg(e, Message::Server, tr("You have been marked as being away"));
@@ -246,7 +268,7 @@ void EventStringifier::processIrcEvent312(IrcEvent *e) {
 
 /*  RPL_WHOWASUSER - "<nick> <user> <host> * :<real name>" */
 void EventStringifier::processIrcEvent314(IrcEvent *e) {
-  if(e->params().count() < 3)
+  if(!checkParamCount(e, 3))
     return;
 
   displayMsg(e, Message::Server, tr("[Whowas] %1 was %2@%3 (%4)").arg(e->params()[0], e->params()[1], e->params()[2], e->params().last()));
@@ -280,7 +302,7 @@ void EventStringifier::processIrcEvent318(IrcEvent *e) {
 
 /*  RPL_WHOISCHANNELS - "<nick> :*( ( "@" / "+" ) <channel> " " )" */
 void EventStringifier::processIrcEvent319(IrcEvent *e) {
-  if(e->params().count() < 2)
+  if(!checkParamCount(e, 2))
     return;
 
   QString nick = e->params().first();
@@ -303,6 +325,55 @@ void EventStringifier::processIrcEvent319(IrcEvent *e) {
     displayMsg(e, Message::Server, tr("[Whois] %1 is an operator on channels: %2").arg(nick, op.join(" ")));
 }
 
+/* RPL_LIST -  "<channel> <# visible> :<topic>" */
+void EventStringifier::processIrcEvent322(IrcEvent *e) {
+  QString channelName;
+  quint32 userCount = 0;
+  QString topic;
+
+  switch(e->params().count()) {
+  case 3:
+    topic = e->params()[2];
+  case 2:
+    userCount = e->params()[1].toUInt();
+  case 1:
+    channelName = e->params()[0];
+  default:
+    break;
+  }
+  displayMsg(e, Message::Server, tr("Channel %1 has %2 users. Topic is: \"%3\"")
+             .arg(channelName).arg(userCount).arg(topic));
+}
+
+/* RPL_LISTEND ":End of LIST" */
+void EventStringifier::processIrcEvent323(IrcEvent *e) {
+  displayMsg(e, Message::Server, tr("End of channel list"));
+}
+
+/* RPL_??? - "<channel> <homepage> */
+void EventStringifier::processIrcEvent328(IrcEvent *e) {
+  if(!checkParamCount(e, 2))
+    return;
+
+  QString channel = e->params()[0];
+  displayMsg(e, Message::Topic, tr("Homepage for %1 is %2").arg(channel, e->params()[1]), QString(), channel);
+}
+
+/* RPL_??? - "<channel> <creation time (unix)>" */
+void EventStringifier::processIrcEvent329(IrcEvent *e) {
+  if(!checkParamCount(e, 2))
+    return;
+
+  QString channel = e->params()[0];
+  uint unixtime = e->params()[1].toUInt();
+  if(!unixtime) {
+    qWarning() << Q_FUNC_INFO << "received invalid timestamp:" << e->params()[1];
+    return;
+  }
+  QDateTime time = QDateTime::fromTime_t(unixtime);
+  displayMsg(e, Message::Topic, tr("Channel %1 created on %2").arg(channel, time.toString()), QString(), channel);
+}
+
 /*  RPL_WHOISACCOUNT: "<nick> <account> :is authed as */
 void EventStringifier::processIrcEvent330(IrcEvent *e) {
   if(e->params().count() < 3)
@@ -311,6 +382,63 @@ void EventStringifier::processIrcEvent330(IrcEvent *e) {
   displayMsg(e, Message::Server, tr("[Whois] %1 is authed as %2").arg(e->params()[0], e->params()[1]));
 }
 
+/* RPL_NOTOPIC */
+void EventStringifier::processIrcEvent331(IrcEvent *e) {
+  QString channel = e->params().first();
+  displayMsg(e, Message::Topic, tr("No topic is set for %1.").arg(channel), QString(), channel);
+}
+
+/* RPL_TOPIC */
+void EventStringifier::processIrcEvent332(IrcEvent *e) {
+  QString channel = e->params().first();
+  displayMsg(e, Message::Topic, tr("Topic for %1 is \"%2\"").arg(channel, e->params()[1]), QString(), channel);
+}
+
+/* Topic set by... */
+void EventStringifier::processIrcEvent333(IrcEvent *e) {
+  if(!checkParamCount(e, 3))
+    return;
+
+  QString channel = e->params().first();
+  displayMsg(e, Message::Topic, tr("Topic set by %1 on %2")
+             .arg(e->params()[1], QDateTime::fromTime_t(e->params()[2].toInt()).toString()), QString(), channel);
+}
+
+/* RPL_INVITING - "<nick> <channel>*/
+void EventStringifier::processIrcEvent341(IrcEvent *e) {
+  if(!checkParamCount(e, 2))
+    return;
+
+  QString channel = e->params()[1];
+  displayMsg(e, Message::Server, tr("%1 has been invited to %2").arg(e->params().first(), channel), QString(), channel);
+}
+
+/*  RPL_WHOREPLY: "<channel> <user> <host> <server> <nick>
+              ( "H" / "G" > ["*"] [ ( "@" / "+" ) ] :<hopcount> <real name>" */
+void EventStringifier::processIrcEvent352(IrcEvent *e) {
+  displayMsg(e, Message::Server, tr("[Who] %1").arg(e->params().join(" ")));
+}
+
+/*  RPL_ENDOFWHOWAS - "<nick> :End of WHOWAS" */
+void EventStringifier::processIrcEvent369(IrcEvent *e) {
+  displayMsg(e, Message::Server, tr("End of /WHOWAS"));
+}
+
+/* ERR_ERRONEUSNICKNAME */
+void EventStringifier::processIrcEvent432(IrcEvent *e) {
+  displayMsg(e, Message::Error, tr("Nick %1 contains illegal characters").arg(e->params()[0]));
+}
+
+/* ERR_NICKNAMEINUSE */
+void EventStringifier::processIrcEvent433(IrcEvent *e) {
+  displayMsg(e, Message::Error, tr("Nick already in use: %1").arg(e->params()[0]));
+}
+
+/* ERR_UNAVAILRESOURCE */
+void EventStringifier::processIrcEvent437(IrcEvent *e) {
+  displayMsg(e, Message::Error, tr("Nick/channel is temporarily unavailable: %1").arg(e->params()[0]));
+}
+
 // template
 /*