Sync helpop chmodes s and p with docs

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

diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 91a1303c6c53670ff79a50a046a437ea90113769..e12101ebca68437e0d005cc1135b45a23c1851f4 100644 (file)
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -1,9 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   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) 2004 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
@@ -22,27 +28,20 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 
-class NoNicks : public SimpleChannelModeHandler
-{
- public:
-       NoNicks(Module* Creator) : SimpleChannelModeHandler(Creator, "nonick", 'N') { }
-};
-
 class ModuleNoNickChange : public Module
 {
        CheckExemption::EventProvider exemptionprov;
-       NoNicks nn;
-       bool override;
+       SimpleChannelModeHandler nn;
  public:
        ModuleNoNickChange()
                : exemptionprov(this)
-               , nn(this)
+               , nn(this, "nonick", 'N')
        {
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
+               return Version("Adds channel mode N (nonick) which prevents users from changing their nickname whilst in the channel.", VF_VENDOR);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -57,28 +56,23 @@ class ModuleNoNickChange : public Module
                        Channel* curr = (*i)->chan;
 
                        ModResult res = CheckExemption::Call(exemptionprov, user, curr, "nonick");
-
                        if (res == MOD_RES_ALLOW)
                                continue;
 
-                       if (override && user->IsOper())
+                       if (user->HasPrivPermission("channels/ignore-nonicks"))
                                continue;
 
-                       if (!curr->GetExtBanStatus(user, 'N').check(!curr->IsModeSet(nn)))
+                       bool modeset = curr->IsModeSet(nn);
+                       if (!curr->GetExtBanStatus(user, 'N').check(!modeset))
                        {
-                               user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (+N is set)",
-                                       curr->name.c_str()));
+                               user->WriteNumeric(ERR_CANTCHANGENICK, InspIRCd::Format("Can't change nickname while on %s (%s)",
+                                       curr->name.c_str(), modeset ? "+N is set" : "you're extbanned"));
                                return MOD_RES_DENY;
                        }
                }
 
                return MOD_RES_PASSTHRU;
        }
-
-       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
-       {
-               override = ServerInstance->Config->ConfValue("nonicks")->getBool("operoverride", false);
-       }
 };
 
 MODULE_INIT(ModuleNoNickChange)