Use the remote channel's capitalization on a losing TS merge

[user/henk/code/inspircd.git] / src / commands / cmd_invite.cpp

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index 1e8d06e96b7aad2c230bb6f95f078649236fd896..438aa37d0fe53ca5cfcbb5f8c46a2217b1cddda2 100644 (file)
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,22 +12,41 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_invite.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /INVITE. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandInvite : public Command
 {
-       return new CommandInvite(Instance);
-}
+ public:
+       /** Constructor for invite.
+        */
+       CommandInvite ( Module* parent) : Command(parent,"INVITE", 0, 0) { Penalty = 4; syntax = "[<nick> <channel>]"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
 /** Handle /INVITE
  */
 CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       int MOD_RESULT = 0;
+       ModResult MOD_RESULT;
 
        if (parameters.size() == 2 || parameters.size() == 3)
        {
-               User* u = ServerInstance->FindNick(parameters[0]);
+               User* u;
+               if (IS_LOCAL(user))
+                       u = ServerInstance->FindNickOnly(parameters[0]);
+               else
+                       u = ServerInstance->FindNick(parameters[0]);
+
                Channel* c = ServerInstance->FindChan(parameters[1]);
                time_t timeout = 0;
                if (parameters.size() == 3)
@@ -56,25 +75,28 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                        return CMD_FAILURE;
                }
 
-               FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c,timeout));
+               FIRST_MOD_RESULT(OnUserPreInvite, MOD_RESULT, (user,u,c,timeout));
 
-               if (MOD_RESULT == 1)
+               if (MOD_RESULT == MOD_RES_DENY)
                {
                        return CMD_FAILURE;
                }
-               else if (MOD_RESULT == 0)
+               else if (MOD_RESULT == MOD_RES_PASSTHRU)
                {
                        if (IS_LOCAL(user))
                        {
-                               if (c->GetStatus(user) < STATUS_HOP)
+                               int rank = c->GetPrefixValue(user);
+                               if (rank < HALFOP_VALUE)
                                {
-                                       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-");
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",
+                                               user->nick.c_str(), c->name.c_str(), rank >= HALFOP_VALUE ? "" : "half-");
                                        return CMD_FAILURE;
                                }
                        }
                }
 
-               u->InviteTo(c->name.c_str(), timeout);
+               if (IS_LOCAL(u))
+                       IS_LOCAL(u)->InviteTo(c->name.c_str(), timeout);
                u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
                user->WriteNumeric(RPL_INVITING, "%s %s %s",user->nick.c_str(),u->nick.c_str(),c->name.c_str());
                switch (ServerInstance->Config->AnnounceInvites)
@@ -97,11 +119,11 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                }
                FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c,timeout));
        }
-       else
+       else if (IS_LOCAL(user))
        {
                // pinched from ircu - invite with not enough parameters shows channels
                // youve been invited to but haven't joined yet.
-               InvitedList* il = user->GetInviteList();
+               InvitedList* il = IS_LOCAL(user)->GetInviteList();
                for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
                {
                        user->WriteNumeric(RPL_INVITELIST, "%s :%s",user->nick.c_str(),i->first.c_str());
@@ -111,3 +133,5 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
        return CMD_SUCCESS;
 }
 
+
+COMMAND_INIT(CommandInvite)