diff options
| author | Alexander Barton <alex@barton.de> | 2012-08-26 19:42:08 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-08-26 19:42:08 +0200 |
| commit | 55859c1befa7cd04a130f1816cb73a9629637105 (patch) | |
| tree | 13fb1ff6c7c090b730bcb97162bddef7291c0dd5 /src | |
| parent | bcefdef1eaed14d3156b7fb5b9ad6d3b7078efcf (diff) | |
| parent | a5984c702ae3d141d0fff70b0b634b47dade72c3 (diff) | |
| download | ngircd-55859c1befa7cd04a130f1816cb73a9629637105.tar.gz ngircd-55859c1befa7cd04a130f1816cb73a9629637105.zip | |
Merge branch 'better-chan-errors'
By Alexander Barton (1) and DNS777 (1) * better-chan-errors: Remove unused ERR_CANNOTSENDTOCHAN2_MSG message Add some more information to channel error numerics
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/messages.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h index 9ad6be17..d2e04dbf 100644 --- a/src/ngircd/messages.h +++ b/src/ngircd/messages.h @@ -99,7 +99,7 @@ #define ERR_NOSUCHNICK_MSG "401 %s %s :No such nick or channel name" #define ERR_NOSUCHSERVER_MSG "402 %s %s :No such server" #define ERR_NOSUCHCHANNEL_MSG "403 %s %s :No such channel" -#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel" +#define ERR_CANNOTSENDTOCHAN_MSG "404 %s %s :Cannot send to channel (+m) -- Moderated" #define ERR_TOOMANYCHANNELS_MSG "405 %s %s :You have joined too many channels" #define ERR_WASNOSUCHNICK_MSG "406 %s %s :There was no such nickname" #define ERR_NOORIGIN_MSG "409 %s :No origin specified" @@ -124,14 +124,14 @@ #define ERR_NEEDMOREPARAMS_MSG "461 %s %s :Syntax error" #define ERR_ALREADYREGISTRED_MSG "462 %s :Connection already registered" #define ERR_PASSWDMISMATCH_MSG "464 %s :Invalid password" -#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l)" -#define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" -#define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O)" -#define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R)" +#define ERR_CHANNELISFULL_MSG "471 %s %s :Cannot join channel (+l) -- Channel is too full, try later" +#define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z) -- SSL connections only" +#define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O) -- IRC opers only" +#define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R) -- Registered users only" #define ERR_UNKNOWNMODE_MSG "472 %s %c :is unknown mode char for %s" -#define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" -#define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)" -#define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k)" +#define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i) -- Invited users only" +#define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b) -- You are banned" +#define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k) -- Wrong channel key" #define ERR_NOCHANMODES_MSG "477 %s %s :Channel doesn't support modes" #define ERR_LISTFULL_MSG "478 %s %s %s: Channel list is full (%d)" #define ERR_NOPRIVILEGES_MSG "481 %s :Permission denied" |