X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=1986ed2bbe0b90c8fc7f057c120695dd0d87547f;hb=7c340cba11b16d3c4a95c274c22f1617ac4711f2;hp=c8fecafa5f6d2cb48a81748ab6ea8a2730a15c55;hpb=e35dd5cbb8b7d0d39a83b35c5837c1f062977eea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index c8fecafa5..1986ed2bb 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -155,9 +155,9 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
+bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*)
 {
-	return (ours < theirs);
+	return (theirs < ours);
 }
 
 SimpleUserModeHandler::SimpleUserModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_USER, false)
@@ -471,7 +471,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
 	return MODEACTION_ALLOW;
 }
 
-void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode, bool merge)
 {
 	std::string target = parameters[0];
 	Channel* targetchannel = ServerInstance->FindChan(target);
@@ -562,6 +562,13 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
 			/* Make sure the user isn't trying to slip in an invalid parameter */
 			if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
 				continue;
+			if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
+			{
+				std::string ours = targetchannel->GetModeParameter(modechar);
+				if (!mh->CheckTimeStamp(parameter, ours, targetchannel))
+					/* we won the mode merge, don't apply this mode */
+					continue;
+			}
 		}
 
 		ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, servermode, SkipAccessChecks);