Fix potential for duplicate SID if the SID is auto generated.

[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 67c2b72105f4e864e32daa5add856bfe07bdc6a2..c7d40115a6bc5769fcc96ed3e0f2217b269d347e 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -2,23 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
@@ -36,6 +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->SetMode('d',true);
                                return MODEACTION_ALLOW;
                        }
@@ -57,15 +50,16 @@ class ModuleDeaf : public Module
        User_d* m1;
  public:
        ModuleDeaf(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                m1 = new User_d(ServerInstance);
-               ServerInstance->AddMode(m1, 'd');
+               if (!ServerInstance->AddMode(m1, 'd'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnBuildExemptList] = 1;
        }
 
        virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -78,40 +72,46 @@ class ModuleDeaf : public Module
                return PreText(user, dest, target_type, text, status, exempt_list);
        }
 
+       virtual void OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list)
+       {
+               CUList *ulist;
+               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++)
+               {
+                       if (IS_LOCAL(i->first))
+                       {
+                               if (i->first->IsModeSet('d'))
+                               {
+                                       exempt_list[i->first] = i->first->nick;
+                               }
+                       }
+               }
+       }
+
        virtual int PreText(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* chan = (chanrec*)dest;
+
                        if (chan)
                        {
-                               CUList *ulist;
-                               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++)
-                               {
-                                       if ((IS_LOCAL(i->second)) && (user != i->second))
-                                       {
-                                               if (i->second->IsModeSet('d'))
-                                               {
-                                                       exempt_list[i->second] = i->second;
-                                               }
-                                       }
-                               }
+                               this->OnBuildExemptList(MSG_PRIVMSG, chan, user, status, exempt_list);
                        }
                }
                return 0;
@@ -130,28 +130,4 @@ class ModuleDeaf : public Module
 
 };
 
-
-class ModuleDeafFactory : public ModuleFactory
-{
- public:
-       ModuleDeafFactory()
-       {
-       }
-       
-       ~ModuleDeafFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDeaf(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDeafFactory;
-}
-
+MODULE_INIT(ModuleDeaf)