Don't update the idle timer when a user replies to a CTCP.

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

diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp
index 88b2cf86cead712a798680165344d6908f86c20d..1b480aa20051481c1862cb585c2edae9810f7b5f 100644 (file)
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -34,7 +34,7 @@ CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl)
 
 /** Handle /INVITE
  */
-CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandInvite::Handle(User* user, const Params& parameters)
 {
        ModResult MOD_RESULT;
 
@@ -114,10 +114,12 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                        }
                }
 
-               if (IS_LOCAL(u))
+               LocalUser* const localtargetuser = IS_LOCAL(u);
+               if (localtargetuser)
                {
-                       invapi.Create(IS_LOCAL(u), c, timeout);
-                       u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str());
+                       invapi.Create(localtargetuser, c, timeout);
+                       ClientProtocol::Messages::Invite invitemsg(user, localtargetuser, c);
+                       localtargetuser->Send(ServerInstance->GetRFCEvents().invite, invitemsg);
                }
 
                if (IS_LOCAL(user))
@@ -129,15 +131,15 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 
                char prefix = 0;
                unsigned int minrank = 0;
-               switch (ServerInstance->Config->AnnounceInvites)
+               switch (announceinvites)
                {
-                       case ServerConfig::INVITE_ANNOUNCE_OPS:
+                       case Invite::ANNOUNCE_OPS:
                        {
                                prefix = '@';
                                minrank = OP_VALUE;
                                break;
                        }
-                       case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+                       case Invite::ANNOUNCE_DYNAMIC:
                        {
                                PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
                                if ((mh) && (mh->name == "halfop"))
@@ -155,8 +157,12 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                CUList excepts;
                FOREACH_MOD(OnUserInvite, (user, u, c, timeout, minrank, excepts));
 
-               if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
-                       c->WriteAllExcept(user, true, prefix, excepts, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
+               if (announceinvites != Invite::ANNOUNCE_NONE)
+               {
+                       excepts.insert(user);
+                       ClientProtocol::Messages::Privmsg privmsg(ServerInstance->FakeClient, c, InspIRCd::Format("*** %s invited %s into the channel", user->nick.c_str(), u->nick.c_str()), MSG_NOTICE);
+                       c->Write(ServerInstance->GetRFCEvents().privmsg, privmsg, prefix, excepts);
+               }
        }
        else if (IS_LOCAL(user))
        {
@@ -173,7 +179,7 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandInvite::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandInvite::GetRouting(User* user, const Params& parameters)
 {
        return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }