Fix overriding <options:exemptchanops> with the exemptchanops mode.

[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 89a2f6b691aba152346164d388ebcbaa17111bb0..c26318337597d389f9491697904ceb7d800a4b31 100644 (file)
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -51,9 +51,17 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
                if (parameters.size() >= 3)
                {
                        if (IS_LOCAL(user))
-                               timeout = ServerInstance->Time() + InspIRCd::Duration(parameters[2]);
+                       {
+                               unsigned long duration;
+                               if (!InspIRCd::Duration(parameters[2], duration))
+                               {
+                                       user->WriteNotice("*** Invalid duration for invite");
+                                       return CMD_FAILURE;
+                               }
+                               timeout = ServerInstance->Time() + duration;
+                       }
                        else if (parameters.size() > 3)
-                               timeout = ConvToInt(parameters[3]);
+                               timeout = ConvToNum<time_t>(parameters[3]);
                }
 
                if (!c)
@@ -75,7 +83,7 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
                                return CMD_INVALID;
 
                        // Drop the invite if our channel TS is lower
-                       time_t RemoteTS = ConvToInt(parameters[2]);
+                       time_t RemoteTS = ConvToNum<time_t>(parameters[2]);
                        if (c->age < RemoteTS)
                                return CMD_FAILURE;
                }
@@ -114,10 +122,12 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
                        }
                }
 
-               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))
@@ -156,7 +166,11 @@ CmdResult CommandInvite::Handle(User* user, const Params& parameters)
                FOREACH_MOD(OnUserInvite, (user, u, c, timeout, minrank, excepts));
 
                if (announceinvites != 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());
+               {
+                       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))
        {