Fix some confusing logic in sanick.

[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..431afe9b73779050c960f53bd02279d70ec8f61f 100644 (file)
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -1,10 +1,17 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013-2016, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -24,12 +31,19 @@
 #include "core_channel.h"
 #include "invite.h"
 
+enum
+{
+       // From ircd-hybrid.
+       RPL_INVITELIST = 336,
+       RPL_ENDOFINVITELIST = 337
+};
+
 CommandInvite::CommandInvite(Module* parent, Invite::APIImpl& invapiimpl)
        : Command(parent, "INVITE", 0, 0)
        , invapi(invapiimpl)
 {
        Penalty = 4;
-       syntax = "[<nick> <channel>]";
+       syntax = "[<nick> <channel> [<time>]]";
 }
 
 /** Handle /INVITE
@@ -51,9 +65,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 +97,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;
                }