X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fnumericbuilder.h;h=a077c666deaa9ff67e1d1261281a487d2b492d1e;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=0d55093ca59c3db15d9f75b787f2872fa7dc918d;hpb=87b1461e2a4710a38b32186c2582da9fe9bb3804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/numericbuilder.h b/include/numericbuilder.h
index 0d55093ca..a077c666d 100644
--- a/include/numericbuilder.h
+++ b/include/numericbuilder.h
@@ -1,6 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2015-2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -85,7 +86,7 @@ class Numeric::GenericBuilder
 	GenericBuilder(Sink s, unsigned int num, bool addparam = true, size_t additionalsize = 0)
 		: sink(s)
 		, numeric(num)
-		, max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
+		, max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->GetServerName().size() - additionalsize - 10)
 	{
 		if (addparam)
 			numeric.push(std::string());
@@ -155,7 +156,7 @@ class Numeric::GenericParamBuilder
 		: sink(s)
 		, numeric(num)
 		, currlen(0)
-		, max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
+		, max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->GetServerName().size() - additionalsize - 10)
 	{
 	}
 
@@ -199,14 +200,81 @@ class Numeric::ParamBuilder : public GenericParamBuilder<NumStaticParams, SendEm
 
 namespace Numerics
 {
+	class CannotSendTo;
 	class InvalidModeParameter;
 	class NoSuchChannel;
 	class NoSuchNick;
 }
 
+/** Builder for the ERR_CANNOTSENDTOCHAN and ERR_CANTSENDTOUSER numerics. */
+class Numerics::CannotSendTo : public Numeric::Numeric
+{
+ public:
+	CannotSendTo(Channel* chan, const std::string& message)
+		: Numeric(ERR_CANNOTSENDTOCHAN)
+	{
+		push(chan->name);
+		push(message);
+	}
+
+	CannotSendTo(Channel* chan, const std::string& what, ModeHandler* mh)
+		: Numeric(ERR_CANNOTSENDTOCHAN)
+	{
+		push(chan->name);
+		push(InspIRCd::Format("You cannot send %s to this channel whilst the +%c (%s) mode is set.",
+			what.c_str(), mh->GetModeChar(), mh->name.c_str()));
+	}
+
+	CannotSendTo(Channel* chan, const std::string& what, char extban, const std::string& extbandesc)
+		: Numeric(ERR_CANNOTSENDTOCHAN)
+	{
+		push(chan->name);
+		push(InspIRCd::Format("You cannot send %s to this channel whilst %s %c: (%s) extban is set matching you.",
+			what.c_str(), strchr("AEIOUaeiou", extban) ? "an" : "a", extban, extbandesc.c_str()));
+	}
+
+	CannotSendTo(User* user, const std::string& message)
+		: Numeric(ERR_CANTSENDTOUSER)
+	{
+		push(user->registered & REG_NICK ? user->nick : "*");
+		push(message);
+	}
+
+	CannotSendTo(User* user, const std::string& what, ModeHandler* mh, bool self = false)
+		: Numeric(ERR_CANTSENDTOUSER)
+	{
+		push(user->registered & REG_NICK ? user->nick : "*");
+		push(InspIRCd::Format("You cannot send %s to this user whilst %s have the +%c (%s) mode set.",
+			what.c_str(), self ? "you" : "they", mh->GetModeChar(), mh->name.c_str()));
+	}
+};
+
 /* Builder for the ERR_INVALIDMODEPARAM numeric. */
 class Numerics::InvalidModeParameter : public Numeric::Numeric
 {
+ private:
+	void push_message(ModeHandler* mode, const std::string& message)
+	{
+		if (!message.empty())
+		{
+			// The caller has specified their own message.
+			push(message);
+			return;
+		}
+
+		const std::string& syntax = mode->GetSyntax();
+		if (!syntax.empty())
+		{
+			// If the mode has a syntax hint we include it in the message.
+			push(InspIRCd::Format("Invalid %s mode parameter. Syntax: %s.", mode->name.c_str(), syntax.c_str()));
+		}
+		else
+		{
+			// Otherwise, send it without.
+			push(InspIRCd::Format("Invalid %s mode parameter.", mode->name.c_str()));
+		}
+	}
+
  public:
 	InvalidModeParameter(Channel* chan, ModeHandler* mode, const std::string& parameter, const std::string& message = "")
 		: Numeric(ERR_INVALIDMODEPARAM)
@@ -214,7 +282,7 @@ class Numerics::InvalidModeParameter : public Numeric::Numeric
 		push(chan->name);
 		push(mode->GetModeChar());
 		push(parameter);
-		push(message.empty() ? InspIRCd::Format("Invalid %s mode parameter", mode->name.c_str()) : message);
+		push_message(mode, message);
 	}
 
 	InvalidModeParameter(User* user, ModeHandler* mode, const std::string& parameter, const std::string& message = "")
@@ -223,7 +291,7 @@ class Numerics::InvalidModeParameter : public Numeric::Numeric
 		push(user->registered & REG_NICK ? user->nick : "*");
 		push(mode->GetModeChar());
 		push(parameter);
-		push(message.empty() ? InspIRCd::Format("Invalid %s mode parameter", mode->name.c_str()) : message);
+		push_message(mode, message);
 	}
 };
 
@@ -234,7 +302,7 @@ class Numerics::NoSuchChannel : public Numeric::Numeric
 	NoSuchChannel(const std::string& chan)
 		: Numeric(ERR_NOSUCHCHANNEL)
 	{
-		push(chan);
+		push(chan.empty() ? "*" : chan);
 		push("No such channel");
 	}
 };
@@ -246,7 +314,7 @@ class Numerics::NoSuchNick : public Numeric::Numeric
 	NoSuchNick(const std::string& nick)
 		: Numeric(ERR_NOSUCHNICK)
 	{
-		push(nick);
+		push(nick.empty() ? "*" : nick);
 		push("No such nick");
 	}
 };