X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=26b9d0da250bee2e185005c73b6dab0717bf5e57;hb=5544649cd2058ba6d30925e61d20ae4a0245c0fa;hp=c861b7687a97f9e810475ec367ca364b47190f9e;hpb=bfc85ec4300d32fe164794ad2247fc0c3bd6050d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index c861b7687..26b9d0da2 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -37,15 +37,18 @@ enum
 class callerid_data
 {
  public:
+ 	typedef insp::flat_set<User*> UserSet;
+	typedef std::vector<callerid_data*> CallerIdDataSet;
+
 	time_t lastnotify;
 
 	/** Users I accept messages from
 	 */
-	std::set<User*> accepting;
+	UserSet accepting;
 
 	/** Users who list me as accepted
 	 */
-	std::list<callerid_data *> wholistsme;
+	CallerIdDataSet wholistsme;
 
 	callerid_data() : lastnotify(0) { }
 
@@ -53,7 +56,7 @@ class callerid_data
 	{
 		std::ostringstream oss;
 		oss << lastnotify;
-		for (std::set<User*>::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
+		for (UserSet::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
 		{
 			User* u = *i;
 			// Encode UIDs.
@@ -66,7 +69,7 @@ class callerid_data
 struct CallerIDExtInfo : public ExtensionItem
 {
 	CallerIDExtInfo(Module* parent)
-		: ExtensionItem("callerid_data", parent)
+		: ExtensionItem("callerid_data", ExtensionItem::EXT_USER, parent)
 	{
 	}
 
@@ -126,7 +129,7 @@ struct CallerIDExtInfo : public ExtensionItem
 		callerid_data* dat = static_cast<callerid_data*>(item);
 
 		// We need to walk the list of users on our accept list, and remove ourselves from their wholistsme.
-		for (std::set<User *>::iterator it = dat->accepting.begin(); it != dat->accepting.end(); it++)
+		for (callerid_data::UserSet::iterator it = dat->accepting.begin(); it != dat->accepting.end(); ++it)
 		{
 			callerid_data *targ = this->get(*it, false);
 
@@ -136,7 +139,7 @@ struct CallerIDExtInfo : public ExtensionItem
 				continue; // shouldn't happen, but oh well.
 			}
 
-			if (!stdalgo::erase(targ->wholistsme, dat))
+			if (!stdalgo::vector::swaperase(targ->wholistsme, dat))
 				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)");
 		}
 		delete dat;
@@ -264,7 +267,7 @@ public:
 		callerid_data* dat = extInfo.get(user, false);
 		if (dat)
 		{
-			for (std::set<User*>::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i)
+			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");
@@ -317,7 +320,7 @@ public:
 			return false;
 		}
 
-		if (!stdalgo::erase(dat2->wholistsme, dat))
+		if (!stdalgo::vector::swaperase(dat2->wholistsme, dat))
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (4)");
 
 
@@ -347,7 +350,7 @@ class ModuleCallerID : public Module
 			return;
 
 		// Iterate over the list of people who accept me, and remove all entries
-		for (std::list<callerid_data *>::iterator it = userdata->wholistsme.begin(); it != userdata->wholistsme.end(); it++)
+		for (callerid_data::CallerIdDataSet::iterator it = userdata->wholistsme.begin(); it != userdata->wholistsme.end(); ++it)
 		{
 			callerid_data *dat = *(it);
 
@@ -423,6 +426,12 @@ public:
 		tracknick = tag->getBool("tracknick");
 		notify_cooldown = tag->getInt("cooldown", 60);
 	}
+
+	void Prioritize() CXX11_OVERRIDE
+	{
+		// Want to be after modules like silence or services_account
+		ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST);
+	}
 };
 
 MODULE_INIT(ModuleCallerID)