Fix various rline bugs, implement /stats R, and fix the issue where you get no error...

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index ae00a126acbb12be2bdd1039fc65e9489020317d..bea3b52a1db1c49571502e0a2b24ec2aebc6da95 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -34,17 +34,21 @@ class ModuleNoNotice : public Module
                nt = new NoNotice(ServerInstance);
                if (!ServerInstance->Modes->AddMode(nt))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
+       virtual void On005Numeric(std::string &output)
+       {
+               ServerInstance->AddExtBanChar('T');
+       }
 
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
-                       if (c->IsModeSet('T'))
+                       if (c->IsModeSet('T') || c->IsExtBanned(user, 'T'))
                        {
                                if (ServerInstance->ULine(user->server))
                                {
@@ -58,7 +62,7 @@ class ModuleNoNotice : public Module
                                }
                                else
                                {
-                                       user->WriteNumeric(404, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
+                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
                                        return 1;
                                }
                        }
@@ -74,7 +78,7 @@ class ModuleNoNotice : 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);
        }
 };