X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cycle.cpp;h=686f4652adf858470ba443348ce242e74fc78173;hb=HEAD;hp=66d124eb87a272b28624dae9c2761169858eea49;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 66d124eb8..686f4652a 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -1,8 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
+ *   Copyright (C) 2013, 2018, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
  *
  * 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
@@ -20,8 +28,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel. */
-
 /** Handle /CYCLE
  */
 class CommandCycle : public SplitCommand
@@ -30,14 +36,14 @@ class CommandCycle : public SplitCommand
 	CommandCycle(Module* Creator)
 		: SplitCommand(Creator, "CYCLE", 1)
 	{
-		Penalty = 3; syntax = "<channel> :[reason]";
-		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
+		Penalty = 3;
+		syntax = "<channel> [:<reason>]";
 	}
 
-	CmdResult HandleLocal(const std::vector<std::string> &parameters, LocalUser* user)
+	CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
-		std::string reason = ConvToStr("Cycling");
+		std::string reason = "Cycling";
 
 		if (parameters.size() > 1)
 		{
@@ -47,33 +53,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(Numerics::NoSuchChannel(parameters[0]));
 			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, channel->name, "You're not on that channel");
 		}
 
 		return CMD_FAILURE;
@@ -91,14 +91,9 @@ class ModuleCycle : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR);
+		return Version("Allows channel members to part and rejoin a channel without needing to worry about channel modes such as +i (inviteonly) which might prevent rejoining.", VF_VENDOR);
 	}
 };