From 2dba060c6a8a290921441ada1586ab43157be893 Mon Sep 17 00:00:00 2001 From: cyberbotx Date: Fri, 3 Apr 2009 21:16:33 +0000 Subject: Patch from DukePyrolator to include an OnUserNickChange() event to replace EVENT_CHANGE_NICK, also patch from me to have the ratbox protocol module send account data on login and logout. git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2254 5417fbe8-f217-4b02-8779-1006273d7864 --- src/protocol/inspircd12.cpp | 5 ++--- src/protocol/ratbox.c | 10 ++++++++++ src/users.c | 7 +++++-- 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index df7c1220b..8e9f88845 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -699,13 +699,12 @@ class InspIRCdProto : public IRCDProto } } - void SendAccountLogin(User *u, NickCore *account) + void SendAccountLogin(User *u, NickCore *account) { send_cmd(TS6SID, "METADATA %s accountname :%s", u->GetUID().c_str(), account->display); - } - void SendAccountLogout(User *u, NickCore *account) + void SendAccountLogout(User *u, NickCore *account) { send_cmd(TS6SID, "METADATA %s accountname :", u->GetUID().c_str()); } diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index 4829377d9..d87d0b64e 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -663,6 +663,16 @@ class RatboxProto : public IRCDTS6Proto send_cmd(source->uid, "INVITE %s %s", u ? u->GetUID().c_str(): nick, chan); } + void SendAccountLogin(User *u, NickCore *account) + { + send_cmd(TS6SID, "ENCAP * SU %s %s", u->GetUID().c_str(), account->display); + } + + void SendAccountLogout(User *u, NickCore *account) + { + send_cmd(TS6SID, "ENCAP * SU %s", u->GetUID().c_str()); + } + int IsNickValid(const char *nick) { /* TS6 Save extension -Certus */ diff --git a/src/users.c b/src/users.c index dd232e713..25e52404c 100644 --- a/src/users.c +++ b/src/users.c @@ -687,7 +687,7 @@ User *do_nick(const char *source, const char *nick, const char *username, const } user->SetNewNick(nick); - send_event(EVENT_CHANGE_NICK, 1, nick); + FOREACH_MOD(I_OnUserNickChange, OnUserNickChange(user, source)); if ((old_na ? old_na->nc : NULL) == user->nc) nc_changed = 0; @@ -700,7 +700,10 @@ User *do_nick(const char *source, const char *nick, const char *username, const } else { - ircdproto->SendUnregisteredNick(user); + if (!nick_identified(user) || !nick_recognized(user)) + { + ircdproto->SendUnregisteredNick(user); + } } } -- cgit