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 bfc0c519a91531d0adac4d5471011d7aad740092..431b7b9688da80547a9c43d32d0faeaf47692593 100644 (file)
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -28,37 +28,31 @@ class HideChans : public SimpleUserModeHandler
        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)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(hm);
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-               OnRehash(NULL);
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
        }
 
-       void OnRehash(User* user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                AffectsOpers = ServerInstance->Config->ConfValue("hidechans")->getBool("affectsopers");
        }
 
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
+       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 */
@@ -66,7 +60,7 @@ class ModuleHideChans : public Module
                        return MOD_RES_PASSTHRU;
 
                /* don't touch if -I */
-               if (!dest->IsModeSet(hm))
+               if (!whois.GetTarget()->IsModeSet(hm))
                        return MOD_RES_PASSTHRU;
 
                /* if it affects opers, we don't care if they are opered */
@@ -74,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. */