auto-set +s when +n is set (as +n requires +s) - allow +n to be 'set twice' allowing...

[user/henk/code/inspircd.git] / src / modes / cmode_v.cpp

diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index ddac844ec226740afcf0705df826b11f7941887a..f12d9f9cfbcda3679f3c0033975649981f5c9344 100644 (file)
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -7,45 +7,41 @@
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "helperfuncs.h"
-#include "message.h"
 #include "commands.h"
 #include "modules.h"
 #include "inspstring.h"
 #include "hashcomp.h"
 #include "modes/cmode_v.h"
 
-extern InspIRCd* ServerInstance;
-extern InspIRCd* ServerInstance;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
+ModeChannelVoice::ModeChannelVoice(InspIRCd* Instance) : ModeHandler(Instance, 'v', 1, 1, true, MODETYPE_CHANNEL, false, '+')
+{
+}
 
-ModeChannelVoice::ModeChannelVoice() : ModeHandler('v', 1, 1, true, MODETYPE_CHANNEL, false)
+unsigned int ModeChannelVoice::GetPrefixRank()
 {
+       return VOICE_VALUE;
 }
 
 ModePair ModeChannelVoice::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {
-        userrec* x = Find(parameter);
-        if (x)
-        {
-                if (cstatus(x, channel) == STATUS_VOICE)
-                {
-                        return std::make_pair(true, x->nick);
-                }
-                else
-                {
-                        return std::make_pair(false, parameter);
-                }
-        }
+       userrec* x = ServerInstance->FindNick(parameter);
+       if (x)
+       {
+               if (channel->GetStatusFlags(x) & UCMODE_VOICE)
+               {
+                       return std::make_pair(true, x->nick);
+               }
+               else
+               {
+                       return std::make_pair(false, parameter);
+               }
+       }
        return std::make_pair(false, parameter);
 }
 
 ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 {
-       int status = cstatus(source, channel);
+       int status = channel->GetStatus(source);
 
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
@@ -66,7 +62,7 @@ ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanre
 
 std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -79,7 +75,7 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
+                               if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You're not a channel (half)operator",user->nick, chan->name);
                                        return "";
@@ -87,14 +83,14 @@ std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *c
                        }
                }
 
-               return ModeParser::Grant(d,chan,UCMODE_VOICE);
+               return ServerInstance->Modes->Grant(d,chan,UCMODE_VOICE);
        }
        return "";
 }
 
 std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -107,7 +103,7 @@ std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *c
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_HOP) && (!is_uline(user->server)))
+                               if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
                                        return "";
@@ -115,7 +111,7 @@ std::string ModeChannelVoice::DelVoice(userrec *user,const char *dest,chanrec *c
                        }
                }
 
-               return ModeParser::Revoke(d,chan,UCMODE_VOICE);
+               return ServerInstance->Modes->Revoke(d,chan,UCMODE_VOICE);
        }
        return "";
 }