Use m_rewrite to rewrite op, deop, halfop, ... etc

8 files changed, 45 insertions, 461 deletions

diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp
index 5b25cccce..e33e81893 100644
--- a/modules/commands/cs_fantasy_stats.cpp
+++ b/modules/commands/cs_fantasy_stats.cpp
@@ -38,7 +38,6 @@ class CommandCSStats : public Command
  public:
 	CommandCSStats(Module *creator) : Command (creator, "chanserv/stats", 0, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays your Channel Stats"));
 		this->SetSyntax(_("\037nick\037"));
 	}
@@ -51,7 +50,6 @@ class CommandCSGStats : public Command
  public:
 	CommandCSGStats(Module *creator) : Command (creator, "chanserv/gstats", 0, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays your Global Stats"));
 		this->SetSyntax(_("\037nick\037"));
 	}
diff --git a/modules/commands/cs_fantasy_top.cpp b/modules/commands/cs_fantasy_top.cpp
index ca9572039..4cf15767d 100644
--- a/modules/commands/cs_fantasy_top.cpp
+++ b/modules/commands/cs_fantasy_top.cpp
@@ -37,7 +37,6 @@ class CommandCSTop : public Command
  public:
 	CommandCSTop(Module *creator) : Command (creator, "chanserv/top", 0, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays the top 3 users of a channel"));
 		this->SetSyntax(_("\037channel\037"));
 	}
@@ -50,7 +49,6 @@ class CommandCSTop10 : public Command
  public:
 	CommandCSTop10(Module *creator) : Command (creator, "chanserv/top10", 0, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays the top 10 users of a channel"));
 		this->SetSyntax(_("\037channel\037"));
 	}
@@ -63,7 +61,6 @@ class CommandCSGTop : public Command
  public:
 	CommandCSGTop(Module *creator) : Command (creator, "chanserv/gtop", 0, 1)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays the top 3 users of the network"));
 		this->SetSyntax("");
 	}
@@ -76,7 +73,6 @@ class CommandCSGTop10 : public Command
  public:
 	CommandCSGTop10(Module *creator) : Command (creator, "chanserv/gtop10", 0, 1)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Displays the top 10 users of the network"));
 		this->SetSyntax("");
 	}
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index c485c3cb4..fe2286b97 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -29,7 +29,6 @@ class CommandCSInfo : public Command
  public:
 	CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2)
 	{
-		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
 		this->SetDesc(_("Lists information about the named registered channel"));
 		this->SetSyntax(_("\037channel\037"));
 	}
diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index 9132d07a8..020a4703d 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -18,7 +18,6 @@ class CommandCSList : public Command
  public:
 	CommandCSList(Module *creator) : Command(creator, "chanserv/list", 1, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Lists all registered channels matching the given pattern"));
 		this->SetSyntax(_("\037pattern\037 [SUSPENDED] [NOEXPIRE]"));
 	}
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index 6bfbd0da4..9f836438c 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -15,19 +15,20 @@
 
 class CommandCSMode : public Command
 {
-	bool CanSet(CommandSource &source, ChannelInfo *ci, ChannelMode *cm)
+	bool CanSet(CommandSource &source, ChannelInfo *ci, ChannelMode *cm, bool self)
 	{
 		if (!ci || !cm || cm->type != MODE_STATUS)
 			return false;
 
-		const Anope::string accesses[] = { "VOICE", "HALFOP", "OPDEOP", "PROTECT", "OWNER", "" };
+		const Anope::string accesses[] = { "VOICE", "HALFOP", "OPDEOP", "PROTECT", "OWNER", "" },
+				accesses_self[] = { "VOICEME", "HALFOPME", "OPDEOPME", "PROTECTME", "OWNERME", "" };
 		const ChannelModeName modes[] = { CMODE_VOICE, CMODE_HALFOP, CMODE_OP, CMODE_PROTECT, CMODE_OWNER };
 		ChannelModeStatus *cms = anope_dynamic_static_cast<ChannelModeStatus *>(cm);
 		AccessGroup access = source.AccessFor(ci);
 		unsigned short u_level = 0;
 
 		for (int i = 0; !accesses[i].empty(); ++i)
-			if (access.HasPriv(accesses[i]))
+			if (access.HasPriv(self ? accesses_self[i] : accesses[i]))
 			{
 				ChannelMode *cm2 = ModeManager::FindChannelModeByName(modes[i]);
 				if (cm2 == NULL || cm2->type != MODE_STATUS)
@@ -193,10 +194,12 @@ class CommandCSMode : public Command
 	{
 		User *u = source.GetUser();
 
+		bool has_access = source.AccessFor(ci).HasPriv("MODE") || source.HasPriv("chanserv/set");
+
 		spacesepstream sep(params.size() > 3 ? params[3] : "");
 		Anope::string modes = params[2], param;
 
-		bool override = !source.AccessFor(ci).HasPriv("MODE");
+		bool override = !source.AccessFor(ci).HasPriv("MODE") && source.HasPriv("chanserv/set");
 		Log(override ? LOG_OVERRIDE : LOG_COMMAND, source, this, ci) << "to set " << params[2];
 
 		int adding = -1;
@@ -211,7 +214,7 @@ class CommandCSMode : public Command
 					adding = 0;
 					break;
 				case '*':
-					if (adding == -1)
+					if (adding == -1 || !has_access)
 						break;
 					for (unsigned j = 0; j < ModeManager::ChannelModes.size(); ++j)
 					{
@@ -237,12 +240,16 @@ class CommandCSMode : public Command
 					switch (cm->type)
 					{
 						case MODE_REGULAR:
+							if (!has_access)
+								break;
 							if (adding)
 								ci->c->SetMode(NULL, cm);
 							else
 								ci->c->RemoveMode(NULL, cm);
 							break;
 						case MODE_PARAM:
+							if (!has_access)
+								break;
 							if (adding && !sep.GetToken(param))
 								break;
 							if (adding)
@@ -253,25 +260,25 @@ class CommandCSMode : public Command
 						case MODE_STATUS:
 						{
 							if (!sep.GetToken(param))
-								break;
-
-							if (!this->CanSet(source, ci, cm))
-							{
-								source.Reply(_("You do not have access to set mode %c."), cm->mchar);
-								break;
-							}
+								param = source.GetNick();
 
 							AccessGroup u_access = source.AccessFor(ci);
 
 							if (param.find_first_of("*?") != Anope::string::npos)
 							{
+								if (!this->CanSet(source, ci, cm, false))
+								{
+									source.Reply(_("You do not have access to set mode %c."), cm->mchar);
+									break;
+								}
+
 								for (Channel::ChanUserList::const_iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
 								{
 									ChanUserContainer *uc = *it;
 
 									AccessGroup targ_access = ci->AccessFor(uc->user);
 
-									if (targ_access > u_access)
+									if (uc->user->IsProtected() || targ_access > u_access)
 									{
 										source.Reply(_("You do not have the access to change %s's modes."), uc->user->nick.c_str());
 										continue;
@@ -295,13 +302,27 @@ class CommandCSMode : public Command
 									break;
 								}
 
-								AccessGroup targ_access = ci->AccessFor(target);
-								if (targ_access > u_access)
+								if (!this->CanSet(source, ci, cm, source.GetUser() == target))
 								{
-									source.Reply(_("You do not have the access to change %s's modes."), target->nick.c_str());
+									source.Reply(_("You do not have access to set mode %c."), cm->mchar);
 									break;
 								}
 
+								if (source.GetUser() != target)
+								{
+									AccessGroup targ_access = ci->AccessFor(target);
+									if (targ_access > u_access)
+									{
+										source.Reply(_("You do not have the access to change %s's modes."), target->nick.c_str());
+										break;
+									}
+									else if (target->IsProtected())
+									{
+										source.Reply(ACCESS_DENIED);
+										break;
+									}
+								}
+
 								if (adding)
 									ci->c->SetMode(NULL, cm, target->GetUID());
 								else
@@ -310,6 +331,8 @@ class CommandCSMode : public Command
 							break;
 						}
 						case MODE_LIST:
+							if (!has_access)
+								break;
 							if (!sep.GetToken(param))
 								break;
 							if (adding)
@@ -347,16 +370,17 @@ class CommandCSMode : public Command
 
 		if (!ci || !ci->c)
 			source.Reply(CHAN_X_NOT_IN_USE, params[0].c_str());
-		else if (!source.AccessFor(ci).HasPriv("MODE") && !source.HasPriv("chanserv/set"))
-			source.Reply(ACCESS_DENIED);
 		else if (subcommand.equals_ci("LOCK"))
-			this->DoLock(source, ci, params);
+		{
+			if (!source.AccessFor(ci).HasPriv("MODE") && !source.HasPriv("chanserv/set"))
+				source.Reply(ACCESS_DENIED);
+			else
+				this->DoLock(source, ci, params);
+		}
 		else if (subcommand.equals_ci("SET"))
 			this->DoSet(source, ci, params);
 		else
 			this->OnSyntaxError(source, "");
-
-		return;
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
diff --git a/modules/commands/cs_modes.cpp b/modules/commands/cs_modes.cpp
deleted file mode 100644
index 26783c531..000000000
--- a/modules/commands/cs_modes.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- *
- * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandModeBase : public Command
-{
-	void do_mode(CommandSource &source, Command *com, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, const Anope::string &level, const Anope::string &levelself)
-	{
-		User *u = source.GetUser();
-		User *u2 = User::Find(nick, true);
-		Channel *c = Channel::Find(chan);
-
-		if (!c)
-		{
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
-			return;
-
-		}
-
-		if (!u2)
-		{
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
-			return;
-		}
-
-		ChannelInfo *ci = c->ci;
-		if (!ci)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, c->name.c_str());
-			return;
-		}
-
-		bool is_same = u == u2;
-		AccessGroup u_access = source.AccessFor(ci), u2_access = ci->AccessFor(u2);
-
-		if (is_same ? !source.AccessFor(ci).HasPriv(levelself) : !source.AccessFor(ci).HasPriv(level))
-			source.Reply(ACCESS_DENIED);
-		else if (!set && !is_same && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-			source.Reply(ACCESS_DENIED);
-		else if (!set && u2->IsProtected() && !is_same)
-			source.Reply(ACCESS_DENIED);
-		else if (!c->FindUser(u2))
-			source.Reply(NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
-		else
-		{
-			if (set)
-				c->SetMode(NULL, cm, u2->GetUID());
-			else
-				c->RemoveMode(NULL, cm, u2->GetUID());
-
-			Log(LOG_COMMAND, source, com, ci) << "for " << u2->nick;
-		}
-	}
-
- protected:
-	/** do_util: not a command, but does the job of others
-	 * @param source The source of the command
-	 * @param com The command calling this function
-	 * @param cm A channel mode class
-	 * @param chan The channel its being set on
-	 * @param nick The nick the modes being set on
-	 * @param set Is the mode being set or removed
-	 * @param level The access level required to set this mode on someone else
-	 * @param levelself The access level required to set this mode on yourself
-	 */
-	void do_util(CommandSource &source, Command *com, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, const Anope::string &level, const Anope::string &levelself)
-	{
-		User *u = source.GetUser();
-
-		if (chan.empty() && u)
-			for (User::ChanUserList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
-				do_mode(source, com, cm, (*it)->chan->name, u->nick, set, level, levelself);
-		else if (!chan.empty())
-			do_mode(source, com, cm, chan, !nick.empty() ? nick : u->nick, set, level, levelself);
-	}
-
- public:
-	CommandModeBase(Module *creator, const Anope::string &cname) : Command(creator, cname, 0, 2)
-	{
-		this->SetSyntax(_("[\037channel\037] [\037nick\037]"));
-	}
-};
-
-class CommandCSOp : public CommandModeBase
-{
- public:
-	CommandCSOp(Module *creator) : CommandModeBase(creator, "chanserv/op")
-	{
-		this->SetDesc(_("Gives Op status to a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OPDEOP", "OPDEOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Ops a selected nick on a channel. If nick is not given,\n"
-				"it will op you. If channel is not given, it will op you\n"
-				"on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel."));
-		return true;
-	}
-};
-
-class CommandCSDeOp : public CommandModeBase
-{
- public:
-	CommandCSDeOp(Module *creator) : CommandModeBase(creator, "chanserv/deop")
-	{
-		this->SetDesc(_("Deops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OPDEOP", "OPDEOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply("Deops a selected nick on a channel. If nick is not given,\n"
-				"it will deop you. If channel is not given, it will deop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel.");
-		return true;
-	}
-};
-
-class CommandCSVoice : public CommandModeBase
-{
- public:
-	CommandCSVoice(Module *creator) : CommandModeBase(creator, "chanserv/voice")
-	{
-		this->SetDesc(_("Voices a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "VOICE", "VOICEME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Voices a selected nick on a channel. If nick is not given,\n"
-				"it will voice you. If channel is not given, it will voice you\n"
-				"on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel, or to VOPs or those with level 3\n"
-				"and above for self voicing."));
-		return true;
-	}
-};
-
-class CommandCSDeVoice : public CommandModeBase
-{
- public:
-	CommandCSDeVoice(Module *creator) : CommandModeBase(creator, "chanserv/devoice")
-	{
-		this->SetDesc(_("Devoices a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "VOICE", "VOICEME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Devoices a selected nick on a channel. If nick is not given,\n"
-				"it will devoice you. If channel is not given, it will devoice\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel, or to VOPs or those with level 3\n"
-				"and above for self devoicing."));
-		return true;
-	}
-};
-
-class CommandCSHalfOp : public CommandModeBase
-{
- public:
-	CommandCSHalfOp(Module *creator) : CommandModeBase(creator, "chanserv/halfop")
-	{
-		this->SetDesc(_("Halfops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "HALFOP", "HALFOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Halfops a selected nick on a channel. If nick is not given,\n"
-				"it will halfop you. If channel is not given, it will halfop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs and those with level 5 access\n"
-				"and above on the channel, or to HOPs or those with level 4\n"
-				"and above for self halfopping."));
-		return true;
-	}
-};
-
-class CommandCSDeHalfOp : public CommandModeBase
-{
- public:
-	CommandCSDeHalfOp(Module *creator) : CommandModeBase(creator, "chanserv/dehalfop")
-	{
-		this->SetDesc(_("Dehalfops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "HALFOP", "HALFOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Dehalfops a selected nick on a channel. If nick is not given,\n"
-				"it will dehalfop you. If channel is not given, it will dehalfop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs and those with level 5 access\n"
-				"and above on the channel, or to HOPs or those with level 4\n"
-				"and above for self dehalfopping."));
-		return true;
-	}
-};
-
-class CommandCSProtect : public CommandModeBase
-{
- public:
-	CommandCSProtect(Module *creator) : CommandModeBase(creator, "chanserv/protect")
-	{
-		this->SetDesc(_("Protects a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "PROTECT", "PROTECTME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Protects a selected nick on a channel. If nick is not given,\n"
-				"it will protect you. If channel is not given, it will protect\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to the founder, or to SOPs or those with\n"
-				"level 10 and above on the channel for self protecting."));
-		return true;
-	}
-};
-
-class CommandCSDeProtect : public CommandModeBase
-{
- public:
-	CommandCSDeProtect(Module *creator) : CommandModeBase(creator, "chanserv/deprotect")
-	{
-		this->SetDesc(_("Deprotects a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "PROTECT", "PROTECTME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Deprotects a selected nick on a channel. If nick is not given,\n"
-				"it will deprotect you. If channel is not given, it will deprotect\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to the founder, or to SOPs or those with\n"
-				"level 10 and above on the channel for self deprotecting."));
-		return true;
-	}
-};
-
-class CommandCSOwner : public CommandModeBase
-{
- public:
-	CommandCSOwner(Module *creator) : CommandModeBase(module, "chanserv/owner")
-	{
-		this->SetDesc(_("Gives you owner status on channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OWNER", "OWNERME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Gives the selected nick owner status on \002channel\002. If nick is not\n"
-				"given, it will give you owner. If channel is not given, it will\n"
-				"give you owner on every channel.\n"
-				" \n"
-				"Limited to those with founder access on the channel."));
-		return true;
-	}
-};
-
-class CommandCSDeOwner : public CommandModeBase
-{
- public:
-	CommandCSDeOwner(Module *creator) : CommandModeBase(creator, "chanserv/deowner")
-	{
-		this->SetDesc(_("Removes your owner status on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OWNER", "OWNERME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Removes owner status from the selected nick on \002channel\002. If nick\n"
-				"is not given, it will deowner you. If channel is not given, it will\n"
-				"deowner you on every channel.\n"
-				" \n"
-				"Limited to those with founder access on the channel."));
-		return true;
-	}
-};
-
-class CSModes : public Module
-{
-	CommandCSOwner commandcsowner;
-	CommandCSDeOwner commandcsdeowner;
-	CommandCSProtect commandcsprotect;
-	CommandCSDeProtect commandcsdeprotect;
-	CommandCSOp commandcsop;
-	CommandCSDeOp commandcsdeop;
-	CommandCSHalfOp commandcshalfop;
-	CommandCSDeHalfOp commandcsdehalfop;
-	CommandCSVoice commandcsvoice;
-	CommandCSDeVoice commandcsdevoice;
-
- public:
-	CSModes(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcsowner(this), commandcsdeowner(this), commandcsprotect(this), commandcsdeprotect(this),
-		commandcsop(this), commandcsdeop(this), commandcshalfop(this), commandcsdehalfop(this),
-		commandcsvoice(this), commandcsdevoice(this)
-	{
-		this->SetAuthor("Anope");
-
-		
-	}
-};
-
-MODULE_INIT(CSModes)
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 9e3cf4e1e..717352d42 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -184,7 +184,6 @@ class CommandSeen : public Command
  public:
 	CommandSeen(Module *creator) : Command(creator, "chanserv/seen", 1, 2)
 	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetDesc(_("Tells you about the last time a user was seen"));
 		this->SetSyntax(_("\037nick\037"));
 	}
diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp
index 252406590..e442a5f1f 100644
--- a/modules/commands/help.cpp
+++ b/modules/commands/help.cpp
@@ -19,7 +19,6 @@ class CommandHelp : public Command
 	CommandHelp(Module *creator) : Command(creator, "generic/help", 0)
 	{
 		this->SetDesc(_("Displays this list and give information about commands"));
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
 	}