Probably wont compile yet - purge_empty_channels refactor

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

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 2a9c47dd55ef2dc7f1ed12a5487796dc4f9b7cef..3253d34dd2defa605b81a44a750e809bedbfe20e 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -46,28 +46,24 @@ class ModuleServices : public Module
                kludgeme = false;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "rRM";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
-        }
+       virtual void On005Numeric(std::string &output)
+       {
+               InsertMode(output, "rRM", 4);
+       }
+
+       /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
+       virtual void OnWhois(userrec* source, userrec* dest)
+       {
+               if (strchr(dest->modes, 'r'))
+               {
+                       /* user is registered */
+                       WriteServ(source->fd, "307 %s %s :is a registered nick", source->nick, dest->nick);
+               }
+       }
 
        void Implements(char* List)
        {
-               List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+               List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
        }
 
        virtual void OnUserPostNick(userrec* user, std::string oldnick)
@@ -132,7 +128,7 @@ class ModuleServices : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -167,39 +163,9 @@ class ModuleServices : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* c = (chanrec*)dest;
-                       if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r')))
-                       {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
-                               {
-                                       // user is ulined, can speak regardless
-                                       return 0;
-                               }
-                               // user noticing a +M channel and is not registered
-                               Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need a registered nickname to speak on this channel");
-                               return 1;
-                       }
-               }
-               if (target_type == TYPE_USER)
-               {
-                       userrec* u = (userrec*)dest;
-                       if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r')))
-                       {
-                               if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
-                               {
-                                       // user is ulined, can speak regardless
-                                       return 0;
-                               }
-                               // user noticing a +R user and is not registered
-                               Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need a registered nickname to message this user");
-                               return 1;
-                       }
-               }
-               return 0;
+               return OnUserPreMessage(user,dest,target_type,text,status);
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)