pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-27 11:56:37 +02:00
Code Activity

Fix notices going to nicks instead of UIDs depending on protocol

Browse Source 
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1526 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Robin Burchell w00t@inspircd.org
2008-11-03 22:47:49 +00:00
parent 68bb357a61
commit d3d0bf2d61
1 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/send.c
+7 -26
View File
@@ -148,15 +148,16 @@ void notice_user(char *source, User * u, const char *fmt, ...)
*/
void notice_list(char *source, char *dest, char **text)
{
User *u = finduser(dest);
while (*text) {
/* Have to kludge around an ircII bug here: if a notice includes
* no text, it is ignored, so we replace blank lines by lines
* with a single space.
*/
if (**text) {
ircdproto->SendNotice(findbot(source), dest, *text);
u->SendMessage(source, *text);
} else {
ircdproto->SendNotice(findbot(source), dest, " ");
u->SendMessage(source, " ");
}
text++;
}
@@ -195,18 +196,8 @@ void notice_lang(const char *source, User * dest, int message, ...)
s += strcspn(s, "\n");
if (*s)
*s++ = 0;
/* Send privmsg instead of notice if:
* - UsePrivmsg is enabled
* - The user is not registered and NSDefMsg is enabled
* - The user is registered and has set /ns set msg on
*/
if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG))
|| (dest->na
&& (dest->na->nc->flags & NI_MSG)))) {
ircdproto->SendPrivmsg(findbot(source), dest->nick, *t ? t : " ");
} else {
ircdproto->SendNotice(findbot(source), dest->nick, *t ? t : " ");
}
dest->SendMessage(source, *t ? t : " ");
}
va_end(args);
}
@@ -251,18 +242,8 @@ void notice_help(const char *source, User * dest, int message, ...)
*s++ = 0;
strscpy(outbuf, t, sizeof(outbuf));
strnrepl(outbuf, sizeof(outbuf), "\1\1", source);
/* Send privmsg instead of notice if:
* - UsePrivmsg is enabled
* - The user is not registered and NSDefMsg is enabled
* - The user is registered and has set /ns set msg on
*/
if (UsePrivmsg && ((!dest->na && (NSDefFlags & NI_MSG))
|| (dest->na
&& (dest->na->nc->flags & NI_MSG)))) {
ircdproto->SendPrivmsg(findbot(source), dest->nick, *outbuf ? outbuf : " ");
} else {
ircdproto->SendNotice(findbot(source), dest->nick, *outbuf ? outbuf : " ");
}
dest->SendMessage(source, *outbuf ? outbuf : " ");
}
va_end(args);
}