pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

Clean up the target mask code in access modules.

Browse Source
This commit is contained in:
Sadie Powell
2026-01-19 10:43:59 +00:00
parent 650f953cb1
commit 655c4fb5eb
3 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/chanserv/cs_flags.cpp
+27 -21
View File
@@ -119,37 +119,43 @@ class CommandCSFlags final
else
{
na = NickAlias::Find(mask);
if (!na && Config->GetModule("chanserv").Get<bool>("disallow_hostmask_access"))
if (na)
{
source.Reply(_("Masks and unregistered users may not be on access lists."));
return;
}
else if (na && na->nc->HasExt("NEVEROP"))
{
source.Reply(_("\002%s\002 does not wish to be added to channel access lists."),
na->nc->display.c_str());
return;
}
else if (mask.find_first_of("!*@") == Anope::string::npos && !na)
{
User *targ = User::Find(mask, true);
if (targ != NULL)
if (na->nc->HasExt("NEVEROP"))
{
source.Reply(_("\002%s\002 does not wish to be added to channel access lists."),
na->nc->display.c_str());
return;
}
mask = na->nick;
}
else
{
if (Config->GetModule("chanserv").Get<bool>("disallow_hostmask_access"))
{
source.Reply(_("Masks and unregistered users may not be on access lists."));
return;
}
if (mask.find_first_of("!*@") == Anope::string::npos)
{
auto *targ = User::Find(mask, true);
if (!targ)
{
source.Reply(NICK_X_NOT_REGISTERED, mask.c_str());
return;
}
mask = "*!*@" + targ->GetDisplayedHost();
if (description.empty())
description = targ->nick;
}
else
{
source.Reply(NICK_X_NOT_REGISTERED, mask.c_str());
return;
// Normalize the entry mask.
mask = Entry("", mask).GetNUHMask();
}
}
else if (!na && mask.find_first_of("!*@") != Anope::string::npos)
mask = Entry("", mask).GetNUHMask();
if (na)
mask = na->nick;
}
ChanAccess *current = NULL;