Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / modules / m_redirect.cpp

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index b14de9ff91eeecda7d8eda473c4a858f2354db7f..0c52e01ce2f0e9ee352a6ac3ef3c7f88dc72b60c 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -1,12 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2012 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2017, 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014 Shawn Smith <ShawnSmith0828@gmail.com>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -30,15 +34,18 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
 {
  public:
        Redirect(Module* Creator)
-               : ParamMode<Redirect, LocalStringExt>(Creator, "redirect", 'L') { }
+               : ParamMode<Redirect, LocalStringExt>(Creator, "redirect", 'L')
+       {
+               syntax = "<target>";
+       }
 
-       ModeAction OnSet(User* source, Channel* channel, std::string& parameter)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
                if (IS_LOCAL(source))
                {
                        if (!ServerInstance->IsChannel(parameter))
                        {
-                               source->WriteNumeric(ERR_NOSUCHCHANNEL, parameter, "Invalid channel name");
+                               source->WriteNumeric(Numerics::NoSuchChannel(parameter));
                                return MODEACTION_DENY;
                        }
                }
@@ -72,46 +79,27 @@ class Redirect : public ParamMode<Redirect, LocalStringExt>
        }
 };
 
-/** Handles usermode +L to stop forced redirection and print an error.
-*/
-class AntiRedirect : public SimpleUserModeHandler
-{
-       public:
-               AntiRedirect(Module* Creator) : SimpleUserModeHandler(Creator, "antiredirect", 'L')
-               {
-                       if (!ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect"))
-                               DisableAutoRegister();
-               }
-};
-
 class ModuleRedirect : public Module
 {
        Redirect re;
-       AntiRedirect re_u;
+       SimpleUserModeHandler antiredirectmode;
        ChanModeReference limitmode;
-       bool UseUsermode;
 
  public:
        ModuleRedirect()
                : re(this)
-               , re_u(this)
+               , antiredirectmode(this, "antiredirect", 'L')
                , limitmode(this, "limit")
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               /* Setting this here so it isn't changable by rehasing the config later. */
-               UseUsermode = ServerInstance->Config->ConfValue("redirect")->getBool("antiredirect");
-       }
-
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                if (chan)
                {
                        if (chan->IsModeSet(re) && chan->IsModeSet(limitmode))
                        {
-                               if (chan->GetUserCounter() >= ConvToInt(chan->GetModeParameter(limitmode)))
+                               if (chan->GetUserCounter() >= ConvToNum<size_t>(chan->GetModeParameter(limitmode)))
                                {
                                        const std::string& channel = *re.ext.get(chan);
 
@@ -122,16 +110,15 @@ class ModuleRedirect : public Module
                                                user->WriteNumeric(470, cname, '*', "You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.");
                                                return MOD_RES_DENY;
                                        }
-                                       /* We check the bool value here to make sure we have it enabled, if we don't then
-                                               usermode +L might be assigned to something else. */
-                                       if (UseUsermode && user->IsModeSet(re_u))
+
+                                       if (user->IsModeSet(antiredirectmode))
                                        {
                                                user->WriteNumeric(470, cname, channel, "Force redirection stopped.");
                                                return MOD_RES_DENY;
                                        }
                                        else
                                        {
-                                               user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirect channel.");
+                                               user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirected channel.");
                                                Channel::JoinUser(user, channel);
                                                return MOD_RES_DENY;
                                        }
@@ -143,7 +130,7 @@ class ModuleRedirect : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR);
+               return Version("Allows users to be redirected to another channel when the user limit is reached.", VF_VENDOR);
        }
 };