Various text improvements: consistency, syntax, help and doc updates/fixes.

[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 1b480aa20051481c1862cb585c2edae9810f7b5f..732894aa5b860f1499ab50c0dc7e73669ff72794 100644 (file)
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -29,7 +29,7 @@ CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl)
        , invapi(invapiimpl)
 {
        Penalty = 4;
-       syntax = "[<nick> <channel>]";
+       syntax = "[<nick> <channel> [<time>]]";
 }
 
 /** Handle /INVITE
@@ -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;
                }