m_spanningtree Move all server-to-server command handlers into handler classes

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 65591f07081309938890a594381ae41d005fa567..2e07aea4140cbc3fbdb9fdfca883702b24eec833 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides usermode +d to block channel messages and channel notices */
-
 /** User mode +d - filter out channel messages and channel notices
  */
 class User_d : public ModeHandler
@@ -32,24 +30,14 @@ class User_d : public ModeHandler
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
+               if (adding == dest->IsModeSet(this))
+                       return MODEACTION_DENY;
+
                if (adding)
-               {
-                       if (!dest->IsModeSet('d'))
-                       {
-                               dest->WriteNotice("*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d.");
-                               dest->SetMode('d',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('d'))
-                       {
-                               dest->SetMode('d',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               return MODEACTION_DENY;
+                       dest->WriteNotice("*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d.");
+
+               dest->SetMode(this, adding);
+               return MODEACTION_ALLOW;
        }
 };
 
@@ -70,8 +58,6 @@ class ModuleDeaf : public Module
                ServerInstance->Modules->AddService(m1);
 
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user) CXX11_OVERRIDE
@@ -124,7 +110,7 @@ class ModuleDeaf : public Module
                for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                {
                        /* not +d ? */
-                       if (!i->first->IsModeSet('d'))
+                       if (!i->first->IsModeSet(m1))
                                continue; /* deliver message */
                        /* matched both U-line only and regular bypasses */
                        if (is_bypasschar && is_bypasschar_uline)