Merge pull request #971 from SaberUK/master+numeric-xline

Use ERR_YOUREBANNEDCREEP instead of NOTICE when a user is banned.

diff --git a/include/numerics.h b/include/numerics.h
index 2418730d27afd7abf630cf86a9b556c3b4d7d73e..0447df35308a3ab1a8202a6028926e974ea892f4 100644 (file)
--- a/include/numerics.h
+++ b/include/numerics.h
@@ -144,6 +144,7 @@ enum Numerics
        ERR_NOTREGISTERED               = 451,
        ERR_NEEDMOREPARAMS              = 461,
        ERR_ALREADYREGISTERED           = 462,
+       ERR_YOUREBANNEDCREEP            = 465,
        ERR_UNKNOWNMODE                 = 472,
 
        /*

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 5d07c4d792375de68b78bfc870813dcedfaaa536..1966c9b4729f86193e8c8fa87694a3bf9395c936 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -136,7 +136,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
                        /* user banned */
                        ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
                        if (!ServerInstance->Config->XLineMessage.empty())
-                               New->WriteNotice("*** " +  ServerInstance->Config->XLineMessage);
+                               New->WriteNumeric(ERR_YOUREBANNEDCREEP, ":" + ServerInstance->Config->XLineMessage);
                        this->QuitUser(New, b->Reason);
                        return;
                }

diff --git a/src/xline.cpp b/src/xline.cpp
index 13124a39228ed4b63d06747e727a70c54f3194a6..dedf8c7a9c917a4c838ee31acce445d0eab3a57a 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -531,7 +531,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
        const std::string banReason = line + "-Lined: " + reason;
 
        if (!ServerInstance->Config->XLineMessage.empty())
-               u->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
+               u->WriteNumeric(ERR_YOUREBANNEDCREEP, ":" + ServerInstance->Config->XLineMessage);
 
        if (ServerInstance->Config->HideBans)
                ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);