Store what channels have references to accounts in NickCore to prevent having to iterate over all channels and then all access entries when nicks expire or from nickserv/alist

9 files changed, 61 insertions, 33 deletions

diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index c37a74dd5..9485e81fd 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -59,8 +59,8 @@ class CommandCSInfo : public Command
 		if (ci->GetFounder())
 			info["Founder"] = ci->GetFounder()->display;
 
-		if (show_all && ci->successor)
-			info["Successor"] = ci->successor->display;
+		if (show_all && ci->GetSuccessor())
+			info["Successor"] = ci->GetSuccessor()->display;
 
 		if (!ci->desc.empty())
 			info["Description"] = ci->desc;
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index 8c6aa48c1..730f31deb 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -1057,9 +1057,9 @@ class CommandCSSetSuccessor : public Command
 		else
 			nc = NULL;
 
-		Log(!source.permission.empty() ? LOG_ADMIN : LOG_COMMAND, source, this, ci) << "to change the successor from " << (ci->successor ? ci->successor->display : "(none)") << " to " << (nc ? nc->display : "(none)");
+		Log(!source.permission.empty() ? LOG_ADMIN : LOG_COMMAND, source, this, ci) << "to change the successor from " << (ci->GetSuccessor() ? ci->GetSuccessor()->display : "(none)") << " to " << (nc ? nc->display : "(none)");
 
-		ci->successor = nc;
+		ci->SetSuccessor(nc);
 
 		if (nc)
 			source.Reply(_("Successor for \002%s\002 changed to \002%s\002."), ci->name.c_str(), nc->display.c_str());
diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp
index bd3a22281..c8d7eef0f 100644
--- a/modules/commands/ns_alist.cpp
+++ b/modules/commands/ns_alist.cpp
@@ -46,12 +46,21 @@ class CommandNSAList : public Command
 
 		source.Reply(_("Channels that \002%s\002 has access on:"), nc->display.c_str());
 
-		for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
+		std::deque<ChannelInfo *> queue;
+		nc->GetChannelReferences(queue);
+
+		if (queue.empty())
+		{
+			source.Reply(_("\2%s\2 has no access in any channels."), nc->display.c_str());
+			return;
+		}
+
+		for (unsigned i = 0; i < queue.size(); ++i)
 		{
-			ChannelInfo *ci = it->second;
+			ChannelInfo *ci = queue[i];
 			ListFormatter::ListEntry entry;
 
-			if (ci->GetFounder() && ci->GetFounder() == nc)
+			if (ci->GetFounder() == nc)
 			{
 				++chan_count;
 				entry["Number"] = stringify(chan_count);
@@ -61,6 +70,16 @@ class CommandNSAList : public Command
 				continue;
 			}
 
+			if (ci->GetSuccessor() == nc)
+			{
+				++chan_count;
+				entry["Number"] = stringify(chan_count);
+				entry["Channel"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name;
+				entry["Access"] = "Successor";
+				list.AddEntry(entry);
+				continue;
+			}
+
 			AccessGroup access = ci->AccessFor(nc);
 			if (access.empty())
 				continue;
@@ -69,8 +88,8 @@ class CommandNSAList : public Command
 
 			entry["Number"] = stringify(chan_count);
 			entry["Channel"] = (ci->HasExt("NO_EXPIRE") ? "!" : "") + ci->name;
-			for (unsigned i = 0; i < access.size(); ++i)
-				entry["Access"] = entry["Access"] + ", " + access[i]->AccessSerialize();
+			for (unsigned j = 0; j < access.size(); ++j)
+				entry["Access"] = entry["Access"] + ", " + access[j]->AccessSerialize();
 			entry["Access"] = entry["Access"].substr(2);
 			list.AddEntry(entry);
 		}
@@ -79,6 +98,8 @@ class CommandNSAList : public Command
 		list.Process(replies);
 		for (unsigned i = 0; i < replies.size(); ++i)
 			source.Reply(replies[i]);
+
+		source.Reply(_("End of list - %d channels shown."), chan_count);
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index ac453fdbe..e1fe8f69d 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -701,7 +701,7 @@ static void LoadChannels()
 			ci->SetFounder(NickCore::Find(buffer));
 
 			READ(read_string(buffer, f));
-			ci->successor = NickCore::Find(buffer);
+			ci->SetSuccessor(NickCore::Find(buffer));
 
 			char pwbuf[32];
 			READ(read_buffer(pwbuf, f));
diff --git a/modules/database/db_plain.cpp b/modules/database/db_plain.cpp
index 1256a2012..99bdf947a 100644
--- a/modules/database/db_plain.cpp
+++ b/modules/database/db_plain.cpp
@@ -142,7 +142,7 @@ EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, co
 		else if (key.equals_ci("FOUNDER"))
 			ci->SetFounder(NickCore::Find(params[0]));
 		else if (key.equals_ci("SUCCESSOR"))
-			ci->successor = NickCore::Find(params[0]);
+			ci->SetSuccessor(NickCore::Find(params[0]));
 		else if (key.equals_ci("LEVELS"))
 		{
 			for (unsigned j = 0, end = params.size(); j < end; j += 2)
@@ -764,8 +764,8 @@ class DBPlain : public Module
 			db_buffer << "MD MEMOMAX " << ci->memos.memomax << endl;
 			if (ci->GetFounder())
 				db_buffer << "MD FOUNDER " << ci->GetFounder()->display << endl;
-			if (ci->successor)
-				db_buffer << "MD SUCCESSOR " << ci->successor->display << endl;
+			if (ci->GetSuccessor())
+				db_buffer << "MD SUCCESSOR " << ci->GetSuccessor()->display << endl;
 			if (!ci->desc.empty())
 				db_buffer << "MD DESC :" << ci->desc << endl;
 			if (!ci->last_topic.empty())
diff --git a/modules/extra/webcpanel/pages/chanserv/drop.cpp b/modules/extra/webcpanel/pages/chanserv/drop.cpp
index 0ebb8e7a1..5462aa131 100644
--- a/modules/extra/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/drop.cpp
@@ -25,10 +25,12 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 		}
 		else replacements["MESSAGES"] = "Invalid Confirmation";
 	}
-	// XXX this is slightly inefficient
-	for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
+
+	std::deque<ChannelInfo *> queue;
+	na->nc->GetChannelReferences(queue);
+	for (unsigned i = 0; i < queue.size(); ++i)
 	{
-		ChannelInfo *ci = it->second;
+		ChannelInfo *ci = queue[i];
 		if ((ci->HasExt("SECUREFOUNDER") ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop")))
 		{
 			replacements["CHANNEL_NAMES"] = ci->name;
diff --git a/modules/extra/webcpanel/pages/chanserv/info.cpp b/modules/extra/webcpanel/pages/chanserv/info.cpp
index 18f6b8f7a..95592706d 100644
--- a/modules/extra/webcpanel/pages/chanserv/info.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/info.cpp
@@ -13,10 +13,11 @@ WebCPanel::ChanServ::Info::Info(const Anope::string &cat, const Anope::string &u
 
 bool WebCPanel::ChanServ::Info::OnRequest(HTTPProvider *server, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply, NickAlias *na, TemplateFileServer::Replacements &replacements)
 {
-	// XXX this is slightly inefficient
-	for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
+	std::deque<ChannelInfo *> queue;
+	na->nc->GetChannelReferences(queue);
+	for (unsigned i = 0; i < queue.size(); ++i)
 	{
-		ChannelInfo *ci = it->second;
+		ChannelInfo *ci = queue[i];
 
 		if (ci->AccessFor(na->nc).HasPriv("SET") || ci->AccessFor(na->nc).HasPriv("ACCESS_LIST"))
 		{
diff --git a/modules/extra/webcpanel/pages/chanserv/set.cpp b/modules/extra/webcpanel/pages/chanserv/set.cpp
index af3640e33..20026a08a 100644
--- a/modules/extra/webcpanel/pages/chanserv/set.cpp
+++ b/modules/extra/webcpanel/pages/chanserv/set.cpp
@@ -91,8 +91,8 @@ bool WebCPanel::ChanServ::Set::OnRequest(HTTPProvider *server, const Anope::stri
 	replacements["CHANNEL_ESCAPED"] = HTTPUtils::URLEncode(ci->name);
 	if (ci->GetFounder())
 		replacements["FOUNDER"] = ci->GetFounder()->display;
-	if (ci->successor)
-		replacements["SUCCESSOR"] = ci->successor->display;
+	if (ci->GetSuccessor())
+		replacements["SUCCESSOR"] = ci->GetSuccessor()->display;
 	replacements["TIME_REGISTERED"] = Anope::strftime(ci->time_registered, na->nc);
 	replacements["LAST_USED"] = Anope::strftime(ci->last_used, na->nc);
 
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index ee8c08ed6..579c0b391 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -103,17 +103,18 @@ class ChanServCore : public Module
 
 	void OnDelCore(NickCore *nc) anope_override
 	{
-		// XXX this is slightly inefficient
-		for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end;)
+		std::deque<ChannelInfo *> chans;
+		nc->GetChannelReferences(chans);
+
+		for (unsigned i = 0; i < chans.size(); ++i)
 		{
-			ChannelInfo *ci = it->second;
-			++it;
+			ChannelInfo *ci = chans[i];
 
 			if (ci->GetFounder() == nc)
 			{
 				NickCore *newowner = NULL;
-				if (ci->successor && (ci->successor->IsServicesOper() || !Config->CSMaxReg || ci->successor->channelcount < Config->CSMaxReg))
-					newowner = ci->successor;
+				if (ci->GetSuccessor() && ci->GetSuccessor() != nc && (ci->GetSuccessor()->IsServicesOper() || !Config->CSMaxReg || ci->GetSuccessor()->channelcount < Config->CSMaxReg))
+					newowner = ci->GetSuccessor();
 				else
 				{
 					const ChanAccess *highest = NULL;
@@ -135,7 +136,7 @@ class ChanServCore : public Module
 				{
 					Log(LOG_NORMAL, "chanserv/expire") << "Transferring foundership of " << ci->name << " from deleted nick " << nc->display << " to " << newowner->display;
 					ci->SetFounder(newowner);
-					ci->successor = NULL;
+					ci->SetSuccessor(NULL);
 				}
 				else
 				{
@@ -146,8 +147,8 @@ class ChanServCore : public Module
 				}
 			}
 
-			if (ci->successor == nc)
-				ci->successor = NULL;
+			if (ci->GetSuccessor() == nc)
+				ci->SetSuccessor(NULL);
 
 			for (unsigned j = 0; j < ci->GetAccessCount(); ++j)
 			{
@@ -161,11 +162,14 @@ class ChanServCore : public Module
 				}
 			}
 
-			for (unsigned j = ci->GetAkickCount(); j > 0; --j)
+			for (unsigned j = 0; j < ci->GetAkickCount(); ++j)
 			{
-				const AutoKick *akick = ci->GetAkick(j - 1);
+				const AutoKick *akick = ci->GetAkick(j);
 				if (akick->nc == nc)
-					ci->EraseAkick(j - 1);
+				{
+					ci->EraseAkick(j);
+					break;
+				}
 			}
 		}
 	}