ISupportManager: Tidy-up, expand comments

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

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 33a7fb18a9304873e1ec140474d7dbbf45923dde..e4dbb1d434502a6785065aeccde4164556e3efad 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -23,20 +23,15 @@
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
-
 class ModuleRestrictMsg : public Module
 {
-
  public:
-
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               ServerInstance->Modules->Attach(I_OnUserPreMessage, this);
        }
 
-
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE
        {
                if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
@@ -46,7 +41,7 @@ class ModuleRestrictMsg : public Module
                        // (1) the sender is opered
                        // (2) the recipient is opered
                        // anything else, blocked.
-                       if (IS_OPER(u) || IS_OPER(user))
+                       if (u->IsOper() || user->IsOper())
                        {
                                return MOD_RES_PASSTHRU;
                        }
@@ -58,12 +53,7 @@ class ModuleRestrictMsg : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
-       {
-               return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);
        }