Weed out a few leftover server instances from before modules had ServerInstance....

[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 78708a5e83e7b5e3344c2678c8568284202f8e34..a291189fa537ff844b7c92da4f08c7e9bc590e49 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-2008 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) */
 
@@ -31,7 +28,7 @@ class User_d : public ModeHandler
                {
                        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;
                        }
@@ -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;
@@ -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);
        }
 
 };