Fix some of the include guard names (requested by SaberUK)

[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 295e7320889b071245f1ab341922aa8803ee1eb0..d4194c75ea6fea2eb2ab571658a79b4838eb42a3 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -17,53 +17,56 @@
 
 /** 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);
                                        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;
@@ -73,25 +76,23 @@ class cmd_cycle : public command_t
 
 class ModuleCycle : public Module
 {
-       cmd_cycle*      mycommand;
+       CommandCycle cmd;
  public:
-       ModuleCycle(InspIRCd* Me)
-               : Module(Me)
+       ModuleCycle()
+               : cmd(this)
        {
-               
-               mycommand = new cmd_cycle(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
-       
+
        virtual ~ModuleCycle()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR);
        }
-       
+
 };
 
 MODULE_INIT(ModuleCycle)