From e0412d5161891c04faf2050cc02e8a9cffdda8a4 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 23 Jan 2015 20:09:31 +0000 Subject: [PATCH] Use ERR_YOUREBANNEDCREEP instead of NOTICE when a user is banned. This is specified in RFC 1459 so we should probably use it. --- include/numerics.h | 1 + src/usermanager.cpp | 2 +- src/xline.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/numerics.h b/include/numerics.h index 2418730d2..0447df353 100644 --- 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 52cb4989f..0efad66b4 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -112,7 +112,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 13124a392..dedf8c7a9 100644 --- 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); -- 2.39.2