diff --git a/include/account.h b/include/account.h index c0260da6d..4f2390edf 100644 --- a/include/account.h +++ b/include/account.h @@ -48,7 +48,6 @@ private: public: Anope::string nick; Anope::string last_quit; - Anope::string last_realname; /* Last cloaked user@host this nick was seen using. */ Anope::string last_userhost; /* Last real user@host this nick was seen using. */ diff --git a/modules/ldap_authentication.cpp b/modules/ldap_authentication.cpp index 4f127c00a..6d57599e7 100644 --- a/modules/ldap_authentication.cpp +++ b/modules/ldap_authentication.cpp @@ -107,7 +107,6 @@ public: if (na == NULL) { na = new NickAlias(ii->req->GetAccount(), new NickCore(ii->req->GetAccount())); - na->last_realname = ii->user ? ii->user->realname : ii->req->GetAccount(); FOREACH_MOD(OnNickRegister, (ii->user, na, ii->req->GetPassword())); BotInfo *NickServ = Config->GetClient("NickServ"); if (ii->user && NickServ) diff --git a/modules/nickserv/ns_group.cpp b/modules/nickserv/ns_group.cpp index 0137de8f9..3572574b9 100644 --- a/modules/nickserv/ns_group.cpp +++ b/modules/nickserv/ns_group.cpp @@ -56,15 +56,7 @@ public: if (u != NULL) { na->last_userhost = u->GetIdent() + "@" + u->GetDisplayedHost(); - na->last_realname = u->realname; - } - else - { - na->last_realname = source.GetNick(); - } - if (u != NULL) - { IRCD->SendLogin(u, na); // protocol modules prevent this on unconfirmed accounts u->Login(target->nc); FOREACH_MOD(OnNickGroup, (u, target)); diff --git a/modules/nickserv/ns_info.cpp b/modules/nickserv/ns_info.cpp index 837b0d59c..c56250c4f 100644 --- a/modules/nickserv/ns_info.cpp +++ b/modules/nickserv/ns_info.cpp @@ -78,7 +78,7 @@ public: if (has_auspex || na->nc == source.GetAccount()) show_hidden = true; - source.Reply(_("%s is %s"), na->nick.c_str(), na->last_realname.c_str()); + source.Reply(_("Information about nick \002%s\002:"), na->nick.c_str()); if (na->nc->HasExt("UNCONFIRMED")) source.Reply(_("%s is an unconfirmed nickname."), na->nick.c_str()); diff --git a/modules/nickserv/ns_register.cpp b/modules/nickserv/ns_register.cpp index c78e5b6bc..4629f56ea 100644 --- a/modules/nickserv/ns_register.cpp +++ b/modules/nickserv/ns_register.cpp @@ -140,12 +140,7 @@ public: nc->pass = encpass; if (u) - { na->last_userhost = u->GetIdent() + "@" + u->GetDisplayedHost(); - na->last_realname = u->realname; - } - else - na->last_realname = source.GetNick(); Log(LOG_COMMAND, source, this) << "to register " << na->nick << " (email: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")"; diff --git a/modules/nickserv/ns_update.cpp b/modules/nickserv/ns_update.cpp index 9a182bc6a..cac765140 100644 --- a/modules/nickserv/ns_update.cpp +++ b/modules/nickserv/ns_update.cpp @@ -27,10 +27,7 @@ public: NickAlias *na = NickAlias::Find(u->nick); if (na && na->nc == source.GetAccount()) - { - na->last_realname = u->realname; na->last_seen = Anope::CurTime; - } FOREACH_MOD(OnNickUpdate, (u)); diff --git a/src/nickalias.cpp b/src/nickalias.cpp index b1ff140f8..e086c535f 100644 --- a/src/nickalias.cpp +++ b/src/nickalias.cpp @@ -155,7 +155,6 @@ void NickAlias::Type::Serialize(Serializable *obj, Serialize::Data &data) const const auto *na = static_cast(obj); data.Store("nick", na->nick); data.Store("last_quit", na->last_quit); - data.Store("last_realname", na->last_realname); data.Store("last_userhost", na->last_userhost); data.Store("last_userhost_real", na->last_userhost_real); data.Store("registered", na->registered); @@ -208,7 +207,6 @@ Serializable *NickAlias::Type::Unserialize(Serializable *obj, Serialize::Data &d } data["last_quit"] >> na->last_quit; - data["last_realname"] >> na->last_realname; data["last_userhost"] >> na->last_userhost; data["last_userhost_real"] >> na->last_userhost_real; data["registered"] >> na->registered; diff --git a/src/users.cpp b/src/users.cpp index 850ab075c..34de0eaf4 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -278,9 +278,6 @@ void User::SetRealname(const Anope::string &srealname) this->realname = srealname; NickAlias *na = NickAlias::Find(this->nick); - if (na && this->IsIdentified(true)) - na->last_realname = srealname; - Log(this, "realname") << "changed realname to " << srealname; } @@ -366,7 +363,6 @@ void User::Identify(NickAlias *na) { na->last_userhost = this->GetIdent() + "@" + this->GetDisplayedHost(); na->last_userhost_real = this->GetIdent() + "@" + this->host; - na->last_realname = this->realname; na->last_seen = Anope::CurTime; } @@ -524,8 +520,6 @@ void User::UpdateHost() { na->last_userhost = this->GetIdent() + "@" + this->GetDisplayedHost(); na->last_userhost_real = this->GetIdent() + "@" + this->host; - // This is called on signon, and if users are introduced with an account it won't update - na->last_realname = this->realname; } }