Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 1c17a659862752eb70ef1f22ba542115a0b29dad..306d39c5d00a7033dd621a3d84420f82405e1d38 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -3,7 +3,7 @@
  *
  *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
  *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
- *   Copyright (C) 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2016-2019, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
@@ -104,6 +104,14 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
                user->WriteNumeric(Numerics::InvalidModeParameter(dest, this, "*", message));
 }
 
+void ModeHandler::OnParameterInvalid(User* user, Channel* targetchannel, User* targetuser, const std::string& parameter)
+{
+       if (targetchannel)
+               user->WriteNumeric(Numerics::InvalidModeParameter(targetchannel, this, "*"));
+       else
+               user->WriteNumeric(Numerics::InvalidModeParameter(targetuser, this, "*"));
+}
+
 bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*)
 {
        return (theirs < ours);
@@ -403,7 +411,10 @@ static bool IsModeParamValid(User* user, Channel* targetchannel, User* targetuse
 
        // The parameter cannot begin with a ':' character or contain a space
        if ((item.param[0] == ':') || (item.param.find(' ') != std::string::npos))
+       {
+               item.mh->OnParameterInvalid(user, targetchannel, targetuser, item.param);
                return false;
+       }
 
        return true;
 }