From 070d41431084409a85660b7ef0b171840cae69ef Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 5 Apr 2022 23:13:56 +0100
Subject: Use consistent xline messages locally

For connectban these messages would have previously been duplicated
to other servers until this was fixed earlier today. For dnsbl and
rline they would have just differed on the local to a remote.

As of the previous commit the module name is included in the setter
so there is no need to vary the snotice. This makes things more
consistent for server operators and allows scripts to parse the
messages.
---
 src/modules/m_dnsbl.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/modules/m_dnsbl.cpp')

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 35b750e97..8777b6f24 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -185,9 +185,9 @@ class DNSBLResolver : public DNS::Request
 							them->GetBanIdent(), them->GetIPString());
 					if (ServerInstance->XLines->AddLine(kl,NULL))
 					{
-						ServerInstance->SNO->WriteToSnoMask('x', "K-line added due to DNSBL match on %s to expire in %s (on %s): %s",
-							kl->Displayable().c_str(), InspIRCd::DurationString(kl->duration).c_str(),
-							InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed K-line on %s, expires in %s (on %s): %s",
+							kl->source.c_str(), kl->Displayable().c_str(), InspIRCd::DurationString(kl->duration).c_str(),
+							InspIRCd::TimeString(kl->expiry).c_str(), kl->reason.c_str());
 						ServerInstance->XLines->ApplyLines();
 					}
 					else
@@ -203,9 +203,9 @@ class DNSBLResolver : public DNS::Request
 							them->GetBanIdent(), them->GetIPString());
 					if (ServerInstance->XLines->AddLine(gl,NULL))
 					{
-						ServerInstance->SNO->WriteToSnoMask('x', "G-line added due to DNSBL match on %s to expire in %s (on %s): %s",
-							gl->Displayable().c_str(), InspIRCd::DurationString(gl->duration).c_str(),
-							InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed G-line on %s, expires in %s (on %s): %s",
+							gl->source.c_str(), gl->Displayable().c_str(), InspIRCd::DurationString(gl->duration).c_str(),
+							InspIRCd::TimeString(gl->expiry).c_str(), gl->reason.c_str());
 						ServerInstance->XLines->ApplyLines();
 					}
 					else
@@ -221,9 +221,9 @@ class DNSBLResolver : public DNS::Request
 							them->GetIPString());
 					if (ServerInstance->XLines->AddLine(zl,NULL))
 					{
-						ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s",
-							them->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(),
-							InspIRCd::TimeString(zl->expiry).c_str(), reason.c_str());
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added a timed Z-line on %s, expires in %s (on %s): %s",
+							zl->source.c_str(), zl->Displayable().c_str(), InspIRCd::DurationString(zl->duration).c_str(),
+							InspIRCd::TimeString(zl->expiry).c_str(), zl->reason.c_str());
 						ServerInstance->XLines->ApplyLines();
 					}
 					else
-- 
cgit v1.3.1-10-gc9f91