OnRehash changes: split to multiple hooks to clarify use and prevent explosion of...

[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 f08a32d1c8dd007d002b1e6c234cebb3ad0a6927..c72d26fe5500392f6cfbae26163e7ef7e7fc573b 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
 
@@ -25,13 +22,13 @@ class User_d : public ModeHandler
  public:
        User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
                        if (!dest->IsModeSet('d'))
                        {
-                               dest->WriteServ("NOTICE %s :*** 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 %s -d.", dest->nick, dest->nick);
+                               dest->WriteServ("NOTICE %s :*** 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 %s -d.", dest->nick.c_str(), dest->nick.c_str());
                                dest->SetMode('d',true);
                                return MODEACTION_ALLOW;
                        }
@@ -60,16 +57,16 @@ class ModuleDeaf : public Module
                : Module(Me)
        {
                m1 = new User_d(ServerInstance);
-               if (!ServerInstance->AddMode(m1))
+               if (!ServerInstance->Modes->AddMode(m1))
                        throw ModuleException("Could not add new modes!");
 
-               OnRehash(NULL, "");
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList };
                ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
 
-       virtual void OnRehash(User* user, const std::string&)
+       virtual void OnRehash(User* user)
        {
                ConfigReader* conf = new ConfigReader(ServerInstance);
                deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
@@ -109,7 +106,7 @@ class ModuleDeaf : public Module
 
        virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
        {
-               CUList *ulist;
+               CUList *ulist = chan->GetUsers();
                bool is_a_uline;
                bool is_bypasschar, is_bypasschar_avail;
                bool is_bypasschar_uline, is_bypasschar_uline_avail;
@@ -118,13 +115,13 @@ class ModuleDeaf : public Module
                if (!deaf_bypasschars.empty())
                {
                        is_bypasschar_avail = 1;
-                       if (deaf_bypasschars.find(text[0], 0) != string::npos)
+                       if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
                                is_bypasschar = 1;
                }
                if (!deaf_bypasschars_uline.empty())
                {
                        is_bypasschar_uline_avail = 1;
-                       if (deaf_bypasschars_uline.find(text[0], 0) != string::npos)
+                       if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
                                is_bypasschar_uline = 1;
                }
 
@@ -135,22 +132,6 @@ class ModuleDeaf : public Module
                if (!is_bypasschar_uline_avail && is_bypasschar)
                        return;
 
-               switch (status)
-               {
-                       case '@':
-                               ulist = chan->GetOppedUsers();
-                               break;
-                       case '%':
-                               ulist = chan->GetHalfoppedUsers();
-                               break;
-                       case '+':
-                               ulist = chan->GetVoicedUsers();
-                               break;
-                       default:
-                               ulist = chan->GetUsers();
-                               break;
-               }
-
                for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                {
                        /* not +d ? */
@@ -168,6 +149,9 @@ class ModuleDeaf : public Module
                        if (is_bypasschar && !is_a_uline)
                                continue; /* deliver message */
 
+                       if (status && !strchr(chan->GetAllPrefixChars(i->first), status))
+                               continue;
+
                        /* don't deliver message! */
                        exempt_list[i->first] = i->first->nick;
                }
@@ -181,7 +165,7 @@ class ModuleDeaf : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
 };