1
0
mirror of https://github.com/anope/anope.git synced 2026-06-27 10:46:38 +02:00

Replaced anope_cmd_message() with direct call to SendMessage() in IRCDProto class.

Also added SendMessageInternal() function to IRCDProto class, now SendMessage() is a stub to handle varargs.


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1333 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
Naram Qashat cyberbotx@cyberbotx.com
2008-10-02 18:50:20 +00:00
parent c48429eb75
commit a22c4bf1da
3 changed files with 18 additions and 7 deletions
-1
View File
@@ -1129,7 +1129,6 @@ E void anope_SendBanDel(const char *name, const char *nick); /
E void anope_SendBotOp(const char *nick, const char *chan); /* MODE BotServ */
E void anope_cmd_netinfo(int ac, const char **av); /* NETINFO */
E void anope_SendChangeBotNick(const char *oldnick, const char *newnick); /* NICK */
E void anope_cmd_message(const char *source, const char *dest, const char *fmt, ...); /* NOTICE */
E void anope_cmd_notice(const char *source, const char *dest, const char *msg); /* NOTICE */
E void anope_SendGlobalNotice(const char *source, const char *dest, const char *msg); /* NOTICE */
E void anope_SendPart(const char *nick, const char *chan, const char *fmt, ...); /* PART */
+17 -5
View File
@@ -1234,6 +1234,13 @@ class IRCDProto {
virtual void SendModeInternal(const char *, const char *, const char *) = 0;
virtual void SendKickInternal(const char *, const char *, const char *, const char *) = 0;
virtual void SendNoticeChanopsInternal(const char *, const char *, const char *) = 0;
virtual void SendMessageInternal(BotInfo *bi, const char *dest, const char *buf)
{
if (NSDefFlags & NI_MSG)
SendPrivmsg(bi, dest, buf);
else
SendNotice(bi, dest, buf);
}
public:
virtual void SendSVSNOOP(const char *, int) { }
virtual void SendAkillDel(const char *, const char *) = 0;
@@ -1287,12 +1294,17 @@ class IRCDProto {
}
SendNoticeChanopsInternal(source, dest, buf);
}
virtual void SendMessage(BotInfo *bi, const char *dest, const char *buf)
virtual void SendMessage(const char *source, const char *dest, const char *fmt, ...)
{
if (NSDefFlags & NI_MSG)
SendPrivmsg(bi, dest, buf);
else
SendNotice(bi, dest, buf);
va_list args;
char buf[BUFSIZE] = "";
if (fmt) {
va_start(args, fmt);
vsnprintf(buf, BUFSIZE - 1, fmt, args);
va_end(args);
}
BotInfo *bi = findbot(source);
SendMessageInternal(bi, dest, buf);
}
virtual void SendNotice(BotInfo *bi, const char *dest, const char *msg)
{
+1 -1
View File
@@ -120,7 +120,7 @@ int m_privmsg(const char *source, const char *receiver, const char *msg)
if (!u) {
alog("%s: user record for %s not found", msg, source);
anope_cmd_message(receiver, source,
ircdproto->SendMessage(receiver, source,
getstring(NULL, USER_RECORD_NOT_FOUND));
return MOD_CONT;
}