chanfix updates

Author: siniStar7

modules/third/ChanFix/chanfix.cpp

@@ -39,6 +39,36 @@ class CommandChanFix final
 	}
 };
 
+class CommandCSChanFix final
+	: public Command
+{
+	ChanFixCore& cf;
+
+public:
+	CommandCSChanFix(Module* creator, ChanFixCore& core)
+		: Command(creator, "chanserv/chanfix", 1, 1)
+		, cf(core)
+	{
+		this->SetDesc("Request ChanFix for an unregistered channel.");
+		this->SetSyntax("<#channel>");
+		this->AllowUnregistered(true);
+	}
+
+	void Execute(CommandSource& source, const std::vector<Anope::string>& params) override
+	{
+		cf.RequestFixFromChanServ(source, params[0]);
+	}
+
+	bool OnHelp(CommandSource& source, const Anope::string&) override
+	{
+		source.Reply(" ");
+		source.Reply("Requests a fix for an unregistered channel.");
+		source.Reply("You must be opped in the channel or have chanfix/admin.");
+		source.Reply("Example: CHANFIX #channel");
+		return true;
+	}
+};
+
 class CommandChanFixScores final
 	: public Command
 {
@@ -236,6 +266,7 @@ class ChanFix final
 	ChanFixCore core;
 
 	CommandChanFix cmd_chanfix;
+	CommandCSChanFix cmd_cs_chanfix;
 	CommandChanFixScores cmd_scores;
 	CommandChanFixInfo cmd_info;
 	CommandChanFixList cmd_list;
@@ -269,6 +300,7 @@ class ChanFix final
 		: Module(modname, creator, VENDOR)
 		, core(this)
 		, cmd_chanfix(this, core)
+		, cmd_cs_chanfix(this, core)
 		, cmd_scores(this, core)
 		, cmd_info(this, core)
 		, cmd_list(this, core)

modules/third/ChanFix/chanfix.h

@@ -61,6 +61,7 @@ class ChanFixCore final
 	bool IsAuspex(CommandSource& source) const;
 
 	bool RequestFix(CommandSource& source, const Anope::string& chname);
+	bool RequestFixFromChanServ(CommandSource& source, const Anope::string& chname);
 	bool SetMark(CommandSource& source, const Anope::string& chname, bool on, const Anope::string& reason);
 	bool SetNoFix(CommandSource& source, const Anope::string& chname, bool on, const Anope::string& reason);
 

modules/third/ChanFix/chanfix_core.cpp

@@ -756,6 +756,64 @@ bool ChanFixCore::RequestFix(CommandSource& source, const Anope::string& chname)
 	return true;
 }
 
+bool ChanFixCore::RequestFixFromChanServ(CommandSource& source, const Anope::string& chname)
+{
+	if (!IsValidChannelName(chname))
+	{
+		source.Reply("Invalid channel name.");
+		return false;
+	}
+
+	Channel* c = Channel::Find(chname);
+	if (!c)
+	{
+		source.Reply("Channel %s does not exist.", chname.c_str());
+		return false;
+	}
+
+	if (this->IsRegistered(c))
+	{
+		source.Reply("%s is registered; ChanFix will not touch it.", chname.c_str());
+		return false;
+	}
+
+	if (!this->IsAdmin(source))
+	{
+		User* u = source.GetUser();
+		if (!u)
+		{
+			source.Reply(ACCESS_DENIED);
+			return false;
+		}
+
+		ChanUserContainer* cuc = c->FindUser(u);
+		if (!cuc || !cuc->status.HasMode(this->op_status_char))
+		{
+			source.Reply(ACCESS_DENIED);
+			return false;
+		}
+	}
+
+	CFChannelRecord& rec = this->GetOrCreateRecord(c);
+	if (rec.nofix)
+	{
+		source.Reply("%s has NOFIX enabled.", chname.c_str());
+		return false;
+	}
+
+	const unsigned int highscore = this->GetHighScore(rec);
+	if (highscore < this->min_fix_score)
+	{
+		source.Reply("Scores for %s are too low (< %u) for a fix.", chname.c_str(), this->min_fix_score);
+		return false;
+	}
+
+	rec.fix_requested = true;
+	rec.fix_started = 0;
+	source.Reply("Fix request acknowledged for %s.", chname.c_str());
+	return true;
+}
+
 bool ChanFixCore::SetMark(CommandSource& source, const Anope::string& chname, bool on, const Anope::string& reason)
 {
 	if (!this->IsAuspex(source))