Add optional oper override umode +O.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / uid.cpp

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index eff5371199110a59d14f4ebd398506b38c5b14b1..905061cc73e6877d7a59db0af98027e69b766b4b 100644 (file)
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -50,12 +50,8 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        {
                // User that the incoming user is colliding with is not fully registered, we force nick change the
                // unregistered user to their uuid and tell them what happened
-               collideswith->WriteFrom(collideswith, "NICK %s", collideswith->uuid.c_str());
-               collideswith->WriteNumeric(ERR_NICKNAMEINUSE, collideswith->nick, "Nickname overruled.");
-
-               // Clear the bit before calling User::ChangeNick() to make it NOT run the OnUserPostNick() hook
-               collideswith->registered &= ~REG_NICK;
-               collideswith->ChangeNick(collideswith->uuid);
+               LocalUser* const localuser = static_cast<LocalUser*>(collideswith);
+               localuser->OverruleNick();
        }
        else if (collideswith)
        {
@@ -77,8 +73,8 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
        RemoteUser* _new = new SpanningTree::RemoteUser(params[0], remoteserver);
        ServerInstance->Users->clientlist[params[2]] = _new;
        _new->nick = params[2];
-       _new->host = params[3];
-       _new->dhost = params[4];
+       _new->ChangeRealHost(params[3], false);
+       _new->ChangeDisplayedHost(params[4]);
        _new->ident = params[5];
        _new->fullname = params.back();
        _new->registered = REG_ALL;
@@ -98,7 +94,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                if (!mh)
                        throw ProtocolException("Unrecognised mode '" + std::string(1, *v) + "'");
 
-               if (mh->GetNumParams(true))
+               if (mh->NeedsParam(true))
                {
                        if (paramptr >= params.size() - 1)
                                throw ProtocolException("Out of parameters while processing modes");
@@ -119,7 +115,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, std::vector<std::st
                _new->SetMode(mh, true);
        }
 
-       _new->SetClientIP(params[6].c_str());
+       _new->SetClientIP(params[6]);
 
        ServerInstance->Users->AddClone(_new);
        remoteserver->UserCount++;
@@ -161,11 +157,11 @@ CommandUID::Builder::Builder(User* user)
        push(user->uuid);
        push_int(user->age);
        push(user->nick);
-       push(user->host);
-       push(user->dhost);
+       push(user->GetRealHost());
+       push(user->GetDisplayedHost());
        push(user->ident);
        push(user->GetIPString());
        push_int(user->signon);
-       push('+').push_raw(user->FormatModes(true));
+       push(user->GetModeLetters(true));
        push_last(user->fullname);
 }