From 9552f4588748150695a223fa7aeca4be60e54c00 Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 10 Feb 2008 21:31:42 +0000
Subject: [PATCH] display only the nick in Notices if the sender is a normal
 user

---
 src/core/ircserverhandler.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 3f150150..b5b58769 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -295,7 +295,11 @@ void IrcServerHandler::handleNotice(QString prefix, QList<QByteArray> params) {
   if(network()->isMyNick(target))
     target = QString("");
 
-  networkConnection->ctcpHandler()->parse(Message::Notice, prefix, target, userDecode(prefix, params[1]));
+  QString sender = prefix.contains('!')
+    ? nickFromMask(prefix)
+    : prefix;
+
+  networkConnection->ctcpHandler()->parse(Message::Notice, sender, target, userDecode(prefix, params[1]));
 }
 
 void IrcServerHandler::handlePart(QString prefix, QList<QByteArray> params) {
-- 
2.20.1