Remove Implements() method from every module. booya.

[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 60b2b82b926f6101c6e521888703920d3e1cd184..d190eda3cf71dcd36d199ca076613f0153044f78 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -12,26 +12,24 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style CYCLE command. */
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public command_t
+class CommandCycle : public Command
 {
  public:
-       cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1)
+       CommandCycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1, false, 3)
        {
                this->source = "m_cycle.so";
                syntax = "<channel> :[reason]";
+               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
-               chanrec* channel = ServerInstance->FindChan(parameters[0]);
+               Channel* channel = ServerInstance->FindChan(parameters[0]);
                std::string reason = ConvToStr("Cycling");
                        
                if (pcnt > 1)
@@ -40,7 +38,13 @@ class cmd_cycle : public command_t
                        reason = reason + ": " + parameters[1];
                }
                
-               if (channel)
+               if (!channel)
+               {
+                       user->WriteServ("403 %s %s :No such channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
+               }
+               
+               if (channel->HasUser(user))
                {
                        /*
                         * technically, this is only ever sent locally, but pays to be safe ;p
@@ -54,18 +58,18 @@ class cmd_cycle : public command_t
                                        return CMD_FAILURE;
                                }
                                
-                               /* XXX in the future, this may move to a static chanrec method (the delete.) -- w00t */
+                               /* XXX in the future, this may move to a static Channel method (the delete.) -- w00t */
                                if (!channel->PartUser(user, reason.c_str()))
                                        delete channel;
                                
-                               chanrec::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
+                               Channel::JoinUser(ServerInstance, user, parameters[0], true, "", ServerInstance->Time(true));
                        }
 
-                       return CMD_SUCCESS;
+                       return CMD_LOCALONLY;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** You are not on this channel", user->nick);
+                       user->WriteServ("442 %s %s :You're not on that channel", user->nick, channel->name);
                }
 
                return CMD_FAILURE;
@@ -75,14 +79,15 @@ class cmd_cycle : public command_t
 
 class ModuleCycle : public Module
 {
-       cmd_cycle*      mycommand;
+       CommandCycle*   mycommand;
  public:
        ModuleCycle(InspIRCd* Me)
                : Module(Me)
        {
                
-               mycommand = new cmd_cycle(ServerInstance);
+               mycommand = new CommandCycle(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+
        }
        
        virtual ~ModuleCycle()
@@ -91,34 +96,9 @@ class ModuleCycle : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCycleFactory : public ModuleFactory
-{
- public:
-       ModuleCycleFactory()
-       {
-       }
-       
-       ~ModuleCycleFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCycle(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCycleFactory;
-}
-
+MODULE_INIT(ModuleCycle)