Require new accounts to have email addresses.

3 files changed, 12 insertions, 42 deletions

diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp
index 47d2cf30d..499b84d32 100644
--- a/modules/nickserv/nickserv.cpp
+++ b/modules/nickserv/nickserv.cpp
@@ -357,7 +357,7 @@ public:
 		if (!modesonid.empty())
 			u->SetModes(NickServ, modesonid);
 
-		if (block->Get<bool>("forceemail", "yes") && u->Account()->email.empty())
+		if (u->Account()->email.empty())
 		{
 			u->SendMessage(NickServ, _("You must now supply an e-mail for your nick.\n"
 							"This e-mail will allow you to retrieve your password in\n"
diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp
index d73d74c6b..f29756eca 100644
--- a/modules/nickserv/ns_register.cpp
+++ b/modules/nickserv/ns_register.cpp
@@ -119,13 +119,10 @@ class CommandNSRegister final
 	: public Command
 {
 public:
-	CommandNSRegister(Module *creator) : Command(creator, "nickserv/register", 1, 2)
+	CommandNSRegister(Module *creator) : Command(creator, "nickserv/register", 2, 2)
 	{
 		this->SetDesc(_("Register a nickname"));
-		if (Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
-			this->SetSyntax(_("\037password\037 \037email\037"));
-		else
-			this->SetSyntax(_("\037password\037 \037[email]\037"));
+		this->SetSyntax(_("\037password\037 \037email\037"));
 		this->AllowUnregistered(true);
 	}
 
@@ -197,10 +194,7 @@ public:
 
 		unsigned int minpasslen = Config->GetModule("nickserv")->Get<unsigned>("minpasslen", "10");
 		unsigned int maxpasslen = Config->GetModule("nickserv")->Get<unsigned>("maxpasslen", "50");
-
-		if (Config->GetModule("nickserv")->Get<bool>("forceemail", "yes") && email.empty())
-			this->OnSyntaxError(source, "");
-		else if (u && Anope::CurTime < u->lastnickreg + reg_delay)
+		if (u && Anope::CurTime < u->lastnickreg + reg_delay)
 		{
 			source.Reply(_("Please wait %lu seconds before using the REGISTER command again."),
 				(unsigned long)(u->lastnickreg + reg_delay) - Anope::CurTime);
@@ -290,16 +284,6 @@ public:
 				source.service->nick.c_str(), source.service->nick.c_str(),
 				minpasslen);
 
-		if (!Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
-		{
-			source.Reply(" ");
-			source.Reply(_("The \037email\037 parameter is optional and will set the email\n"
-					"for your nick immediately.\n"
-					"Your privacy is respected; this e-mail won't be given to\n"
-					"any third-party person. You may also wish to \002SET HIDE\002 it\n"
-					"after registering if it isn't the default setting already."));
-		}
-
 		source.Reply(" ");
 		source.Reply(_("This command also creates a new group for your nickname,\n"
 				"that will allow you to register other nicks later sharing\n"
diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp
index 31547840b..b02c6e6ba 100644
--- a/modules/nickserv/ns_set.cpp
+++ b/modules/nickserv/ns_set.cpp
@@ -542,7 +542,7 @@ class CommandNSSetEmail
 	}
 
 public:
-	CommandNSSetEmail(Module *creator, const Anope::string &cname = "nickserv/set/email", size_t min = 0) : Command(creator, cname, min, min + 1)
+	CommandNSSetEmail(Module *creator, const Anope::string &cname = "nickserv/set/email", size_t min = 1) : Command(creator, cname, min, min + 1)
 	{
 		this->SetDesc(_("Associate an E-mail address with your nickname"));
 		this->SetSyntax(_("\037address\037"));
@@ -570,17 +570,12 @@ public:
 			return;
 		}
 
-		if (param.empty() && Config->GetModule("nickserv")->Get<bool>("forceemail", "yes"))
-		{
-			source.Reply(_("You cannot unset the e-mail on this network."));
-			return;
-		}
 		else if (Config->GetModule("nickserv")->Get<bool>("secureadmins", "yes") && source.nc != nc && nc->IsServicesOper())
 		{
 			source.Reply(_("You may not change the e-mail of other Services Operators."));
 			return;
 		}
-		else if (!param.empty() && !Mail::Validate(param))
+		else if (!Mail::Validate(param))
 		{
 			source.Reply(MAIL_X_INVALID, param.c_str());
 			return;
@@ -591,7 +586,7 @@ public:
 		if (MOD_RESULT == EVENT_STOP)
 			return;
 
-		if (!param.empty() && Config->GetModule("nickserv")->Get<bool>("confirmemailchanges") && !source.IsServicesOper())
+		if (Config->GetModule("nickserv")->Get<bool>("confirmemailchanges") && !source.IsServicesOper())
 		{
 			if (SendConfirmMail(source.GetUser(), source.GetAccount(), source.service, param))
 			{
@@ -601,24 +596,15 @@ public:
 		}
 		else
 		{
-			if (!param.empty())
-			{
-				Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email of " << nc->display << " to " << param;
-				nc->email = param;
-				source.Reply(_("E-mail address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
-			}
-			else
-			{
-				Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to unset the email of " << nc->display;
-				nc->email.clear();
-				source.Reply(_("E-mail address for \002%s\002 unset."), nc->display.c_str());
-			}
+			Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the email of " << nc->display << " to " << param;
+			nc->email = param;
+			source.Reply(_("E-mail address for \002%s\002 changed to \002%s\002."), nc->display.c_str(), param.c_str());
 		}
 	}
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
-		this->Run(source, source.nc->display, params.size() ? params[0] : "");
+		this->Run(source, source.nc->display, params[0]);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override
@@ -644,7 +630,7 @@ public:
 
 	void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
-		this->Run(source, params[0], params.size() > 1 ? params[1] : "");
+		this->Run(source, params[0], params[1]);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &) override