X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cycle.cpp;h=c8b6bd8b4b82ec923e433c602a313da3ffa7d812;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=4a7b0f64421acb1e4bfabd1ec573a545ea5dc18b;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 4a7b0f644..c8b6bd8b4 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -34,7 +34,7 @@ class CommandCycle : public SplitCommand
 	CmdResult HandleLocal(const std::vector<std::string> &parameters, LocalUser* user)
 	{
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
-		std::string reason = ConvToStr("Cycling");
+		std::string reason = "Cycling";
 
 		if (parameters.size() > 1)
 		{
@@ -44,33 +44,27 @@ class CommandCycle : public SplitCommand
 
 		if (!channel)
 		{
-			user->WriteNumeric(403, "%s %s :No such channel", user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(ERR_NOSUCHCHANNEL, "%s :No such channel", 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->GetPrefixValue(user) < VOICE_VALUE && channel->IsBanned(user))
 			{
-				if (channel->GetPrefixValue(user) < VOICE_VALUE && channel->IsBanned(user))
-				{
-					/* banned, boned. drop the message. */
-					user->WriteNotice("*** You may not cycle, as you are banned on channel " + channel->name);
-					return CMD_FAILURE;
-				}
-
-				channel->PartUser(user, reason);
-				Channel::JoinUser(user, parameters[0], true);
+				// User is banned, send an error and don't cycle them
+				user->WriteNotice("*** You may not cycle, as you are banned on channel " + channel->name);
+				return CMD_FAILURE;
 			}
 
+			channel->PartUser(user, reason);
+			Channel::JoinUser(user, parameters[0], true);
+
 			return CMD_SUCCESS;
 		}
 		else
 		{
-			user->WriteNumeric(442, "%s %s :You're not on that channel", user->nick.c_str(), channel->name.c_str());
+			user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel", channel->name.c_str());
 		}
 
 		return CMD_FAILURE;