9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filter: send the failure response only on PRIVMSG

Browse source
This commit is contained in:
Ed Kellett 2018-08-14 22:41:24 +01:00
parent 744ac30804
commit d928bc7af3
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/filter.c
View file

@ -337,9 +337,11 @@ filter_msg_user(void *data_)
unsigned r = match_message("0", s, cmdname[data->msgtype], "0", data->text) | unsigned r = match_message("0", s, cmdname[data->msgtype], "0", data->text) |
match_message("1", s, cmdname[data->msgtype], "0", text); match_message("1", s, cmdname[data->msgtype], "0", text);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, if (data->msgtype == MESSAGE_TYPE_PRIVMSG) {
form_str(ERR_CANNOTSENDTOCHAN), sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
data->target_p->name); form_str(ERR_CANNOTSENDTOCHAN),
data->target_p->name);
}
data->approved = 1; data->approved = 1;
} }
if (r & ACT_ALARM) { if (r & ACT_ALARM) {
@ -373,9 +375,11 @@ filter_msg_channel(void *data_)
unsigned r = match_message("0", s, cmdname[data->msgtype], data->chptr->chname, data->text) | unsigned r = match_message("0", s, cmdname[data->msgtype], data->chptr->chname, data->text) |
match_message("1", s, cmdname[data->msgtype], data->chptr->chname, text); match_message("1", s, cmdname[data->msgtype], data->chptr->chname, text);
if (r & ACT_DROP) { if (r & ACT_DROP) {
sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN, if (data->msgtype == MESSAGE_TYPE_PRIVMSG) {
form_str(ERR_CANNOTSENDTOCHAN), sendto_one_numeric(s, ERR_CANNOTSENDTOCHAN,
data->chptr->chname); form_str(ERR_CANNOTSENDTOCHAN),
data->chptr->chname);
}
data->approved = 1; data->approved = 1;
} }
if (r & ACT_ALARM) { if (r & ACT_ALARM) {