Moved the core pseudo clients out into their own modules

1 files changed, 14 insertions, 2 deletions

diff --git a/src/regchannel.cpp b/src/regchannel.cpp
index 9d0a95059..8bc369511 100644
--- a/src/regchannel.cpp
+++ b/src/regchannel.cpp
@@ -11,6 +11,8 @@
 
 #include "services.h"
 #include "modules.h"
+#include "chanserv.h"
+#include "nickserv.h"
 
 ChanAccess::ChanAccess(const Anope::string &umask)
 {
@@ -164,6 +166,16 @@ ChannelInfo::~ChannelInfo()
 		--this->founder->channelcount;
 }
 
+/** Find which bot should send mode/topic/etc changes for this channel
+ * @return The bot
+ */
+BotInfo *ChannelInfo::WhoSends()
+{
+	if (!this || !this->bi || !this->c || !this->botflags.HasFlag(BS_SYMBIOSIS) || !this->c->FindUser(this->bi))
+		return chanserv ? chanserv->Bot() : (nickserv ? nickserv->Bot() : NULL);
+	return this->bi;
+}
+
 /** Add an entry to the channel access list
  *
  * @param mask The mask of the access entry
@@ -553,7 +565,7 @@ void ChannelInfo::LoadMLock()
 		else
 		{
 			if (!this->bi)
-				whosends(this)->Assign(NULL, this);
+				this->WhoSends()->Assign(NULL, this);
 			if (this->c->FindUser(this->bi) == NULL)
 				this->bi->Join(this->c);
 
@@ -860,7 +872,7 @@ void ChannelInfo::RestoreTopic()
 
 	if ((this->HasFlag(CI_KEEPTOPIC) || this->HasFlag(CI_TOPICLOCK)) && this->last_topic != this->c->topic)
 	{
-		this->c->ChangeTopic(!this->last_topic_setter.empty() ? this->last_topic_setter : whosends(this)->nick, this->last_topic, this->last_topic_time ? this->last_topic_time : Anope::CurTime);
+		this->c->ChangeTopic(!this->last_topic_setter.empty() ? this->last_topic_setter : this->WhoSends()->nick, this->last_topic, this->last_topic_time ? this->last_topic_time : Anope::CurTime);
 	}
 }