Simple user/channel mode patch

[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 0c700da8f193191932a2483180bd62e760daa9b1..669a87aeb3c71a2476387b5ba664e61884f90c69 100644 (file)
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -25,7 +25,7 @@ class Channel_r : public ModeHandler
  public:
        Channel_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                // only a u-lined server may add or remove the +r mode.
                if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
@@ -35,7 +35,7 @@ class Channel_r : public ModeHandler
                }
                else
                {
-                       source->WriteServ("500 %s :Only a server may modify the +r channel mode", source->nick);
+                       source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick);
                        return MODEACTION_DENY;
                }
        }
@@ -49,7 +49,7 @@ class User_r : public ModeHandler
  public:
        User_r(InspIRCd* Instance) : ModeHandler(Instance, 'r', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
                {
@@ -62,7 +62,7 @@ class User_r : public ModeHandler
                }
                else
                {
-                       source->WriteServ("500 %s :Only a server may modify the +r user mode", source->nick);
+                       source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick);
                        return MODEACTION_DENY;
                }
        }
@@ -70,92 +70,26 @@ class User_r : public ModeHandler
 
 /** Channel mode +R - registered users only
  */
-class Channel_R : public ModeHandler
+class Channel_R : public SimpleChannelModeHandler
 {
  public:
-       Channel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       Channel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { }
 };
 
 /** User mode +R - only allow PRIVMSG and NOTICE from registered users
  */
-class User_R : public ModeHandler
+class User_R : public SimpleUserModeHandler
 {
  public:
-       User_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       User_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { }
 };
 
 /** Channel mode +M - only allow privmsg and notice to channel from registered users
  */
-class Channel_M : public ModeHandler
+class Channel_M : public SimpleChannelModeHandler
 {
  public:
-       Channel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       Channel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { }
 };
 
 /** Dreamnforge-like services support
@@ -231,7 +165,7 @@ class ModuleServices : public Module
                                        return 0;
                                }
                                // user messaging a +M channel and is not registered
-                               user->WriteServ("477 %s %s :You need a registered nickname to speak on this channel", user->nick, c->name);
+                               user->WriteNumeric(477, "%s %s :You need a registered nickname to speak on this channel", user->nick, c->name);
                                return 1;
                        }
                }
@@ -246,7 +180,7 @@ class ModuleServices : public Module
                                        return 0;
                                }
                                // user messaging a +R user and is not registered
-                               user->WriteServ("477 %s %s :You need a registered nickname to message this user", user->nick, u->nick);
+                               user->WriteNumeric(477, "%s %s :You need a registered nickname to message this user", user->nick, u->nick);
                                return 1;
                        }
                }
@@ -258,7 +192,7 @@ class ModuleServices : public Module
                return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
        }
        
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
@@ -272,7 +206,7 @@ class ModuleServices : public Module
                                                return 0;
                                        }
                                        // joining a +R channel and not identified
-                                       user->WriteServ("477 %s %s :You need a registered nickname to join this channel", user->nick, chan->name);
+                                       user->WriteNumeric(477, "%s %s :You need a registered nickname to join this channel", user->nick, chan->name);
                                        return 1;
                                }
                        }
@@ -297,7 +231,7 @@ class ModuleServices : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };