albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement user mode "b": block messages 

When a user has set mode "b", all private messages and notices to this
user are blocked if they don't originate from a registered user, an IRC Op,
server or service. The originator gets an error numeric sent back in this
case, ERR_CANNOTSENDTONICK_MSG(976), which is/was(?) used by KineIRCd, too.

This closes bug #144.
This commit is contained in:
DNS777 2012-10-08 12:11:04 +02:00 committed by Alexander Barton
parent 87deb43012
commit 9d97004a28
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Modes.txt
View File

@ -22,6 +22,7 @@ channels he is using at the moment.
mode since description
a 0.3.0 User is away.
b 20 User blocks private messages and notices.
B 20 User is flagged as a "bot".
c 17 IRC operator wants to receive connect/disconnect NOTICEs.
C 19 Only users that share a channel are allowed to send messages.

2
src/ngircd/defines.h
View File

@ -161,7 +161,7 @@
#endif
/** Supported user modes. */
#define USERMODES "aBcCioqrRswx"
#define USERMODES "abBcCioqrRswx"
/** Supported channel modes. */
#define CHANMODES "abehiIklmMnoOPqQrRstvVz"

1
src/ngircd/irc-mode.c
View File

@ -215,6 +215,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target )
/* Validate modes */
x[0] = '\0';
switch (*mode_ptr) {
case 'b': /* Block private msgs */
case 'C': /* Only messages from clients sharing a channel */
case 'i': /* Invisible */
case 's': /* Server messages */

11
src/ngircd/irc.c
View File

@ -500,6 +500,17 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
Req->command = "PRIVMSG";
}
#endif
if (Client_HasMode(cl, 'b') &&
!Client_HasMode(from, 'R') &&
!Client_HasMode(from, 'o') &&
!(Client_Type(from) == CLIENT_SERVER) &&
!(Client_Type(from) == CLIENT_SERVICE)) {
if (SendErrors && !IRC_WriteStrClient(from,
ERR_CANNOTSENDTONICK_MSG,
Client_ID(from), Client_ID(cl)))
return DISCONNECTED;
goto send_next_target;
}
if (Client_HasMode(cl, 'C')) {
cl2chan = Channel_FirstChannelOf(cl);

1
src/ngircd/messages.h
View File

@ -151,6 +151,7 @@
#define ERR_UMODEUNKNOWNFLAG2_MSG "501 %s :Unknown mode \"%c%c\""
#define ERR_USERSDONTMATCH_MSG "502 %s :Can't set/get mode for other users"
#define ERR_NOINVITE_MSG "518 %s :Cannot invite to %s (+V)"
#define ERR_CANNOTSENDTONICK_MSG "976 %s :Cannot send to user (+b) -- Only registered users can message %s"
#ifdef ZLIB
# define RPL_STATSLINKINFOZIP_MSG "211 %s %s %d %ld %ld/%ld %ld %ld/%ld :%ld"