1 files changed, 120 insertions, 131 deletions

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4147f0b16..f15760dca 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -22,7 +22,17 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implementation of callerid, usermode +g, /accept */
+enum
+{
+	RPL_ACCEPTLIST = 281,
+	RPL_ENDOFACCEPT = 282,
+	ERR_ACCEPTFULL = 456,
+	ERR_ACCEPTEXIST = 457,
+	ERR_ACCEPTNOT = 458,
+	ERR_TARGUMODEG = 716,
+	RPL_TARGNOTIFY = 717,
+	RPL_UMODEGMSG = 718
+};
 
 class callerid_data
 {
@@ -62,12 +72,20 @@ struct CallerIDExtInfo : public ExtensionItem
 
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
 	{
-		callerid_data* dat = static_cast<callerid_data*>(item);
-		return dat->ToString(format);
+		std::string ret;
+		if (format != FORMAT_NETWORK)
+		{
+			callerid_data* dat = static_cast<callerid_data*>(item);
+			ret = dat->ToString(format);
+		}
+		return ret;
 	}
 
 	void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 	{
+		if (format == FORMAT_NETWORK)
+			return;
+
 		callerid_data* dat = new callerid_data;
 		irc::commasepstream s(value);
 		std::string tok;
@@ -76,9 +94,6 @@ struct CallerIDExtInfo : public ExtensionItem
 
 		while (s.GetToken(tok))
 		{
-			if (tok.empty())
-				continue;
-
 			User *u = ServerInstance->FindNick(tok);
 			if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u)))
 			{
@@ -117,7 +132,7 @@ struct CallerIDExtInfo : public ExtensionItem
 
 			if (!targ)
 			{
-				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)");
 				continue; // shouldn't happen, but oh well.
 			}
 
@@ -125,7 +140,7 @@ struct CallerIDExtInfo : public ExtensionItem
 			if (it2 != targ->wholistsme.end())
 				targ->wholistsme.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
 	}
@@ -139,6 +154,28 @@ public:
 
 class CommandAccept : public Command
 {
+	/** Pair: first is the target, second is true to add, false to remove
+	 */
+	typedef std::pair<User*, bool> ACCEPTAction;
+
+	static ACCEPTAction GetTargetAndAction(std::string& tok, User* cmdfrom = NULL)
+	{
+		bool remove = (tok[0] == '-');
+		if ((remove) || (tok[0] == '+'))
+			tok.erase(tok.begin());
+
+		User* target;
+		if (!cmdfrom || !IS_LOCAL(cmdfrom))
+			target = ServerInstance->FindNick(tok);
+		else
+			target = ServerInstance->FindNickOnly(tok);
+
+		if ((!target) || (target->registered != REG_ALL) || (target->quitting) || (IS_SERVER(target)))
+			target = NULL;
+
+		return std::make_pair(target, !remove);
+	}
+
 public:
 	CallerIDExtInfo extInfo;
 	unsigned int maxaccepts;
@@ -147,42 +184,21 @@ public:
 	{
 		allow_empty_last_param = false;
 		syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
-		TRANSLATE2(TR_CUSTOM, TR_END);
+		TRANSLATE1(TR_CUSTOM);
 	}
 
-	virtual void EncodeParameter(std::string& parameter, int index)
+	void EncodeParameter(std::string& parameter, int index)
 	{
-		if (index != 0)
+		// Send lists as-is (part of 2.0 compat)
+		if (parameter.find(',') != std::string::npos)
 			return;
-		std::string out;
-		irc::commasepstream nicks(parameter);
-		std::string tok;
-		while (nicks.GetToken(tok))
-		{
-			if (tok == "*")
-			{
-				continue; // Drop list requests, since remote servers ignore them anyway.
-			}
-			if (!out.empty())
-				out.append(",");
-			bool dash = false;
-			if (tok[0] == '-')
-			{
-				dash = true;
-				tok.erase(0, 1); // Remove the dash.
-			}
-			else if (tok[0] == '+')
-				tok.erase(0, 1);
 
-			User* u = ServerInstance->FindNick(tok);
-			if ((!u) || (u->registered != REG_ALL) || (u->quitting) || (IS_SERVER(u)))
-				continue;
+		// Convert a [+|-]<nick> into a [-]<uuid>
+		ACCEPTAction action = GetTargetAndAction(parameter);
+		if (!action.first)
+			return;
 
-			if (dash)
-				out.append("-");
-			out.append(u->uuid);
-		}
-		parameter = out;
+		parameter = (action.second ? "" : "-") + action.first->uuid;
 	}
 
 	/** Will take any number of nicks (up to MaxTargets), which can be seperated by commas.
@@ -192,54 +208,58 @@ public:
 	 */
 	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
 	{
-		if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))
+		if (CommandParser::LoopCall(user, this, parameters, 0))
 			return CMD_SUCCESS;
+
 		/* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can
 		 * have a list already setup. */
 
-		const std::string& tok = parameters[0];
-
-		if (tok == "*")
+		if (parameters[0] == "*")
 		{
-			if (IS_LOCAL(user))
-				ListAccept(user);
+			ListAccept(user);
 			return CMD_SUCCESS;
 		}
-		else if (tok[0] == '-')
-		{
-			User* whotoremove;
-			if (IS_LOCAL(user))
-				whotoremove = ServerInstance->FindNickOnly(tok.substr(1));
-			else
-				whotoremove = ServerInstance->FindNick(tok.substr(1));
 
-			if (whotoremove)
-				return (RemoveAccept(user, whotoremove) ? CMD_SUCCESS : CMD_FAILURE);
-			else
-				return CMD_FAILURE;
-		}
-		else
+		std::string tok = parameters[0];
+		ACCEPTAction action = GetTargetAndAction(tok, user);
+		if (!action.first)
 		{
-			const std::string target = (tok[0] == '+' ? tok.substr(1) : tok);
-			User* whotoadd;
-			if (IS_LOCAL(user))
-				whotoadd = ServerInstance->FindNickOnly(target);
-			else
-				whotoadd = ServerInstance->FindNick(target);
-
-			if ((whotoadd) && (whotoadd->registered == REG_ALL) && (!whotoadd->quitting) && (!IS_SERVER(whotoadd)))
-				return (AddAccept(user, whotoadd) ? CMD_SUCCESS : CMD_FAILURE);
-			else
-			{
-				user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), tok.c_str());
-				return CMD_FAILURE;
-			}
+			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", tok.c_str());
+			return CMD_FAILURE;
 		}
+
+		if ((!IS_LOCAL(user)) && (!IS_LOCAL(action.first)))
+			// Neither source nor target is local, forward the command to the server of target
+			return CMD_SUCCESS;
+
+		// The second item in the pair is true if the first char is a '+' (or nothing), false if it's a '-'
+		if (action.second)
+			return (AddAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
+		else
+			return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
 	}
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
-		return ROUTE_BROADCAST;
+		// There is a list in parameters[0] in two cases:
+		// Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists,
+		// we don't split those but broadcast them, as before.
+		//
+		// Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list,
+		// meaning the linking module has sent an ACCEPT already for each entry in the list to the
+		// appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
+		if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos))
+			return ROUTE_BROADCAST;
+
+		// Find the target
+		std::string targetstring = parameters[0];
+		ACCEPTAction action = GetTargetAndAction(targetstring, user);
+		if (!action.first)
+			// Target is a "*" or source is local and the target is a list of nicks
+			return ROUTE_LOCALONLY;
+
+		// Route to the server of the target
+		return ROUTE_UNICAST(action.first->server);
 	}
 
 	void ListAccept(User* user)
@@ -248,9 +268,9 @@ public:
 		if (dat)
 		{
 			for (std::set<User*>::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i)
-				user->WriteNumeric(281, "%s %s", user->nick.c_str(), (*i)->nick.c_str());
+				user->WriteNumeric(RPL_ACCEPTLIST, (*i)->nick);
 		}
-		user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick.c_str());
+		user->WriteNumeric(RPL_ENDOFACCEPT, ":End of ACCEPT list");
 	}
 
 	bool AddAccept(User* user, User* whotoadd)
@@ -259,12 +279,12 @@ public:
 		callerid_data* dat = extInfo.get(user, true);
 		if (dat->accepting.size() >= maxaccepts)
 		{
-			user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick.c_str(), maxaccepts);
+			user->WriteNumeric(ERR_ACCEPTFULL, ":Accept list is full (limit is %d)", maxaccepts);
 			return false;
 		}
 		if (!dat->accepting.insert(whotoadd).second)
 		{
-			user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick.c_str(), whotoadd->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTEXIST, "%s :is already on your accept list", whotoadd->nick.c_str());
 			return false;
 		}
 
@@ -272,7 +292,7 @@ public:
 		callerid_data *targ = extInfo.get(whotoadd, true);
 		targ->wholistsme.push_back(dat);
 
-		user->WriteServ("NOTICE %s :%s is now on your accept list", user->nick.c_str(), whotoadd->nick.c_str());
+		user->WriteNotice(whotoadd->nick + " is now on your accept list");
 		return true;
 	}
 
@@ -282,13 +302,13 @@ public:
 		callerid_data* dat = extInfo.get(user, false);
 		if (!dat)
 		{
-			user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str());
 			return false;
 		}
 		std::set<User*>::iterator i = dat->accepting.find(whotoremove);
 		if (i == dat->accepting.end())
 		{
-			user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str());
 			return false;
 		}
 
@@ -299,7 +319,7 @@ public:
 		if (!dat2)
 		{
 			// How the fuck is this possible.
-			ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (3)");
 			return false;
 		}
 
@@ -308,17 +328,16 @@ public:
 			// Found me!
 			dat2->wholistsme.erase(it);
 		else
-			ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
 
 
-		user->WriteServ("NOTICE %s :%s is no longer on your accept list", user->nick.c_str(), whotoremove->nick.c_str());
+		user->WriteNotice(whotoremove->nick + " is no longer on your accept list");
 		return true;
 	}
 };
 
 class ModuleCallerID : public Module
 {
-private:
 	CommandAccept cmd;
 	User_g myumode;
 
@@ -348,7 +367,7 @@ private:
 			if (it2 != dat->accepting.end())
 				dat->accepting.erase(it2);
 			else
-				ServerInstance->Logs->Log("m_callerid", DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (5)");
 		}
 
 		userdata->wholistsme.clear();
@@ -359,38 +378,26 @@ public:
 	{
 	}
 
-	void init()
-	{
-		OnRehash(NULL);
-
-		ServerInstance->Modules->AddService(myumode);
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(cmd.extInfo);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	virtual ~ModuleCallerID()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
 	}
 
-	virtual void On005Numeric(std::string& output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output += " CALLERID=g";
+		tokens["CALLERID"] = "g";
 	}
 
-	ModResult PreText(User* user, User* dest, std::string& text)
+	ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
 	{
-		if (!dest->IsModeSet('g') || (user == dest))
+		if (!IS_LOCAL(user) || target_type != TYPE_USER)
+			return MOD_RES_PASSTHRU;
+
+		User* dest = static_cast<User*>(voiddest);
+		if (!dest->IsModeSet(myumode) || (user == dest))
 			return MOD_RES_PASSTHRU;
 
-		if (operoverride && IS_OPER(user))
+		if (operoverride && user->IsOper())
 			return MOD_RES_PASSTHRU;
 
 		callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -400,12 +407,12 @@ public:
 		{
 			time_t now = ServerInstance->Time();
 			/* +g and *not* accepted */
-			user->WriteNumeric(716, "%s %s :is in +g mode (server-side ignore).", user->nick.c_str(), dest->nick.c_str());
+			user->WriteNumeric(ERR_TARGUMODEG, "%s :is in +g mode (server-side ignore).", dest->nick.c_str());
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
-				user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str());
-				dest->SendText(":%s 718 %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
-					ServerInstance->Config->ServerName.c_str(), dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
+				user->WriteNumeric(RPL_TARGNOTIFY, "%s :has been informed that you messaged them.", dest->nick.c_str());
+				dest->SendText(":%s %03d %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+						ServerInstance->Config->ServerName.c_str(), RPL_UMODEGMSG, dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
 				dat->lastnotify = now;
 			}
 			return MOD_RES_DENY;
@@ -413,34 +420,18 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list)
-	{
-		if (IS_LOCAL(user) && target_type == TYPE_USER)
-			return PreText(user, (User*)dest, text);
-
-		return MOD_RES_PASSTHRU;
-	}
-
-	virtual ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string& text, char status, CUList &exempt_list)
-	{
-		if (IS_LOCAL(user) && target_type == TYPE_USER)
-			return PreText(user, (User*)dest, text);
-
-		return MOD_RES_PASSTHRU;
-	}
-
-	void OnUserPostNick(User* user, const std::string& oldnick)
+	void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE
 	{
 		if (!tracknick)
 			RemoveFromAllAccepts(user);
 	}
 
-	void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)
+	void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE
 	{
 		RemoveFromAllAccepts(user);
 	}
 
-	virtual void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
 		cmd.maxaccepts = tag->getInt("maxaccepts", 16);
@@ -451,5 +442,3 @@ public:
 };
 
 MODULE_INIT(ModuleCallerID)
-
-