Fix warning, thanks peavums

[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 6431462f306c2c5ce5ab4dfaab9bc39f54e39504..32cfac50a54ce6172de23a1b0adc14a48de1f009 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -31,7 +31,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 +109,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 +135,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 +152,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 +168,7 @@ class ModuleDeaf : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
 };