From a635344582a13d935631fbe930d79d3788359c8a Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 25 Nov 2016 16:35:10 -0500 Subject: Rename most ext fields names to be consistent with everything else, add accessors for many --- modules/protocol/inspircd20.cpp | 6 +++--- modules/protocol/ratbox.cpp | 2 +- modules/protocol/unreal.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index a0f0e067f..cdba96abe 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -388,7 +388,7 @@ class InspIRCd20Proto : public IRCDProto void SendLogin(User *u, NickServ::Nick *na) override { /* InspIRCd uses an account to bypass chmode +R, not umode +r, so we can't send this here */ - if (na->GetAccount()->HasFieldS("UNCONFIRMED")) + if (na->GetAccount()->IsUnconfirmed()) return; Uplink::Send(Me, "METADATA", u->GetUID(), "accountname", na->GetAccount()->GetDisplay()); @@ -1054,7 +1054,7 @@ struct IRCDMessageMetadata : IRCDMessage } else if ((do_topiclock) && (params[1] == "topiclock")) { - bool mystate = c->ci->GetExt("TOPICLOCK"); + bool mystate = c->ci->IsTopicLock(); bool serverstate = (params[2] == "1"); if (mystate != serverstate) Uplink::Send(Me, "METADATA", c->name, "topiclock", mystate ? "1" : ""); @@ -1499,7 +1499,7 @@ class ProtoInspIRCd20 : public Module if (use_server_side_topiclock && Servers::Capab.count("TOPICLOCK") && ci->c) { - if (ci->HasFieldS("TOPICLOCK")) + if (ci->IsTopicLock()) SendChannelMetadata(ci->c, "topiclock", "1"); } } diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 3d013db9e..b316964c5 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -118,7 +118,7 @@ class RatboxProto : public IRCDProto void SendLogin(User *u, NickServ::Nick *na) override { - if (na->GetAccount()->HasFieldS("UNCONFIRMED")) + if (na->GetAccount()->IsUnconfirmed()) return; Uplink::Send(Me, "ENCAP", "*", "SU", u->GetUID(), na->GetAccount()->GetDisplay()); diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index 1eb40f4c3..8035e3987 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -354,7 +354,7 @@ class UnrealIRCdProto : public IRCDProto void SendLogin(User *u, NickServ::Nick *na) override { /* 3.2.10.4+ treats users logged in with accounts as fully registered, even if -r, so we can not set this here. Just use the timestamp. */ - if (Servers::Capab.count("ESVID") > 0 && !na->GetAccount()->HasFieldS("UNCONFIRMED")) + if (Servers::Capab.count("ESVID") > 0 && !na->GetAccount()->IsUnconfirmed()) IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %s", na->GetAccount()->GetDisplay().c_str()); else IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %d", u->signon); -- cgit