From 4fdc157f68d2034c243563269ae12b5c27885a18 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 14 Oct 2012 01:05:24 -0400 Subject: Better clarify signon vs timestamp and allow updating users timestamp to an ircd given value from NICK --- modules/protocol/hybrid.cpp | 5 +++-- modules/protocol/inspircd-ts6.h | 2 +- modules/protocol/ratbox.cpp | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 87388f0b3..74f0ee51e 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -352,7 +352,7 @@ struct IRCDMessageNick : IRCDMessage /* :0MCAAAAAB NICK newnick 1350157102 */ bool Run(MessageSource &source, const std::vector ¶ms) anope_override { - source.GetUser()->ChangeNick(params[0]); + source.GetUser()->ChangeNick(params[0], convertTo(params[1])); return true; } }; @@ -511,7 +511,7 @@ struct IRCDMessageSjoin : IRCDMessage * Don't trigger OnJoinChannel event then as the user will be destroyed */ if (MOD_RESULT != EVENT_STOP && c->ci && c->ci->CheckKick(u)) - continue; + continue; FOREACH_MOD(I_OnJoinChannel, OnJoinChannel(u, c)); } @@ -627,6 +627,7 @@ class ProtoHybrid : public Module CoreIRCDMessageTime core_message_time; CoreIRCDMessageTopic core_message_topic; CoreIRCDMessageVersion core_message_version; + CoreIRCDMessageWhois core_message_whois; /* Our message handlers */ IRCDMessageBMask message_bmask; diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h index 38dd7e15e..b3d3a7a36 100644 --- a/modules/protocol/inspircd-ts6.h +++ b/modules/protocol/inspircd-ts6.h @@ -203,7 +203,7 @@ class InspIRCdTS6Proto : public IRCDProto void SendClientIntroduction(const User *u) anope_override { Anope::string modes = "+" + u->GetModes(); - UplinkSocket::Message(Me) << "UID " << u->GetUID() << " " << u->timestamp << " " << u->nick << " " << u->host << " " << u->host << " " << u->GetIdent() << " 0.0.0.0 " << u->my_signon << " " << modes << " :" << u->realname; + UplinkSocket::Message(Me) << "UID " << u->GetUID() << " " << u->timestamp << " " << u->nick << " " << u->host << " " << u->host << " " << u->GetIdent() << " 0.0.0.0 " << u->timestamp << " " << modes << " :" << u->realname; } /* SERVER services-dev.chatspike.net password 0 :Description here */ diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 793347da6..4acf5e79a 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -561,6 +561,7 @@ class ProtoRatbox : public Module CoreIRCDMessageTime core_message_time; CoreIRCDMessageTopic core_message_topic; CoreIRCDMessageVersion core_message_version; + CoreIRCDMessageWhois core_message_whois; /* Our message handlers */ IRCDMessageBMask message_bmask; -- cgit