In the grand tradition of huge fucking commits:

[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 c9a08c12ad4ba293ecb981c14ccb7db3b51f4012..554bcd17dec4a4affd77b794adeb68a4b7b0c600 100644 (file)
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -17,18 +17,19 @@
 
 /** Handle /CYCLE
  */
-class cmd_cycle : public command_t
+class cmd_cycle : public Command
 {
  public:
-       cmd_cycle (InspIRCd* Instance) : command_t(Instance,"CYCLE", 0, 1)
+       cmd_cycle (InspIRCd* Instance) : Command(Instance,"CYCLE", 0, 1)
        {
                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)
@@ -37,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
@@ -51,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_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;