1
0
mirror of https://github.com/anope/anope.git synced 2026-06-25 08:16:38 +02:00

Merge branch '2.0' into 2.1.

This commit is contained in:
Sadie Powell
2025-03-22 20:52:25 +00:00
+5 -5
View File
@@ -36,14 +36,14 @@ class NSMaxEmail final
return cleaned;
}
bool CheckLimitReached(CommandSource &source, const Anope::string &email)
bool CheckLimitReached(CommandSource &source, const Anope::string &email, bool ignoreself)
{
int NSEmailMax = Config->GetModule(this).Get<int>("maxemails");
if (NSEmailMax < 1 || email.empty())
return false;
if (this->CountEmail(email, source.nc) < NSEmailMax)
if (this->CountEmail(email, ignoreself ? source.GetAccount() : NULL) < NSEmailMax)
return false;
if (NSEmailMax == 1)
@@ -91,17 +91,17 @@ public:
if (command->name == "nickserv/register")
{
if (this->CheckLimitReached(source, params.size() > 1 ? params[1] : ""))
if (this->CheckLimitReached(source, params.size() > 1 ? params[1] : "", false))
return EVENT_STOP;
}
else if (command->name == "nickserv/set/email")
{
if (this->CheckLimitReached(source, params.size() > 0 ? params[0] : ""))
if (this->CheckLimitReached(source, params.size() > 0 ? params[0] : "", true))
return EVENT_STOP;
}
else if (command->name == "nickserv/ungroup" && source.GetAccount())
{
if (this->CheckLimitReached(source, source.GetAccount()->email))
if (this->CheckLimitReached(source, source.GetAccount()->email, false))
return EVENT_STOP;
}