Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[user/henk/code/inspircd.git] / src / modules / m_cycle.cpp

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index eb20f4f9938e4f4e779e6a28075ed2bbc16291f8..383e7b5a2d538bf2ea0a48298788543652522109 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -1,71 +1,79 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style CYCLE command. */
+/* $ModDesc: Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel. */
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public command_t
+class CommandCycle : public Command
 {
  public:
-       cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1)
+       CommandCycle(Module* Creator) : Command(Creator,"CYCLE", 1)
        {
-               this->source = "m_cycle.so";
-               syntax = "<channel> :[reason]";
+               Penalty = 3; syntax = "<channel> :[reason]";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               chanrec* channel = ServerInstance->FindChan(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[0]);
                std::string reason = ConvToStr("Cycling");
-                       
-               if (pcnt > 1)
+
+               if (parameters.size() > 1)
                {
                        /* reason provided, use it */
                        reason = reason + ": " + parameters[1];
                }
-               
-               if (channel)
+
+               if (!channel)
+               {
+                       user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
+                       return CMD_FAILURE;
+               }
+
+               if (channel->HasUser(user))
                {
                        /*
                         * technically, this is only ever sent locally, but pays to be safe ;p
                         */
                        if (IS_LOCAL(user))
                        {
-                               if (channel->GetStatus(user) < STATUS_VOICE && channel->IsBanned(user))
+                               if (channel->GetPrefixValue(user) < VOICE_VALUE && channel->IsBanned(user))
                                {
                                        /* banned, boned. drop the message. */
-                                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** You may not cycle, as you are banned on channel " + channel->name);
+                                       user->WriteServ("NOTICE "+user->nick+" :*** You may not cycle, as you are banned on channel " + channel->name);
                                        return CMD_FAILURE;
                                }
-                               
-                               /* XXX in the future, this may move to a static chanrec method (the delete.) -- w00t */
-                               if (!channel->PartUser(user, reason.c_str()))
-                                       delete channel;
-                               
-                               chanrec::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
+
+                               channel->PartUser(user, reason);
+
+                               Channel::JoinUser(user, parameters[0].c_str(), true, "", false, ServerInstance->Time());
                        }
 
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** You are not on this channel", user->nick);
+                       user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick.c_str(), channel->name.c_str());
                }
 
                return CMD_FAILURE;
@@ -75,25 +83,27 @@ class cmd_cycle : public command_t
 
 class ModuleCycle : public Module
 {
-       cmd_cycle*      mycommand;
+       CommandCycle cmd;
  public:
-       ModuleCycle(InspIRCd* Me)
-               : Module(Me)
+       ModuleCycle()
+               : cmd(this)
+       {
+       }
+
+       void init()
        {
-               
-               mycommand = new cmd_cycle(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->Modules->AddService(cmd);
        }
-       
+
        virtual ~ModuleCycle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCycle)