From 56917208cd41b720b96d052b0b2f353b8a89b29f Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 8 Jul 2006 16:46:05 +0000 Subject: [PATCH] Add cmode +v - that's all the RFC channel modes done now git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4172 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/modes/cmode_v.h | 13 +++++ src/mode.cpp | 11 +++-- src/modes/cmode_v.cpp | 104 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 include/modes/cmode_v.h create mode 100644 src/modes/cmode_v.cpp diff --git a/include/modes/cmode_v.h b/include/modes/cmode_v.h new file mode 100644 index 000000000..8cf1ad994 --- /dev/null +++ b/include/modes/cmode_v.h @@ -0,0 +1,13 @@ +#include "mode.h" +#include "channels.h" + +class ModeChannelVoice : public ModeHandler +{ + private: + public: + ModeChannelVoice(); + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding); + std::string AddVoice(userrec *user,const char *dest,chanrec *chan,int status); + std::string DelVoice(userrec *user,const char *dest,chanrec *chan,int status); +}; + diff --git a/src/mode.cpp b/src/mode.cpp index 1c00dd427..abcf4a671 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -52,6 +52,8 @@ using namespace std; #include "modes/cmode_o.h" /* +h (channel halfop) */ #include "modes/cmode_h.h" +/* +v (channel voice) */ +#include "modes/cmode_v.h" extern int MODCOUNT; extern std::vector modules; @@ -542,7 +544,7 @@ ModeParser::ModeParser() /* Initialise the RFC mode letters */ - /* Start with simple modes, no params */ + /* Start with channel simple modes, no params */ this->AddMode(new ModeChannelSecret, 's'); this->AddMode(new ModeChannelPrivate, 'p'); this->AddMode(new ModeChannelModerated, 'm'); @@ -550,15 +552,16 @@ ModeParser::ModeParser() this->AddMode(new ModeChannelNoExternal, 'n'); this->AddMode(new ModeChannelInviteOnly, 'i'); - /* Now modes with params */ + /* Cannel modes with params */ this->AddMode(new ModeChannelKey, 'k'); this->AddMode(new ModeChannelLimit, 'l'); - /* Now listmodes */ + /* Channel listmodes */ this->AddMode(new ModeChannelBan, 'b'); this->AddMode(new ModeChannelOp, 'o'); this->AddMode(new ModeChannelHalfOp, 'h'); + this->AddMode(new ModeChannelVoice, 'v'); - /* TODO: Modes +v, +h */ + /* TODO: User modes +swio */ } diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp new file mode 100644 index 000000000..87d391109 --- /dev/null +++ b/src/modes/cmode_v.cpp @@ -0,0 +1,104 @@ +#include +#include +#include "inspircd_config.h" +#include "configreader.h" +#include "hash_map.h" +#include "inspircd.h" +#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 ServerConfig* Config; +extern std::vector modules; +extern std::vector factory; +extern int MODCOUNT; +extern time_t TIME; + +ModeChannelVoice::ModeChannelVoice() : ModeHandler('v', 1, 1, true, MODETYPE_CHANNEL, false) +{ +} + +ModeAction ModeChannelVoice::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +{ + int status = cstatus(source, channel); + + /* Call the correct method depending on wether we're adding or removing the mode */ + if (adding) + { + parameter = this->AddVoice(source, parameter.c_str(), channel, status); + } + else + { + parameter = this->DelVoice(source, parameter.c_str(), channel, status); + } + /* If the method above 'ate' the parameter by reducing it to an empty string, then + * it won't matter wether we return ALLOW or DENY here, as an empty string overrides + * the return value and is always MODEACTION_DENY if the mode is supposed to have + * a parameter. + */ + return MODEACTION_ALLOW; +} + +std::string ModeChannelVoice::AddVoice(userrec *user,const char* dest,chanrec *chan,int status) +{ + userrec *d = ModeParser::SanityChecks(user,dest,chan,status); + + if (d) + { + if (IS_LOCAL(user)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE)); + + if (MOD_RESULT == ACR_DENY) + return ""; + if (MOD_RESULT == ACR_DEFAULT) + { + if ((status < STATUS_HOP) && (!is_uline(user->server))) + { + WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, chan->name); + return ""; + } + } + } + + return ModeParser::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); + + if (d) + { + if (IS_LOCAL(user)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE)); + + if (MOD_RESULT == ACR_DENY) + return ""; + if (MOD_RESULT == ACR_DEFAULT) + { + if ((status < STATUS_HOP) && (!is_uline(user->server))) + { + WriteServ(user->fd,"482 %s %s :You are not a channel (half)operator",user->nick, chan->name); + return ""; + } + } + } + + return ModeParser::Revoke(d,chan,UCMODE_VOICE); + } + return ""; +} -- 2.39.5