Fixing BR #369 (handle onotice/omsg properly, add /notice command)

[quassel.git] / src / core / ircserverhandler.cpp

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 93076ec..25e5c44 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -326,10 +326,14 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QList<QByteArra
     return;
 
   QString target = serverDecode(params[0]);
     return;
 
   QString target = serverDecode(params[0]);

-  if(prefix.isEmpty() || target == "AUTH")
+  if(prefix.isEmpty() || target == "AUTH") {

     target = "";
     target = "";

-  else if(!network()->isChannelName(target))
-    target = nickFromMask(prefix);
+  } else {
+    if(!target.isEmpty() && network()->prefixes().contains(target[0]))
+      target = target.mid(1);
+    if(!network()->isChannelName(target))
+      target = nickFromMask(prefix);
+  }

 
   networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
 }
 
   networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
 }


@@ -398,9 +402,8 @@ void IrcServerHandler::handlePrivmsg(const QString &prefix, const QList<QByteArr
     ? QByteArray("")
     : params[1];
 
     ? QByteArray("")
     : params[1];
 

-  // are we the target?
-  if(network()->isMyNick(target))
-    target = nickFromMask(ircuser->nick());
+  if(!network()->isChannelName(target))
+    target = nickFromMask(prefix);

 
   // it's possible to pack multiple privmsgs into one param using ctcp
   // - > we let the ctcpHandler do the work
 
   // it's possible to pack multiple privmsgs into one param using ctcp
   // - > we let the ctcpHandler do the work