X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/18757dc0abae6c3e92027135b110b3cc8c0a6d80..2a4ca4f5366334e265a218563985abd4860b5d02:/src/helpfile.c diff --git a/src/helpfile.c b/src/helpfile.c index 37a51e1..b46d24a 100644 --- a/src/helpfile.c +++ b/src/helpfile.c @@ -5,7 +5,7 @@ * * x3 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -308,10 +308,18 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu if (irc_send) {} /* use that function */ - else if (hi) + else if(IsChannelName(to)) { + irc_send = irc_privmsg; + } + else if (message_dest->no_notice) { + irc_send = irc_privmsg; + } + else if (hi) { irc_send = HANDLE_FLAGGED(hi, USE_PRIVMSG) ? irc_privmsg : irc_notice; - else - irc_send = IsChannelName(to) ? irc_privmsg : irc_notice; + } + else { + irc_send = irc_notice; + } /* Limit size to how much we can show at once */ if (size > sizeof(line)) @@ -381,9 +389,13 @@ table_send(struct userNode *from, const char *to, unsigned int size, irc_send_fu /* Send the table. */ for (jj=0, pos=0, reps=0; ii