Use new ALIAS support.

diff --git a/chanserv/chancmds/ban.c b/chanserv/chancmds/ban.c
deleted file mode 100644 (file)
index a42835b..0000000
--- a/chanserv/chancmds/ban.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Automatically generated by refactor.pl.
- *
- *
- * CMDNAME: ban
- * CMDLEVEL: QCMD_AUTHED | QCMD_ALIAS
- * CMDARGS: 3
- * CMDDESC: Permanently bans a hostmask on a channel.
- * CMDFUNC: csc_dopermban
- * CMDPROTO: int csc_dopermban(void *source, int cargc, char **cargv);
- * CMDHELP: Usage: BAN <channel> <hostmask> [<reason>]
- * CMDHELP: Permanently bans the provided hostmask on the channel.  If the ban is
- * CMDHELP: removed from the channel e.g. by a channel op or the BANTIMER feature, the
- * CMDHELP: ban will be reapplied if a matching user joins the channel.  Bans
- * CMDHELP: set with the PERMBAN command can be removed with BANCLEAR or BANDEL.  Any users
- * CMDHELP: matching the hostmask will be kicked from the channel.
- * CMDHELP: Where:
- * CMDHELP: channel  - channel to set a ban on
- * CMDHELP: hostmask - hostmask (nick!user@host) to ban.
- * CMDHELP: reason   - reason for the ban.  This will be used in kick messages when kicking
- * CMDHELP:            users matching the ban.  If this is not provided the generic message
- * CMDHELP:            \"Banned.\" will be used.
- * CMDHELP: BAN requires master (+m) access on the named channel.
- * CMDHELP: BAN is an alias for PERMBAN.
- */
-
-/* code in permban.c */

diff --git a/chanserv/chancmds/bandel.c b/chanserv/chancmds/bandel.c
index 0d53a41707764bb3eec5da4f481de3d70e83d595..7296b61024c6b71d6b454eaad5d45747dc251c59 100644 (file)
--- a/chanserv/chancmds/bandel.c
+++ b/chanserv/chancmds/bandel.c
@@ -2,12 +2,13 @@
  *
  *
  * CMDNAME: bandel
+ * CMDALIASES: unban
  * CMDLEVEL: QCMD_AUTHED
  * CMDARGS: 2
  * CMDDESC: Removes a single ban from a channel.
  * CMDFUNC: csc_dobandel
  * CMDPROTO: int csc_dobandel(void *source, int cargc, char **cargv);
- * CMDHELP: Usage: BANDEL <channel> <ban>
+ * CMDHELP: Usage: @UCOMMAND@ <channel> <ban>
  * CMDHELP: Removes the specified persistent or channel ban, where:
  * CMDHELP: channel - the channel to use
  * CMDHELP: ban     - either a ban mask (nick!user@host), or #number (see BANLIST)

diff --git a/chanserv/chancmds/permban.c b/chanserv/chancmds/permban.c
index 37de6c47fe1a13ae899e131c007d9716d5cf6e74..f96401076c985441e6b204b3a76fe9483ac59482 100644 (file)
--- a/chanserv/chancmds/permban.c
+++ b/chanserv/chancmds/permban.c
@@ -2,16 +2,17 @@
  *
  *
  * CMDNAME: permban
+ * CMDALIASES: ban
  * CMDLEVEL: QCMD_AUTHED
  * CMDARGS: 3
  * CMDDESC: Permanently bans a hostmask on a channel.
  * CMDFUNC: csc_dopermban
  * CMDPROTO: int csc_dopermban(void *source, int cargc, char **cargv);
- * CMDHELP: Usage: PERMBAN <channel> <hostmask> [<reason>]
+ * CMDHELP: Usage: @UCOMMAND@ <channel> <hostmask> [<reason>]
  * CMDHELP: Permanently bans the provided hostmask on the channel.  If the ban is
  * CMDHELP: removed from the channel e.g. by a channel op or the BANTIMER feature, the
  * CMDHELP: ban will be reapplied if a matching user joins the channel.  Bans
- * CMDHELP: set with the PERMBAN command can be removed with BANCLEAR or BANDEL.  Any users
+ * CMDHELP: set with the @UCOMMAND@ command can be removed with BANCLEAR or BANDEL.  Any users
  * CMDHELP: matching the hostmask will be kicked from the channel.
  * CMDHELP: Where:
  * CMDHELP: channel  - channel to set a ban on
@@ -19,7 +20,7 @@
  * CMDHELP: reason   - reason for the ban.  This will be used in kick messages when kicking
  * CMDHELP:            users matching the ban.  If this is not provided the generic message
  * CMDHELP:            \"Banned.\" will be used.
- * CMDHELP: PERMBAN requires master (+m) access on the named channel.
+ * CMDHELP: @UCOMMAND@ requires master (+m) access on the named channel.
  */
 
 #include "../chanserv.h"

diff --git a/chanserv/chancmds/unban.c b/chanserv/chancmds/unban.c
deleted file mode 100644 (file)
index 20b1453..0000000
--- a/chanserv/chancmds/unban.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * CMDNAME: unban
- * CMDLEVEL: QCMD_AUTHED | QCMD_ALIAS
- * CMDARGS: 2
- * CMDDESC: Removes a single ban from a channel.
- * CMDFUNC: csc_dobandel
- * CMDPROTO: int csc_dobandel(void *source, int cargc, char **cargv);
- * CMDHELP: Usage: UNBAN <channel> <ban>
- * CMDHELP: Removes the specified persistent or channel ban, where:
- * CMDHELP: channel - the channel to use
- * CMDHELP: ban     - either a ban mask (nick!user@host), or #number (see BANLIST)
- * CMDHELP: Removing channel bans requires operator (+o) access on the named channel.
- * CMDHELP: Removing persistent bans requires master (+m) access on the named channel.
- * CMDHELP: UNBAN is an alias for BANDEL.
- */
-
-/* This is an alias for BANDEL */
-