X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=349c48c297cf0aa9987818678abb34f0dd421978;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=add1d929e030744d0f7346719ec4c07a5d64251f;hpb=b7994533da0e77fae440c60f2bc8d7996434a88c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index add1d929e..349c48c29 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -37,7 +37,7 @@ enum
 class callerid_data
 {
  public:
- 	typedef std::set<User*> UserSet;
+ 	typedef insp::flat_set<User*> UserSet;
 	typedef std::vector<callerid_data*> CallerIdDataSet;
 
 	time_t lastnotify;
@@ -69,11 +69,11 @@ class callerid_data
 struct CallerIDExtInfo : public ExtensionItem
 {
 	CallerIDExtInfo(Module* parent)
-		: ExtensionItem("callerid_data", parent)
+		: ExtensionItem("callerid_data", ExtensionItem::EXT_USER, parent)
 	{
 	}
 
-	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
 	{
 		std::string ret;
 		if (format != FORMAT_NETWORK)
@@ -84,12 +84,17 @@ struct CallerIDExtInfo : public ExtensionItem
 		return ret;
 	}
 
-	void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
 	{
 		if (format == FORMAT_NETWORK)
 			return;
 
+		void* old = get_raw(container);
+		if (old)
+			this->free(old);
 		callerid_data* dat = new callerid_data;
+		set_raw(container, dat);
+
 		irc::commasepstream s(value);
 		std::string tok;
 		if (s.GetToken(tok))
@@ -98,7 +103,7 @@ struct CallerIDExtInfo : public ExtensionItem
 		while (s.GetToken(tok))
 		{
 			User *u = ServerInstance->FindNick(tok);
-			if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u)))
+			if ((u) && (u->registered == REG_ALL) && (!u->quitting))
 			{
 				if (dat->accepting.insert(u).second)
 				{
@@ -107,10 +112,6 @@ struct CallerIDExtInfo : public ExtensionItem
 				}
 			}
 		}
-
-		void* old = set_raw(container, dat);
-		if (old)
-			this->free(old);
 	}
 
 	callerid_data* get(User* user, bool create)
@@ -124,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem
 		return dat;
 	}
 
-	void free(void* item)
+	void free(void* item) CXX11_OVERRIDE
 	{
 		callerid_data* dat = static_cast<callerid_data*>(item);
 
@@ -146,12 +147,6 @@ struct CallerIDExtInfo : public ExtensionItem
 	}
 };
 
-class User_g : public SimpleUserModeHandler
-{
-public:
-	User_g(Module* Creator) : SimpleUserModeHandler(Creator, "callerid", 'g') { }
-};
-
 class CommandAccept : public Command
 {
 	/** Pair: first is the target, second is true to add, false to remove
@@ -170,7 +165,7 @@ class CommandAccept : public Command
 		else
 			target = ServerInstance->FindNickOnly(tok);
 
-		if ((!target) || (target->registered != REG_ALL) || (target->quitting) || (IS_SERVER(target)))
+		if ((!target) || (target->registered != REG_ALL) || (target->quitting))
 			target = NULL;
 
 		return std::make_pair(target, !remove);
@@ -187,7 +182,7 @@ public:
 		TRANSLATE1(TR_CUSTOM);
 	}
 
-	void EncodeParameter(std::string& parameter, int index)
+	void EncodeParameter(std::string& parameter, unsigned int index) CXX11_OVERRIDE
 	{
 		// Send lists as-is (part of 2.0 compat)
 		if (parameter.find(',') != std::string::npos)
@@ -206,7 +201,7 @@ public:
 	 * /accept nick1,nick2,nick3,*
 	 * to add 3 nicks and then show your list
 	 */
-	CmdResult Handle(const std::vector<std::string> &parameters, User* user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
 	{
 		if (CommandParser::LoopCall(user, this, parameters, 0))
 			return CMD_SUCCESS;
@@ -224,7 +219,7 @@ public:
 		ACCEPTAction action = GetTargetAndAction(tok, user);
 		if (!action.first)
 		{
-			user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", tok.c_str());
+			user->WriteNumeric(Numerics::NoSuchNick(tok));
 			return CMD_FAILURE;
 		}
 
@@ -239,7 +234,7 @@ public:
 			return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		// 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,
@@ -270,7 +265,7 @@ public:
 			for (callerid_data::UserSet::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i)
 				user->WriteNumeric(RPL_ACCEPTLIST, (*i)->nick);
 		}
-		user->WriteNumeric(RPL_ENDOFACCEPT, ":End of ACCEPT list");
+		user->WriteNumeric(RPL_ENDOFACCEPT, "End of ACCEPT list");
 	}
 
 	bool AddAccept(User* user, User* whotoadd)
@@ -279,12 +274,12 @@ public:
 		callerid_data* dat = extInfo.get(user, true);
 		if (dat->accepting.size() >= maxaccepts)
 		{
-			user->WriteNumeric(ERR_ACCEPTFULL, ":Accept list is full (limit is %d)", maxaccepts);
+			user->WriteNumeric(ERR_ACCEPTFULL, InspIRCd::Format("Accept list is full (limit is %d)", maxaccepts));
 			return false;
 		}
 		if (!dat->accepting.insert(whotoadd).second)
 		{
-			user->WriteNumeric(ERR_ACCEPTEXIST, "%s :is already on your accept list", whotoadd->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTEXIST, whotoadd->nick, "is already on your accept list");
 			return false;
 		}
 
@@ -302,12 +297,12 @@ public:
 		callerid_data* dat = extInfo.get(user, false);
 		if (!dat)
 		{
-			user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTNOT, whotoremove->nick, "is not on your accept list");
 			return false;
 		}
 		if (!dat->accepting.erase(whotoremove))
 		{
-			user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str());
+			user->WriteNumeric(ERR_ACCEPTNOT, whotoremove->nick, "is not on your accept list");
 			return false;
 		}
 
@@ -332,7 +327,7 @@ public:
 class ModuleCallerID : public Module
 {
 	CommandAccept cmd;
-	User_g myumode;
+	SimpleUserModeHandler myumode;
 
 	// Configuration variables:
 	bool operoverride; // Operators can override callerid.
@@ -363,7 +358,9 @@ class ModuleCallerID : public Module
 	}
 
 public:
-	ModuleCallerID() : cmd(this), myumode(this)
+	ModuleCallerID()
+		: cmd(this)
+		, myumode(this, "callerid", 'g')
 	{
 	}
 
@@ -374,15 +371,15 @@ public:
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		tokens["CALLERID"] = "g";
+		tokens["CALLERID"] = ConvToStr(myumode.GetModeChar());
 	}
 
-	ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
 	{
-		if (!IS_LOCAL(user) || target_type != TYPE_USER)
+		if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER)
 			return MOD_RES_PASSTHRU;
 
-		User* dest = static_cast<User*>(voiddest);
+		User* dest = target.Get<User>();
 		if (!dest->IsModeSet(myumode) || (user == dest))
 			return MOD_RES_PASSTHRU;
 
@@ -394,12 +391,12 @@ public:
 		{
 			time_t now = ServerInstance->Time();
 			/* +g and *not* accepted */
-			user->WriteNumeric(ERR_TARGUMODEG, "%s :is in +g mode (server-side ignore).", dest->nick.c_str());
+			user->WriteNumeric(ERR_TARGUMODEG, dest->nick, "is in +g mode (server-side ignore).");
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
-				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());
+				user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them.");
+				dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+						user->nick.c_str()));
 				dat->lastnotify = now;
 			}
 			return MOD_RES_DENY;
@@ -424,7 +421,13 @@ public:
 		cmd.maxaccepts = tag->getInt("maxaccepts", 16);
 		operoverride = tag->getBool("operoverride");
 		tracknick = tag->getBool("tracknick");
-		notify_cooldown = tag->getInt("cooldown", 60);
+		notify_cooldown = tag->getDuration("cooldown", 60);
+	}
+
+	void Prioritize() CXX11_OVERRIDE
+	{
+		// Want to be after modules like silence or services_account
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
 	}
 };