From 360742bdf4e4aebd80e39a76903c4a8d726f3f44 Mon Sep 17 00:00:00 2001 From: Alexander F?r?y Date: Sat, 27 Feb 2010 01:08:41 +0100 Subject: [PATCH] Use RPL_QUIETLIST and RPL_ENDOFQUIETLIST instead of RPL_BANLIST and RPL_ENDOFBANLIST for channel mode +q. --- include/numeric.h | 3 +++ src/chmode.c | 9 +++------ src/messages.tab | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/numeric.h b/include/numeric.h index d60f283..a85c17e 100644 --- a/include/numeric.h +++ b/include/numeric.h @@ -364,6 +364,9 @@ extern const char *form_str(int); #define RPL_NOTESTLINE 726 #define RPL_TESTMASKGECOS 727 +#define RPL_QUIETLIST 728 +#define RPL_ENDOFQUIETLIST 729 + #define RPL_MONONLINE 730 #define RPL_MONOFFLINE 731 #define RPL_MONLIST 732 diff --git a/src/chmode.c b/src/chmode.c index 23491f7..3161b64 100644 --- a/src/chmode.c +++ b/src/chmode.c @@ -775,8 +775,8 @@ chm_ban(struct Client *source_p, struct Channel *chptr, case CHFL_QUIET: list = &chptr->quietlist; errorval = SM_ERR_RPL_Q; - rpl_list = RPL_BANLIST; - rpl_endlist = RPL_ENDOFBANLIST; + rpl_list = RPL_QUIETLIST; + rpl_endlist = RPL_ENDOFQUIETLIST; mems = ALL_MEMBERS; caps = 0; break; @@ -824,10 +824,7 @@ chm_ban(struct Client *source_p, struct Channel *chptr, me.name, source_p->name, chptr->chname, banptr->banstr, banptr->who, banptr->when); } - if (mode_type == CHFL_QUIET) - sendto_one(source_p, ":%s %d %s %s :End of Channel Quiet List", me.name, rpl_endlist, source_p->name, chptr->chname); - else - sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname); + sendto_one(source_p, form_str(rpl_endlist), me.name, source_p->name, chptr->chname); return; } diff --git a/src/messages.tab b/src/messages.tab index 481a0ca..c626aea 100644 --- a/src/messages.tab +++ b/src/messages.tab @@ -749,8 +749,8 @@ static const char * replies[] = { /* 725 RPL_TESTLINE */ ":%s 725 %s %c %ld %s :%s", /* 726 RPL_NOTESTLINE */ ":%s 726 %s %s :No matches", /* 727 RPL_TESTMASKGECOS */ ":%s 727 %s %d %d %s!%s@%s %s :Local/remote clients match", -/* 728 */ NULL, -/* 729 */ NULL, +/* 728 RPL_QUIETLIST */ ":%s 728 %s %s q %s %s %lu", +/* 729 RPL_ENDOFQUIETLIST */ ":%s 729 %s %s q :End of Channel Quiet List", /* 730 RPL_MONONLINE */ ":%s 730 %s :%s", /* 731 RPL_MONOFFLINE */ ":%s 731 %s :%s", /* 732 RPL_MONLIST */ ":%s 732 %s :%s",