diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands/cmd_invite.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp index c0da70b6e..9e74b541b 100644 --- a/src/commands/cmd_invite.cpp +++ b/src/commands/cmd_invite.cpp @@ -41,15 +41,6 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use return CMD_FAILURE; } - if ((c->IsModeSet('i')) && (IS_LOCAL(user))) - { - if (c->GetStatus(user) < STATUS_HOP) - { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-"); - return CMD_FAILURE; - } - } - if (c->HasUser(u)) { user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str()); @@ -61,13 +52,24 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use user->WriteNumeric(ERR_NOTONCHANNEL, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str()); return CMD_FAILURE; } - { FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c,timeout)); if (MOD_RESULT == 1) + { return CMD_FAILURE; } + else if (MOD_RESULT == 0) + { + if (IS_LOCAL(user)) + { + if (c->GetStatus(user) < STATUS_HOP) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-"); + return CMD_FAILURE; + } + } + } u->InviteTo(c->name.c_str(), timeout); u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str()); |