X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ircv3.cpp;h=5cb2ab6b131bc6f3f51e6ccb02a8311406848f58;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=f46ae97b4de39a516692fc0490d92a5fc92106f7;hpb=1031f333332cf1b09db4fd632f141143ee637c34;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index f46ae97b4..5cb2ab6b1 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -33,7 +33,7 @@ class ModuleIRCv3 : public Module
 
 	void WriteNeighboursWithExt(User* user, const std::string& line, const LocalIntExt& ext)
 	{
-		UserChanList chans(user->chans);
+		IncludeChanList chans(user->chans.begin(), user->chans.end());
 
 		std::map<User*, bool> exceptions;
 		FOREACH_MOD(OnBuildNeighborList, (user, chans, exceptions));
@@ -48,9 +48,9 @@ class ModuleIRCv3 : public Module
 
 		// Now consider sending it to all other users who has at least a common channel with the user
 		std::set<User*> already_sent;
-		for (UCListIter i = chans.begin(); i != chans.end(); ++i)
+		for (IncludeChanList::const_iterator i = chans.begin(); i != chans.end(); ++i)
 		{
-			const UserMembList* userlist = (*i)->GetUsers();
+			const UserMembList* userlist = (*i)->chan->GetUsers();
 			for (UserMembList::const_iterator m = userlist->begin(); m != userlist->end(); ++m)
 			{
 				/*
@@ -76,12 +76,7 @@ class ModuleIRCv3 : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		OnRehash(NULL);
-	}
-
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* conf = ServerInstance->Config->ConfValue("ircv3");
 		accountnotify = conf->getBool("accountnotify", true);