Only check for a join time if a user is actually in the channel.

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

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index cb6c507f13f3030a1499c8d9f72827895662d0ee..f4c675919313fba688290ac00d8cb9eb8a98c713 100644 (file)
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -3,9 +3,9 @@
  *
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2017, 2019 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
@@ -37,15 +37,6 @@ static bool added_zline = false;
 class RLine : public XLine
 {
  public:
-
-       /** Create a R-line.
-        * @param s_time The set time
-        * @param d The duration of the xline
-        * @param src The sender of the xline
-        * @param re The reason of the xline
-        * @param regex Pattern to match with
-        * @
-        */
        RLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference<RegexFactory>& rxfactory)
                : XLine(s_time, d, src, re, "R")
                , matchtext(regexs)
@@ -56,8 +47,6 @@ class RLine : public XLine
                regex = rxfactory->Create(regexs);
        }
 
-       /** Destructor
-        */
        ~RLine()
        {
                delete regex;
@@ -252,7 +241,7 @@ class ModuleRLine : public Module, public Stats::EventListener
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for banning users through regular expression patterns", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
+               return Version("Adds the /RLINE command which allows server operators to prevent users matching a nickname!username@hostname+realname regular expression from connecting to the server.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : "");
        }
 
        ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
@@ -307,7 +296,7 @@ class ModuleRLine : public Module, public Stats::EventListener
                if (stats.GetSymbol() != 'R')
                        return MOD_RES_PASSTHRU;
 
-               ServerInstance->XLines->InvokeStats("R", 223, stats);
+               ServerInstance->XLines->InvokeStats("R", stats);
                return MOD_RES_DENY;
        }