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

3 files changed, 160 insertions, 41 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 2980e0057..47482c93f 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -272,7 +272,6 @@ command { service = "BotServ"; name = "SET PRIVATE"; command = "botserv/set/priv
 fantasy { name = "ACCESS"; command = "chanserv/access"; }
 fantasy { name = "AKICK"; command = "chanserv/akick"; }
 fantasy { name = "AOP"; command = "chanserv/aop"; }
-fantasy { name = "APPENDTOPIC"; command = "chanserv/appendtopic"; }
 fantasy { name = "BAN"; command = "chanserv/ban"; }
 fantasy { name = "CLONE"; command = "chanserv/clone"; }
 fantasy { name = "DEHALFOP"; command = "chanserv/dehalfop"; }
@@ -285,22 +284,22 @@ fantasy { name = "ENFORCE"; command = "chanserv/enforce"; }
 fantasy { name = "ENTRYMSG"; command = "chanserv/entrymsg"; }
 fantasy { name = "FLAGS"; command = "chanserv/flags"; }
 fantasy { name = "HALFOP"; command = "chanserv/halfop"; }
-fantasy { name = "HELP"; command = "generic/help"; }
+fantasy { name = "HELP"; command = "generic/help"; prepend_channel = false }
 fantasy { name = "HOP"; command = "chanserv/hop"; }
-fantasy { name = "INFO"; command = "chanserv/info"; }
+fantasy { name = "INFO"; command = "chanserv/info"; prepend_channel = false }
 fantasy { name = "INVITE"; command = "chanserv/invite"; }
 fantasy { name = "K"; command = "chanserv/kick"; }
 fantasy { name = "KB"; command = "chanserv/ban"; }
 fantasy { name = "KICK"; command = "chanserv/kick"; }
 fantasy { name = "LEVELS"; command = "chanserv/levels"; }
-fantasy { name = "LIST"; command = "chanserv/list"; }
+fantasy { name = "LIST"; command = "chanserv/list"; prepend_channel = false }
 fantasy { name = "LOG"; command = "chanserv/log"; }
 fantasy { name = "MODE"; command = "chanserv/mode"; }
 fantasy { name = "OP"; command = "chanserv/op"; }
 fantasy { name = "OWNER"; command = "chanserv/owner"; }
 fantasy { name = "PROTECT"; command = "chanserv/protect"; }
 fantasy { name = "QOP"; command = "chanserv/qop"; }
-fantasy { name = "SEEN"; command = "chanserv/seen"; }
+fantasy { name = "SEEN"; command = "chanserv/seen"; prepend_channel = false }
 fantasy { name = "SOP"; command = "chanserv/sop"; }
 fantasy { name = "STATUS"; command = "chanserv/status"; }
 fantasy { name = "SUSPEND"; command = "chanserv/suspend"; permission = "chanserv/suspend"; }
@@ -312,3 +311,20 @@ fantasy { name = "UP"; command = "chanserv/up"; }
 fantasy { name = "VOICE"; command = "chanserv/voice"; }
 fantasy { name = "VOP"; command = "chanserv/vop"; }
 
+/* Use m_rewrite to rewrite the op, deop, etc. fantasy commands (see chanserv.conf). */
+
+fantasy { name = "OWNER"; command = "rewrite"; }
+fantasy { name = "DEOWNER"; command = "rewrite"; }
+
+fantasy { name = "PROTECT"; command = "rewrite"; }
+fantasy { name = "DEPROTECT"; command = "rewrite"; }
+
+fantasy { name = "OP"; command = "rewrite"; }
+fantasy { name = "DEOP"; command = "rewrite"; }
+
+fantasy { name = "HALFOP"; command = "rewrite"; }
+fantasy { name = "DEHALFOP"; command = "rewrite"; }
+
+fantasy { name = "VOICE"; command = "rewrite"; }
+fantasy { name = "DEVOICE"; command = "rewrite"; }
+
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 5933c5ba3..0d83e6a3c 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -1006,27 +1006,6 @@ module { name = "cs_mode" }
 command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; }
 
 /*
- * cs_mode
- *
- * Provides the commands chanserv/op, chanserv/deop, chanserv/halfop, chanserv/dehalfop
- *                       chanserv/voice, chanserv/devoice, chanserv/protect, chanserv/deprotect,
- *                       chanserv/owner, and chanserv/deowner.
- *
- * Used for setting and removing modes on users.
- */
-module { name = "cs_modes" }
-command { service = "ChanServ"; name = "OP"; command = "chanserv/op"; }
-command { service = "ChanServ"; name = "DEOP"; command = "chanserv/deop"; }
-command { service = "ChanServ"; name = "HALFOP"; command = "chanserv/halfop"; }
-command { service = "ChanServ"; name = "DEHALFOP"; command = "chanserv/dehalfop"; }
-command { service = "ChanServ"; name = "VOICE"; command = "chanserv/voice"; }
-command { service = "ChanServ"; name = "DEVOICE"; command = "chanserv/devoice"; }
-command { service = "ChanServ"; name = "PROTECT"; command = "chanserv/protect"; }
-command { service = "ChanServ"; name = "DEPROTECT"; command = "chanserv/deprotect"; }
-command { service = "ChanServ"; name = "OWNER"; command = "chanserv/owner"; }
-command { service = "ChanServ"; name = "DEOWNER"; command = "chanserv/deowner"; }
-
-/*
  * cs_register
  *
  * Provides the commands chanserv/register.
@@ -1220,6 +1199,119 @@ command { service = "ChanServ"; name = "AOP"; command = "chanserv/aop"; }
 command { service = "ChanServ"; name = "HOP"; command = "chanserv/hop"; }
 command { service = "ChanServ"; name = "VOP"; command = "chanserv/vop"; }
 
+/* Use m_rewrite to rewrite the op, deop, etc. commands (see modules.conf). */
+
+command
+{
+	service = "ChanServ"; name = "OWNER"; command = "rewrite"
+
+	rewrite = true
+	rewrite_souce = "OWNER $"
+	rewrite_target = "MODE $1 SET +q $2"
+
+	rewrite_description = "Gives you owner status on channel"
+}
+command
+{
+	service = "ChanServ"; name = "DEOWNER"; command = "rewrite"
+
+	rewrite = true
+	rewrite_source = "DEOWNER $"
+	rewrite_target = "MODE $1 SET -q $2"
+	
+	rewrite_description = "Removes your owner status on a channel"
+}
+
+command
+{
+	service = "ChanServ"; name = "PROTECT"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "PROTECT $"
+	rewrite_target = "MODE $1 SET +a $2"
+	
+	rewrite_description = "Protects a selected nick on a channel"
+}
+command
+{
+	service = "ChanServ"; name = "DEPROTECT"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "DEPROTECT $"
+	rewrite_target = "MODE $1 SET -a $2"
+	
+	rewrite_description = "Deprotects a selected nick on a channel"
+}
+
+command
+{
+	service = "ChanServ"; name = "OP"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "OP $"
+	rewrite_target = "MODE $1 SET +o $2"
+	
+	rewrite_description = "Gives Op status to a selected nick on a channel"
+}
+
+command
+{
+	service = "ChanServ"; name = "DEOP"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "DEOP $"
+	rewrite_target = "MODE $1 SET -o $2";
+	
+	rewrite_description = "Deops a selected nick on a channel"
+}
+
+/* HALFOP and DEHALFOP commands */
+command
+{
+	service = "ChanServ"; name = "HALFOP"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "HALFOP $"
+	rewrite_target = "MODE $1 SET +h $2"
+	
+	rewrite_description = "Halfops a selected nick on a channel"
+
+}
+command
+{
+	service = "ChanServ"; name = "DEHALFOP"; command = "rewrite"
+
+	rewrite = true
+	rewrite_source = "DEHALFOP $"
+	rewrite_target = "MODE $1 SET -h $2"
+	
+	rewrite_description = "Dehalfops a selected nick on a channel"
+}
+
+/* VOICE and DEVOICE commands */
+command
+{
+	service = "ChanServ"; name = "VOICE"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "VOICE $"
+	rewrite_target = "MODE $1 SET +v $2"
+	
+	rewrite_description = "Voices a selected nick on a channel"
+}
+
+command
+{
+	service = "ChanServ"; name = "DEVOICE"; command = "rewrite";
+
+	rewrite = true
+	rewrite_source = "DEVOICE $"
+	rewrite_target = "MODE $1 SET -v $2"
+
+	rewrite_description = "Devoices a selected nick on a channel"
+}
+
+
 /*
  * Extra ChanServ related modules.
  */
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 0bc9d99b8..ce864f4f9 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -500,23 +500,34 @@ module { name = "m_regex_pcre" }
 /*
  * m_rewrite
  *
+ * Provides the command rewrite.
+ *
  * Allows rewriting commands sent to clients.
  */
-#module { name = "m_rewrite" }
-rewrite
-{
-	/* The client to apply this rewrite to. */
-	client = "ChanServ"
-
-	/* Source message to match. A $ can be used to match anything. */
-	source_message = "CLEAR $ USERS"
-	
-	/*
-	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
-	 * replaced by the number-th word from the source_message, starting from 0.
-	 */
-	target_message = "KICK $1 *"
-}
+module { name = "m_rewrite" }
+#command
+#{
+#	service = "ChanServ"; name = "CLEAR"; command = "rewrite"
+#
+#	/* Enable m_rewrite */
+#	rewrite = true
+#
+#	/* Source message to match. A $ can be used to match anything. */
+#	rewrite_source = "CLEAR $ USERS"
+#
+#	/*
+#	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
+#	 * replaced by the number-th word from the source_message, starting from 0.
+#	 */
+#	rewrite_target = "KICK $1 *"
+#
+#	/*
+#	 * The command description. This only shows up in HELP's output.
+#	 * Comment this option to prevent the command from showing in the
+#	 * HELP command.
+#	 */
+#	rewrite_description = "Clears all users from a channel"
+#}
 
 /*
  * m_ssl