Move op/deop/etc back to an actual command, its too hard to use cs_log with it as rewrites. Allow cs_log to work with either command names or service names.

3 files changed, 67 insertions, 141 deletions

diff --git a/data/botserv.example.conf b/data/botserv.example.conf
index 299289416..e93810c81 100644
--- a/data/botserv.example.conf
+++ b/data/botserv.example.conf
@@ -352,10 +352,16 @@ fantasy { name = "AKICK"; command = "chanserv/akick"; }
 fantasy { name = "AOP"; command = "chanserv/xop"; }
 fantasy { name = "BAN"; command = "chanserv/ban"; }
 fantasy { name = "CLONE"; command = "chanserv/clone"; }
+fantasy { name = "DEHALFOP"; command = "chanserv/modes"; }
+fantasy { name = "DEOP"; command = "chanserv/modes"; }
+fantasy { name = "DEOWNER"; command = "chanserv/modes"; }
+fantasy { name = "DEPROTECT"; command = "chanserv/modes"; }
+fantasy { name = "DEVOICE"; command = "chanserv/modes"; }
 fantasy { name = "DOWN"; command = "chanserv/down"; }
 fantasy { name = "ENFORCE"; command = "chanserv/enforce"; }
 fantasy { name = "ENTRYMSG"; command = "chanserv/entrymsg"; }
 fantasy { name = "FLAGS"; command = "chanserv/flags"; }
+fantasy { name = "HALFOP"; command = "chanserv/modes"; }
 fantasy { name = "HELP"; command = "generic/help"; prepend_channel = false; }
 fantasy { name = "HOP"; command = "chanserv/xop"; }
 fantasy { name = "INFO"; command = "chanserv/info"; prepend_channel = false; }
@@ -367,6 +373,9 @@ fantasy { name = "LEVELS"; command = "chanserv/levels"; }
 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/modes"; }
+fantasy { name = "OWNER"; command = "chanserv/modes"; }
+fantasy { name = "PROTECT"; command = "chanserv/modes"; }
 fantasy { name = "QOP"; command = "chanserv/xop"; }
 fantasy { name = "SEEN"; command = "chanserv/seen"; prepend_channel = false; }
 fantasy { name = "SOP"; command = "chanserv/xop"; }
@@ -377,20 +386,5 @@ fantasy { name = "TOPIC"; command = "chanserv/topic"; }
 fantasy { name = "UNBAN"; command = "chanserv/unban"; }
 fantasy { name = "UNSUSPEND"; command = "chanserv/unsuspend"; permission = "chanserv/suspend"; }
 fantasy { name = "UP"; command = "chanserv/up"; }
+fantasy { name = "VOICE"; command = "chanserv/modes"; }
 fantasy { name = "VOP"; command = "chanserv/xop"; }
-
-/* 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 fb7daf26a..1f7cd0bea 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -558,7 +558,7 @@ privilege
 /*
  * OP privilege.
  *
- * Used by chanserv/mode, chanserv/op and chanserv/deop.
+ * Used by chanserv/mode, chanserv/modes.
  *
  * Users with this permission can use ChanServ to op and deop
  * others in the channel.
@@ -575,7 +575,7 @@ privilege
 /*
  * OPME privilege.
  *
- * Used by chanserv/mode, chanserv/op and chanserv/deop.
+ * Used by chanserv/mode, chanserv/modes.
  *
  * Users with this permission can use ChanServ to op and deop
  * themselves in the channel.
@@ -592,7 +592,7 @@ privilege
 /*
  * OWNER privilege.
  *
- * Used by chanserv/mode, chanserv/owner and chanserv/deowner.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to owner and deowner
  * others in the channel.
@@ -609,7 +609,7 @@ privilege
 /*
  * OWNERME privilege.
  *
- * Used by chanserv/mode, chanserv/owner and chanserv/deowner.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to owner and deowner
  * themselves in the channel.
@@ -626,7 +626,7 @@ privilege
 /*
  * PROTECT privilege.
  *
- * Used by chanserv/mode, chanserv/protect and chanserv/deprotect.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to protect and deprotect
  * others in the channel.
@@ -643,7 +643,7 @@ privilege
 /*
  * PROTECTME privilege.
  *
- * Used by chanserv/mode, chanserv/protect and chanserv/deprotect.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to protect and deprotect
  * themselves in the channel.
@@ -745,7 +745,7 @@ privilege
 /*
  * VOICE privilege.
  *
- * Used by chanserv/mode, chanserv/voice and chanserv/devoice.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to voice and devoice
  * others in the channel.
@@ -762,7 +762,7 @@ privilege
 /*
  * VOICEME privilege.
  *
- * Used by chanserv/mode, chanserv/voice and chanserv/devoice.
+ * Used by chanserv/mode and chanserv/modes.
  *
  * Users with this permission can use ChanServ to voice and devoice
  * themselves in the channel.
@@ -989,19 +989,65 @@ command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/pr
  *
  * Use for configuring what actions on channels are logged and where.
  */
-module { name = "cs_log" }
+module
+{
+	name = "cs_log"
+
+	/* Default log settings for newly registered channels */
+
+	#default
+	{
+		command = "chanserv/modes"
+		method = "MESSAGE @"
+	}
+
+	#default
+	{
+		service = "ChanServ"
+		command = "ACCESS"
+		method = "MESSAGE @"
+	}
+
+	#default
+	{
+		command = "chanserv/xop"
+		method = "MESSAGE @"
+	}
+
+	#default
+	{
+		service = "ChanServ"
+		command = "FLAGS"
+		method = "MESSAGE @"
+	}
+}
 command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group = "chanserv/management"; }
 
 /*
  * cs_mode
  *
- * Provides the command chanserv/mode.
+ * Provides the command chanserv/mode and chanserv/modes.
  *
  * Used for changing mode locks and changing modes.
  */
 module { name = "cs_mode" }
 command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management"; }
 
+command { service = "ChanServ"; name = "OWNER"; command = "chanserv/modes"; group = "chanserv/status"; set = "OWNER" }
+command { service = "ChanServ"; name = "DEOWNER"; command = "chanserv/modes"; group = "chanserv/status"; unset = "OWNER" }
+
+command { service = "ChanServ"; name = "PROTECT"; command = "chanserv/modes"; group = "chanserv/status"; set = "PROTECT" }
+command { service = "ChanServ"; name = "DEPROTECT"; command = "chanserv/modes"; group = "chanserv/status"; unset = "PROTECT" }
+
+command { service = "ChanServ"; name = "OP"; command = "chanserv/modes"; group = "chanserv/status"; set = "OP" }
+command { service = "ChanServ"; name = "DEOP"; command = "chanserv/modes"; group = "chanserv/status"; unset = "OP" }
+
+command { service = "ChanServ"; name = "HALFOP"; command = "chanserv/modes"; group = "chanserv/status"; set = "HALFOP" }
+command { service = "ChanServ"; name = "DEHALFOP"; command = "chanserv/modes"; group = "chanserv/status"; unset = "HALFOP" }
+
+command { service = "ChanServ"; name = "VOICE"; command = "chanserv/modes"; group = "chanserv/status"; set = "VOICE" }
+command { service = "ChanServ"; name = "DEVOICE"; command = "chanserv/modes"; group = "chanserv/status"; unset = "VOICE" }
+
 /*
  * cs_register
  *
@@ -1192,120 +1238,6 @@ command { service = "ChanServ"; name = "HOP"; command = "chanserv/xop"; group =
 command { service = "ChanServ"; name = "VOP"; command = "chanserv/xop"; group = "chanserv/access"; }
 
 
-/* Use m_rewrite to rewrite the op, deop, etc. commands (see modules.conf). */
-
-/* OWNER and DEOWNER commands */
-command
-{
-	service = "ChanServ"; name = "OWNER"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "OWNER $"
-	rewrite_target = "MODE $1 SET +q $2"
-
-	rewrite_description = _("Gives you or a specified nick owner status on a channel")
-}
-command
-{
-	service = "ChanServ"; name = "DEOWNER"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "DEOWNER $"
-	rewrite_target = "MODE $1 SET -q $2"
-
-	rewrite_description = _("Removes owner status from you or a specified nick on a channel")
-}
-
-/* PROTECT and DEPROTECT commands */
-command
-{
-	service = "ChanServ"; name = "PROTECT"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "PROTECT $"
-	rewrite_target = "MODE $1 SET +a $2"
-
-	rewrite_description = _("Protects you or a specified nick on a channel")
-}
-command
-{
-	service = "ChanServ"; name = "DEPROTECT"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "DEPROTECT $"
-	rewrite_target = "MODE $1 SET -a $2"
-
-	rewrite_description = _("Deprotects you or a specified nick on a channel")
-}
-
-/* OP and DEOP commands */
-command
-{
-	service = "ChanServ"; name = "OP"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "OP $"
-	rewrite_target = "MODE $1 SET +o $2"
-
-	rewrite_description = _("Gives operator status to you or a specified nick on a channel")
-}
-command
-{
-	service = "ChanServ"; name = "DEOP"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "DEOP $"
-	rewrite_target = "MODE $1 SET -o $2";
-
-	rewrite_description = _("Deops you or a specified nick on a channel")
-}
-
-/* HALFOP and DEHALFOP commands */
-command
-{
-	service = "ChanServ"; name = "HALFOP"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "HALFOP $"
-	rewrite_target = "MODE $1 SET +h $2"
-
-	rewrite_description = _("Halfops you or a specified nick on a channel")
-
-}
-command
-{
-	service = "ChanServ"; name = "DEHALFOP"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "DEHALFOP $"
-	rewrite_target = "MODE $1 SET -h $2"
-
-	rewrite_description = _("Dehalfops you or a specified nick on a channel")
-}
-
-/* VOICE and DEVOICE commands */
-command
-{
-	service = "ChanServ"; name = "VOICE"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "VOICE $"
-	rewrite_target = "MODE $1 SET +v $2"
-
-	rewrite_description = _("Voices you or a specified nick on a channel")
-}
-command
-{
-	service = "ChanServ"; name = "DEVOICE"; command = "rewrite"; group = "chanserv/status"
-
-	rewrite = true
-	rewrite_source = "DEVOICE $"
-	rewrite_target = "MODE $1 SET -v $2"
-
-	rewrite_description = _("Devoices you or a specified nick on a channel")
-}
-
-
 /*
  * Extra ChanServ related modules.
  */
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 2c01245a4..28bef2850 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -555,7 +555,7 @@ module { name = "help" }
  *
  * Allows rewriting commands sent to/from clients.
  */
-module { name = "m_rewrite" }
+#module { name = "m_rewrite" }
 #command
 {
 	service = "ChanServ"; name = "CLEAR"; command = "rewrite"