diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-02-17 20:50:31 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-02-17 20:50:31 +0000 |
| commit | 49ea709027595a7ac17c9a4cca8637deeed52eb0 (patch) | |
| tree | fb05632add2d67f269c7c5d699b395cdec162bd5 | |
| parent | e47ad6ed3f242153ad1cf48389fdd78d90e80710 (diff) | |
| parent | 4ea2bc5e46cdca5fc791adb8397d025059037943 (diff) | |
Merge branch '2.0' into 2.1.
| -rw-r--r-- | language/anope.en_US.po | 2 | ||||
| -rw-r--r-- | modules/nickserv/ns_resetpass.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/language/anope.en_US.po b/language/anope.en_US.po index ccbe825f3..d0a1b3af1 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -1,5 +1,5 @@ # Anope IRC Services language file -# Copyright (C) 2014-2020 +# Copyright (C) 2014-2024 # This file is distributed under the same license as the Anope IRC Services package. # Adam <adam@anope.org>, 2014. # diff --git a/modules/nickserv/ns_resetpass.cpp b/modules/nickserv/ns_resetpass.cpp index 1120cb84a..889a8b933 100644 --- a/modules/nickserv/ns_resetpass.cpp +++ b/modules/nickserv/ns_resetpass.cpp @@ -30,6 +30,8 @@ public: if (!(na = NickAlias::Find(params[0]))) source.Reply(NICK_X_NOT_REGISTERED, params[0].c_str()); + else if (na->nc->HasExt("NS_SUSPENDED")) + source.Reply(NICK_X_SUSPENDED, na->nc->display.c_str()); else if (!na->nc->email.equals_ci(params[1])) source.Reply(_("Incorrect email address.")); else @@ -91,6 +93,12 @@ public: if (na && ri) { NickCore *nc = na->nc; + if (nc->HasExt("NS_SUSPENDED")) + { + source.Reply(NICK_X_SUSPENDED, nc->display.c_str()); + return EVENT_STOP; + } + const Anope::string &passcode = params[1]; if (ri->time < Anope::CurTime - 3600) { |