diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/commands/ns_register.cpp | 2 | ||||
-rw-r--r-- | modules/extra/m_xmlrpc_main.cpp | 2 | ||||
-rw-r--r-- | modules/protocol/hybrid.cpp | 5 | ||||
-rw-r--r-- | modules/protocol/inspircd-ts6.h | 2 | ||||
-rw-r--r-- | modules/protocol/ratbox.cpp | 1 | ||||
-rw-r--r-- | modules/pseudoclients/nickserv.cpp | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp index 4253b672b..f7675ca60 100644 --- a/modules/commands/ns_register.cpp +++ b/modules/commands/ns_register.cpp @@ -130,7 +130,7 @@ class CommandNSRegister : public Command return; } - if (u && !u->HasMode(UMODE_OPER) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay) + if (u && !u->HasMode(UMODE_OPER) && Config->NickRegDelay && Anope::CurTime - u->timestamp < Config->NickRegDelay) { source.Reply(_("You must have been using this nick for at least %d seconds to register."), Config->NickRegDelay); return; diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp index 94b655ad7..f3ed81d4d 100644 --- a/modules/extra/m_xmlrpc_main.cpp +++ b/modules/extra/m_xmlrpc_main.cpp @@ -202,7 +202,7 @@ class MyXMLRPCEvent : public XMLRPCEvent if (!u->ip.empty()) request->reply("ip", u->ip); request->reply("timestamp", stringify(u->timestamp)); - request->reply("signon", stringify(u->my_signon)); + request->reply("signon", stringify(u->signon)); if (u->Account()) { request->reply("account", iface->Sanitize(u->Account()->display)); 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<Anope::string> ¶ms) anope_override { - source.GetUser()->ChangeNick(params[0]); + source.GetUser()->ChangeNick(params[0], convertTo<time_t>(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; diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index caffd74d4..4115ee9b0 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -61,7 +61,7 @@ class NickServCollide : public Timer return; /* If they identified or don't exist anymore, don't kill them. */ NickAlias *na = findnick(u->nick); - if (!na || u->Account() == na->nc || u->my_signon > this->GetSetTime()) + if (!na || u->Account() == na->nc || u->timestamp > this->GetSetTime()) return; u->Collide(na); |