From 05022b58f2da1a6b0d1d7134a86fa566bada4232 Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Wed, 3 Sep 2014 15:03:38 +0200
Subject: Split out ModeParser::ModeParamsToChangeList()

---
 src/mode.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/mode.cpp')

diff --git a/src/mode.cpp b/src/mode.cpp
index ac7ee97d6..9b27a3d13 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -390,6 +390,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 
 	// Populate a temporary Modes::ChangeList with the parameters
 	Modes::ChangeList changelist;
+	ModeParamsToChangeList(user, type, parameters, changelist);
 
 	ModResult MOD_RESULT;
 	FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
@@ -413,6 +414,19 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 			return; // Entire mode change denied by a module
 	}
 
+	ProcessSingle(user, targetchannel, targetuser, changelist, flags);
+
+	if ((LastParse.empty()) && (targetchannel) && (parameters.size() == 2))
+	{
+		/* Special case for displaying the list for listmodes,
+		 * e.g. MODE #chan b, or MODE #chan +b without a parameter
+		 */
+		this->DisplayListModes(user, targetchannel, parameters[1]);
+	}
+}
+
+void ModeParser::ModeParamsToChangeList(User* user, ModeType type, const std::vector<std::string>& parameters, Modes::ChangeList& changelist)
+{
 	const std::string& mode_sequence = parameters[1];
 
 	bool adding = true;
@@ -441,16 +455,6 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User* user,
 
 		changelist.push(mh, adding, parameter);
 	}
-
-	ProcessSingle(user, targetchannel, targetuser, changelist, flags);
-
-	if ((LastParse.empty()) && (targetchannel) && (parameters.size() == 2))
-	{
-		/* Special case for displaying the list for listmodes,
-		 * e.g. MODE #chan b, or MODE #chan +b without a parameter
-		 */
-		this->DisplayListModes(user, targetchannel, mode_sequence);
-	}
 }
 
 static bool IsModeParamValid(User* user, Channel* targetchannel, User* targetuser, const Modes::Change& item)
-- 
cgit v1.3.1-10-gc9f91