X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fproto-common.c;h=f6a852f7ad06ff214223350e2ae22f9b01eb0bc6;hb=8dc0ed773a18db4559d883d1a65c742c8ad45b29;hp=618643c831414d54d30223a25acf78123c943a6a;hpb=7f6e904e0c4997a20aca704cfa6908d245f6ed40;p=srvx.git diff --git a/src/proto-common.c b/src/proto-common.c index 618643c..f6a852f 100644 --- a/src/proto-common.c +++ b/src/proto-common.c @@ -442,8 +442,9 @@ privmsg_chan_helper(struct chanNode *cn, void *data) /* Never send a NOTICE to a channel to one of the services */ cf = &chanmsg_funcs[(unsigned char)pd->text[0]]; - if (!pd->is_notice && cf->func && GetUserMode(cn, cf->service) && !IsDeaf(cf->service)) - cf->func(pd->user, cn, pd->text+1, cf->service); + if (cf->func && !pd->is_notice + && GetUserMode(cn, cf->service) && !IsDeaf(cf->service)) + cf->func(pd->user, cn, pd->text+1, cf->service, pd->is_notice); /* This catches *all* text sent to the channel that the services server sees */ for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) { @@ -451,7 +452,7 @@ privmsg_chan_helper(struct chanNode *cn, void *data) if (!cf->func) break; /* end of list */ else - cf->func(pd->user, cn, pd->text, cf->service); + cf->func(pd->user, cn, pd->text, cf->service, pd->is_notice); } }