Replace hardcoded mode letters, part 3

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

diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index e22eff10648dcb5748ef6b26f2a2ac761a54e00e..3ea653a75d1c145bad28533d0b9afc4510bdc0b8 100644 (file)
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -21,39 +21,15 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for hiding oper status with user mode +H */
-
 /** Handles user mode +H
  */
-class HideOper : public ModeHandler
+class HideOper : public SimpleUserModeHandler
 {
  public:
-       HideOper(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+       HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
        {
                oper = true;
        }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('H'))
-                       {
-                               dest->SetMode('H',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('H'))
-                       {
-                               dest->SetMode('H',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
 };
 
 class ModuleHideOper : public Module
@@ -63,23 +39,21 @@ class ModuleHideOper : public Module
        ModuleHideOper()
                : hm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&hm))
-                       throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-
-       virtual ~ModuleHideOper()
+       void init() CXX11_OVERRIDE
        {
+               ServerInstance->Modules->AddService(hm);
+               Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
        }
 
-       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
+       ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) CXX11_OVERRIDE
        {
                /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the
                 * person doing the WHOIS is not an oper
@@ -87,7 +61,7 @@ class ModuleHideOper : public Module
                if (numeric != 313)
                        return MOD_RES_PASSTHRU;
 
-               if (!dest->IsModeSet('H'))
+               if (!dest->IsModeSet(hm))
                        return MOD_RES_PASSTHRU;
 
                if (!user->HasPrivPermission("users/auspex"))
@@ -96,14 +70,14 @@ class ModuleHideOper : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line) CXX11_OVERRIDE
        {
-               if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+               if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex"))
                {
                        // hide the "*" that marks the user as an oper from the /WHO line
-                       std::string::size_type pos = line.find("* ");
+                       std::string::size_type pos = line.find("*");
                        if (pos != std::string::npos)
-                               line.erase(pos);
+                               line.erase(pos, 1);
                        // hide the line completely if doing a "/who * o" query
                        if (params.size() > 1 && params[1].find('o') != std::string::npos)
                                line.clear();
@@ -111,5 +85,4 @@ class ModuleHideOper : public Module
        }
 };
 
-
 MODULE_INIT(ModuleHideOper)