diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-11-16 19:33:51 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-11-16 19:34:37 +0000 |
| commit | 46209895e3f46f183a293fe26e26bdfdc2423e8d (patch) | |
| tree | 92d920eda88107c25d368050df972da7005c9354 /modules/commands | |
| parent | b28180d680f974b7d3cf72667681b8cda6a39b0a (diff) | |
| parent | ba163027bd9d62d3ae22bc1f8eb8cbe8bc478bf7 (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/cs_access.cpp | 7 | ||||
| -rw-r--r-- | modules/commands/cs_xop.cpp | 7 | ||||
| -rw-r--r-- | modules/commands/ns_register.cpp | 12 |
3 files changed, 19 insertions, 7 deletions
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index f1d132963..7a37c5434 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -230,7 +230,12 @@ class CommandCSAccess : public Command { Anope::string mask = params[2]; - if (!isdigit(mask[0]) && mask.find_first_of("#!*@") == Anope::string::npos && !NickAlias::Find(mask)) + const NickAlias *na = NickAlias::Find(mask); + if (na && na->nc) + { + mask = na->nc->display; + } + else if (!isdigit(mask[0]) && mask.find_first_of("#!*@") == Anope::string::npos) { User *targ = User::Find(mask, true); if (targ != NULL) diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 5bd9de696..69f998740 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -251,7 +251,12 @@ class CommandCSXOP : public Command const ChanAccess *highest = access.Highest(); bool override = false; - if (!isdigit(mask[0]) && mask.find_first_of("#!*@") == Anope::string::npos && !NickAlias::Find(mask)) + const NickAlias *na = NickAlias::Find(mask); + if (na && na->nc) + { + mask = na->nc->display; + } + else if (!isdigit(mask[0]) && mask.find_first_of("#!*@") == Anope::string::npos) { User *targ = User::Find(mask, true); if (targ != NULL) diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index 6fd47ad38..63c566a0c 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -25,13 +25,15 @@ class CommandNSConfirm : public Command void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) override { - const Anope::string &passcode = params[0]; + Anope::string *code = source.nc ? source.nc->GetExt<Anope::string>("passcode") : NULL; + bool confirming_other = !code || *code != params[0]; - if (source.nc && (!source.nc->HasExt("UNCONFIRMED") || source.IsOper()) && source.HasPriv("nickserv/confirm")) + if (source.nc && (!source.nc->HasExt("UNCONFIRMED") || (source.IsOper() && confirming_other)) && source.HasPriv("nickserv/confirm")) { - NickAlias *na = NickAlias::Find(passcode); + const Anope::string &nick = params[0]; + NickAlias *na = NickAlias::Find(nick); if (na == NULL) - source.Reply(NICK_X_NOT_REGISTERED, passcode.c_str()); + source.Reply(NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->nc->HasExt("UNCONFIRMED") == false) source.Reply(_("Nick \002%s\002 is already confirmed."), na->nick.c_str()); else @@ -58,7 +60,7 @@ class CommandNSConfirm : public Command } else if (source.nc) { - Anope::string *code = source.nc->GetExt<Anope::string>("passcode"); + const Anope::string &passcode = params[0]; if (code != NULL && *code == passcode) { NickCore *nc = source.nc; |