mirror of
https://github.com/anope/anope.git
synced 2026-06-29 12:56:38 +02:00
Mark some stuff deprecated, move implementation from the interface into the user class.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1206 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
+2
-11
@@ -100,17 +100,8 @@ void notice_user(char *source, User * u, const char *fmt, ...)
|
||||
va_start(args, fmt);
|
||||
vsnprintf(buf, BUFSIZE - 1, fmt, args);
|
||||
|
||||
/* 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 && ((!u->na && (NSDefFlags & NI_MSG))
|
||||
|| (u->na && (u->na->nc->flags & NI_MSG)))) {
|
||||
anope_cmd_privmsg2(source, u->nick, buf);
|
||||
} else {
|
||||
anope_cmd_notice2(source, u->nick, buf);
|
||||
}
|
||||
u->SendMessage(source, buf);
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
}
|
||||
|
||||
+36
@@ -260,6 +260,42 @@ User::~User()
|
||||
alog("debug: User::~User() done");
|
||||
}
|
||||
|
||||
void User::SendMessage(const char *source, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
char buf[BUFSIZE];
|
||||
*buf = '\0';
|
||||
|
||||
if (fmt)
|
||||
{
|
||||
va_start(args, fmt);
|
||||
vsnprintf(buf, BUFSIZE - 1, fmt, args);
|
||||
|
||||
this->SendMessage(source, std::string(buf));
|
||||
|
||||
va_end(args);
|
||||
}
|
||||
}
|
||||
|
||||
void User::SendMessage(const char *source, const std::string &msg)
|
||||
{
|
||||
/* 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 &&
|
||||
((!this->na && NSDefFlags & NI_MSG) || (this->na && this->na->nc->flags & NI_MSG)))
|
||||
{
|
||||
anope_cmd_privmsg2(source, this->nick, msg.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
anope_cmd_notice2(source, this->nick, msg.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************************************************/
|
||||
/*************************************************************************/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user