1
0
mirror of https://github.com/anope/anope.git synced 2026-07-05 09:33:12 +02:00

Merge branch '2.0' into 2.1.

This commit is contained in:
Sadie Powell
2024-02-17 20:50:31 +00:00
2 changed files with 9 additions and 1 deletions
+1 -1
View File
@@ -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.
#
+8
View File
@@ -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)
{