ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 03:59:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from Shawn-Smith/insp20+simplemode

Browse Source 
[2.0] Simplified the SimpleModeHandlers
This commit is contained in:
Attila Molnar 2012-07-13 08:32:54 -07:00
commit 2ab2de1dda
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/mode.cpp
View File

@ -1,6 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2012 Shawn Smith <shawn@inspircd.org>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
* Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
@ -132,47 +133,39 @@ bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ou
ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (adding)
{
if (!dest->IsModeSet(this->GetModeChar()))
{
dest->SetMode(this->GetModeChar(),true);
return MODEACTION_ALLOW;
}
}
else
{
if (dest->IsModeSet(this->GetModeChar()))
{
dest->SetMode(this->GetModeChar(),false);
return MODEACTION_ALLOW;
}
}
/* We're either trying to add a mode we already have or
remove a mode we don't have, deny. */
if (dest->IsModeSet(this->GetModeChar()) == adding)
return MODEACTION_DENY;
return MODEACTION_DENY;
/* adding will be either true or false, depending on if we
are adding or removing the mode, since we already checked
to make sure we aren't adding a mode we have or that we
aren't removing a mode we don't have, we don't have to do any
other checks here to see if it's true or false, just add or
remove the mode */
dest->SetMode(this->GetModeChar(), adding);
return MODEACTION_ALLOW;
}
ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
{
if (adding)
{
if (!channel->IsModeSet(this->GetModeChar()))
{
channel->SetMode(this->GetModeChar(),true);
return MODEACTION_ALLOW;
}
}
else
{
if (channel->IsModeSet(this->GetModeChar()))
{
channel->SetMode(this->GetModeChar(),false);
return MODEACTION_ALLOW;
}
}
/* We're either trying to add a mode we already have or
remove a mode we don't have, deny. */
if (channel->IsModeSet(this->GetModeChar()) == adding)
return MODEACTION_DENY;
return MODEACTION_DENY;
/* adding will be either true or false, depending on if we
are adding or removing the mode, since we already checked
to make sure we aren't adding a mode we have or that we
aren't removing a mode we don't have, we don't have to do any
other checks here to see if it's true or false, just add or
remove the mode */
channel->SetMode(this->GetModeChar(), adding);
return MODEACTION_ALLOW;
}
ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)