Merge pull request #1054 from SaberUK/master+fix-linking-modules

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

diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 17e2e86054db6561c21c9a816efbdfc6ac13f92d..431b7b9688da80547a9c43d32d0faeaf47692593 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -20,71 +20,39 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding channels with user mode +I */
-
 /** Handles user mode +I
  */
-class HideChans : public ModeHandler
+class HideChans : public SimpleUserModeHandler
 {
  public:
-       HideChans(Module* Creator) : ModeHandler(Creator, "hidechans", 'I', PARAM_NONE, MODETYPE_USER) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('I'))
-                       {
-                               dest->SetMode('I',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('I'))
-                       {
-                               dest->SetMode('I',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       HideChans(Module* Creator) : SimpleUserModeHandler(Creator, "hidechans", 'I') { }
 };
 
-class ModuleHideChans : public Module
+class ModuleHideChans : public Module, public Whois::LineEventListener
 {
        bool AffectsOpers;
        HideChans hm;
  public:
-       ModuleHideChans() : hm(this)
+       ModuleHideChans()
+               : Whois::LineEventListener(this)
+               , hm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&hm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
-               OnRehash(NULL);
        }
 
-       virtual ~ModuleHideChans()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
        }
 
-       virtual void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               ConfigReader conf;
-               AffectsOpers = conf.ReadFlag("hidechans", "affectsopers", 0);
+               AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
        }
 
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(Whois::Context& whois, unsigned int& numeric, std::string& text) CXX11_OVERRIDE
        {
                /* always show to self */
-               if (user == dest)
+               if (whois.IsSelfWhois())
                        return MOD_RES_PASSTHRU;
 
                /* don't touch anything except 319 */
@@ -92,7 +60,7 @@ class ModuleHideChans : public Module
                        return MOD_RES_PASSTHRU;
 
                /* don't touch if -I */
-               if (!dest->IsModeSet('I'))
+               if (!whois.GetTarget()->IsModeSet(hm))
                        return MOD_RES_PASSTHRU;
 
                /* if it affects opers, we don't care if they are opered */
@@ -100,7 +68,7 @@ class ModuleHideChans : public Module
                        return MOD_RES_DENY;
 
                /* doesn't affect opers, sender is opered */
-               if (user->HasPrivPermission("users/auspex"))
+               if (whois.GetSource()->HasPrivPermission("users/auspex"))
                        return MOD_RES_PASSTHRU;
 
                /* user must be opered, boned. */
@@ -108,5 +76,4 @@ class ModuleHideChans : public Module
        }
 };
 
-
 MODULE_INIT(ModuleHideChans)