4 files changed, 91 insertions, 2 deletions
diff --git a/include/inspircd.h b/include/inspircd.h
index 188434620..931148884 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -73,6 +73,7 @@ struct fakederef
 #include "extensible.h"
 #include "fileutils.h"
 #include "numerics.h"
+#include "numeric.h"
 #include "uid.h"
 #include "server.h"
 #include "users.h"
diff --git a/include/numeric.h b/include/numeric.h
new file mode 100644
index 000000000..e7438b53a
--- /dev/null
+++ b/include/numeric.h
@@ -0,0 +1,88 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include "numerics.h"
+
+namespace Numeric
+{
+	class Numeric;
+}
+
+class Numeric::Numeric
+{
+	/** Numeric number
+	 */
+	unsigned int numeric;
+
+	/** Parameters of the numeric
+	 */
+	std::vector<std::string> params;
+
+ public:
+	/** Constructor
+	 * @param num Numeric number (RPL_*, ERR_*)
+	 */
+	Numeric(unsigned int num)
+		: numeric(num)
+	{
+	}
+
+	/** Add a parameter to the numeric. The parameter will be converted to a string first with ConvToStr().
+	 * @param x Parameter to add
+	 */
+	template <typename T>
+	Numeric& push(const T& x)
+	{
+		params.push_back(ConvToStr(x));
+		return *this;
+	}
+
+	/** Get the number of the numeric as an unsigned integer
+	 * @return Numeric number as an unsigned integer
+	 */
+	unsigned int GetNumeric() const { return numeric; }
+
+	/** Get the parameters of the numeric
+	 * @return Parameters of the numeric as a const vector of strings
+	 */
+	const std::vector<std::string>& GetParams() const { return params; }
+
+	/** Get the parameters of the numeric
+	 * @return Parameters of the numeric as a vector of strings
+	 */
+	std::vector<std::string>& GetParams() { return params; }
+};
+
+namespace Numerics
+{
+	/** ERR_NOSUCHNICK numeric
+	 */
+	class NoSuchNick : public Numeric::Numeric
+	{
+	 public:
+		NoSuchNick(const std::string& nick)
+			: Numeric(ERR_NOSUCHNICK)
+		{
+			push(nick);
+			push("No such nick/channel");
+		}
+	};
+}
diff --git a/include/numericbuilder.h b/include/numericbuilder.h
index 36cfeedb4..371f275a9 100644
--- a/include/numericbuilder.h
+++ b/include/numericbuilder.h
@@ -113,7 +113,7 @@ class Numeric::Builder : public GenericBuilder<Sep, SendEmpty, WriteNumericSink>
 {
  public:
 	Builder(LocalUser* user, unsigned int num, bool addparam = true, size_t additionalsize = 0)
-		: Numeric::GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
+		: ::Numeric::GenericBuilder<Sep, SendEmpty, WriteNumericSink>(WriteNumericSink(user), num, addparam, additionalsize + user->nick.size())
 	{
 	}
 };
diff --git a/include/numerics.h b/include/numerics.h
index 0447df353..72caaddcc 100644
--- a/include/numerics.h
+++ b/include/numerics.h
@@ -35,7 +35,7 @@
  * Please note that the list may not be exhaustive, it'll be done when I have
  * nothing better to do with my time. -- w00t (jul 13, 2008)
  */
-enum Numerics
+enum
 {
 	/*
 	 * Reply range of numerics.