Fix to new API

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index ddcb04940603b2b291a9782232e677128535a635..9313899f74573c93907086f817881c3782a25023 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -23,13 +23,12 @@
 #include "modules.h"
 #include "commands.h"
 #include "xline.h"
-#include "dnsqueue.h"
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "commands/cmd_nick.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
@@ -80,7 +79,7 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                if (MOD_RESULT)
                        return;
                if (user->registered == REG_ALL)
-                       WriteCommon(user,"NICK %s",parameters[0]);
+                       user->WriteCommon("NICK %s",parameters[0]);
                strlcpy(user->nick, parameters[0], NICKMAX - 1);
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
                return;
@@ -93,19 +92,19 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                }
                if (matches_qline(parameters[0]))
                {
-                       WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
-                       WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
+                       ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0]));
+                       user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0]));
                        return;
                }
-               if ((Find(parameters[0])) && (Find(parameters[0]) != user))
+               if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user))
                {
-                       WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+                       user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
                        return;
                }
        }
        if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user)))
        {
-               WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
+               user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
                return;
        }
 
@@ -118,14 +117,14 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        return;
                }
 
-               WriteCommon(user,"NICK %s",parameters[0]);
+               user->WriteCommon("NICK %s",parameters[0]);
                
        }
 
        strlcpy(oldnick, user->nick, NICKMAX - 1);
 
        /* change the nick of the user in the users_hash */
-       user = ReHashNick(user->nick, parameters[0]);
+       user = user->UpdateNickHash(parameters[0]);
        /* actually change the nick within the record */
        if (!user) return;
        if (!user->nick) return;
@@ -143,13 +142,13 @@ void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                //if (user->dns_done)
                //      log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
 
-               if (Config->NoUserDns)
+               if (ServerInstance->Config->NoUserDns)
                {
                        user->dns_done = true;
                }
                else
                {
-                       user->dns_done = (!lookup_dns(user->nick));
+                       user->StartDNSLookup();
                        if (user->dns_done)
                                log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick);
                }