Remove a long obsolete comment from the example conf.

[user/henk/code/inspircd.git] / src / coremods / core_user / cmd_part.cpp

diff --git a/src/coremods/core_user/cmd_part.cpp b/src/coremods/core_user/cmd_part.cpp
index b8395f43ef43e01b6275a0b7d15e6520d16eeabe..e7164d35f5abf4ef567d6bb9b76fdd6c5894c651 100644 (file)
--- a/src/coremods/core_user/cmd_part.cpp
+++ b/src/coremods/core_user/cmd_part.cpp
@@ -1,8 +1,15 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 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
@@ -25,23 +32,17 @@ CommandPart::CommandPart(Module* parent)
        : Command(parent, "PART", 1, 2)
 {
        Penalty = 5;
-       syntax = "<channel>{,<channel>} [<reason>]";
+       syntax = "<channel>[,<channel>]+ [:<reason>]";
 }
 
-CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandPart::Handle(User* user, const Params& parameters)
 {
        std::string reason;
-
-       if (IS_LOCAL(user))
-       {
-               if (!ServerInstance->Config->FixedPart.empty())
-                       reason = ServerInstance->Config->FixedPart;
-               else if (parameters.size() > 1)
-                       reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
-       }
-       else
+       if (parameters.size() > 1)
        {
-               if (parameters.size() > 1)
+               if (IS_LOCAL(user))
+                       msgwrap.Wrap(parameters[1], reason);
+               else
                        reason = parameters[1];
        }
 
@@ -50,20 +51,22 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
        Channel* c = ServerInstance->FindChan(parameters[0]);
 
-       if (c)
+       if (!c)
        {
-               c->PartUser(user, reason);
+               user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
+               return CMD_FAILURE;
        }
-       else
+
+       if (!c->PartUser(user, reason))
        {
-               user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
+               user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel");
                return CMD_FAILURE;
        }
 
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandPart::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandPart::GetRouting(User* user, const Params& parameters)
 {
        return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
 }