X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Feventstringifier.cpp;h=c29a457bdb2ae3b0d1118b8d4e5b506a49b3eaf4;hp=44528e53e1bd42aff2a5edbfdc3f2f279457e2da;hb=46a76ffbf0e9e7af3d4ceb074c0b8dff461b4a86;hpb=bd6311ec1d07e4daf082b5f752ef6b46d7808430

diff --git a/src/core/eventstringifier.cpp b/src/core/eventstringifier.cpp
index 44528e53..c29a457b 100644
--- a/src/core/eventstringifier.cpp
+++ b/src/core/eventstringifier.cpp
@@ -32,6 +32,9 @@ EventStringifier::EventStringifier(CoreSession *parent) : QObject(parent),
 
 void EventStringifier::displayMsg(NetworkEvent *event, Message::Type msgType, const QString &msg, const QString &sender,
                                   const QString &target, Message::Flags msgFlags) {
+  if(event->flags().testFlag(EventManager::Silent))
+    return;
+
   MessageEvent *msgEvent = createMessageEvent(event, msgType, msg, sender, target, msgFlags);
   sendMessageEvent(msgEvent);
 }
@@ -50,7 +53,9 @@ void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) {
   //qDebug() << e->number();
   switch(e->number()) {
   // Welcome, status, info messages. Just display these.
-  case 2: case 3: case 4: case 5: case 251: case 252: case 253: case 254: case 255: case 372: case 375:
+  case 1: case 2: case 3: case 4: case 5:
+  case 221: case 250: case 251: case 252: case 253: case 254: case 255: case 265: case 266:
+  case 372: case 375:
     displayMsg(e, Message::Server, e->params().join(" "), e->prefix());
     break;
 
@@ -99,7 +104,7 @@ void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) {
   default:
     if(_whois) {
       // many nets define their own WHOIS fields. we fetch those not in need of special attention here:
-      displayMsg(e, Message::Server, "[Whois] " + e->params().join(" "), e->prefix());
+      displayMsg(e, Message::Server, tr("[Whois] ") + e->params().join(" "), e->prefix());
     } else {
       // FIXME figure out how/where to do this in the future
       //if(coreSession()->ircListHelper()->requestInProgress(network()->networkId()))
@@ -109,3 +114,95 @@ void EventStringifier::processIrcEventNumeric(IrcEventNumeric *e) {
     }
   }
 }
+
+void EventStringifier::processIrcEventInvite(IrcEvent *e) {
+  displayMsg(e, Message::Invite, tr("%1 invited you to channel %2").arg(e->nick(), e->params().at(1)));
+}
+
+void EventStringifier::earlyProcessIrcEventKick(IrcEvent *e) {
+  IrcUser *victim = e->network()->ircUser(e->params().at(1));
+  if(victim) {
+    QString channel = e->params().at(0);
+    QString msg = victim->nick();
+    if(e->params().count() > 2)
+      msg += " " + e->params().at(2);
+
+    displayMsg(e, Message::Kick, msg, e->prefix(), channel);
+  }
+}
+
+// this needs to be called before the ircuser is renamed!
+void EventStringifier::earlyProcessIrcEventNick(IrcEvent *e) {
+  if(e->params().count() < 1)
+    return;
+
+  IrcUser *ircuser = e->network()->updateNickFromMask(e->prefix());
+  if(!ircuser) {
+    qWarning() << Q_FUNC_INFO << "Unknown IrcUser!";
+    return;
+  }
+
+  QString newnick = e->params().at(0);
+  QString oldnick = ircuser->nick();
+
+  QString sender = e->network()->isMyNick(oldnick) ? newnick : e->prefix();
+  foreach(const QString &channel, ircuser->channels())
+    displayMsg(e, Message::Nick, newnick, sender, channel);
+}
+
+void EventStringifier::earlyProcessIrcEventPart(IrcEvent *e) {
+  if(e->params().count() < 1)
+    return;
+
+  QString channel = e->params().at(0);
+  QString msg = e->params().count() > 1? e->params().at(1) : QString();
+
+  displayMsg(e, Message::Part, msg, e->prefix(), channel);
+}
+
+void EventStringifier::processIrcEventPong(IrcEvent *e) {
+  QString timestamp = e->params().at(1);
+  QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz");
+  if(!sendTime.isValid())
+    displayMsg(e, Message::Server, "PONG " + e->params().join(" "), e->prefix());
+}
+
+void EventStringifier::processIrcEventTopic(IrcEvent *e) {
+  displayMsg(e, Message::Topic, tr("%1 has changed topic for %2 to: \"%3\"")
+             .arg(e->nick(), e->params().at(0), e->params().at(1)), QString(), e->params().at(0));
+}
+
+void EventStringifier::processIrcEvent301(IrcEvent *e) {
+  QString nick = e->params().at(0);
+  QString awayMsg = e->params().at(1);
+  QString msg, target;
+  bool send = true;
+
+  // FIXME: proper redirection needed
+  if(_whois) {
+    msg = tr("[Whois] ");
+  } else {
+    target = nick;
+    IrcUser *ircuser = e->network()->ircUser(nick);
+    if(ircuser) {
+      int now = QDateTime::currentDateTime().toTime_t();
+      const int silenceTime = 60;
+      if(ircuser->lastAwayMessage() + silenceTime >= now)
+        send = false;
+      ircuser->setLastAwayMessage(now);
+    }
+  }
+  if(send)
+    displayMsg(e, Message::Server, msg + tr("%1 is away: \"%2\"").arg(nick, awayMsg), QString(), target);
+}
+
+/* RPL_UNAWAY */
+void EventStringifier::processIrcEvent305(IrcEvent *e) {
+  displayMsg(e, Message::Server, tr("You are no longer marked as being away"));
+}
+
+/* RPL_NOWAWAY */
+void EventStringifier::processIrcEvent306(IrcEvent *e) {
+  if(!e->network()->autoAwayActive())
+    displayMsg(e, Message::Server, tr("You have been marked as being away"));
+}