- if (source->GetExt("nick_locked"))
- {
- WriteServ(user->fd,"946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
- return;
- }
- if (Srv->IsNick(std::string(parameters[1])))
- {
- server = user->server;
- me = Srv->GetServerName().c_str();
-
- if (server == me)
- {
- // give them a lock flag
- Srv->SendOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+std::string(parameters[0])+" to "+parameters[1]);
- Srv->ChangeUserNick(source,std::string(parameters[1]));
- // only attempt to set their lockflag after we know the change succeeded
- source = Srv->FindNick(std::string(parameters[1]));
- if (source)
- source->Extend("nick_locked", "ON");
- }
- else
- {
- WriteServ(user->fd,"947 %s %s :Can't lock the nickname of a non-local user",user->nick,source->nick);
- }
- }
+ return CMD_FAILURE;
+ }
+
+ // check if user is locked
+ if (source->GetExt("nick_locked", dummy))
+ {
+ user->WriteServ("946 %s %s :This user's nickname is already locked.",user->nick,source->nick);
+ return CMD_FAILURE;
+ }
+
+ // check nick is valid
+ if (!ServerInstance->IsNick(parameters[1]))
+ {
+ return CMD_FAILURE;
+ }
+
+ // let others know
+ ServerInstance->WriteOpers(std::string(user->nick)+" used NICKLOCK to change and hold "+parameters[0]+" to "+parameters[1]);
+
+ if (!source->ForceNickChange(parameters[1]))
+ {
+ // ugh, nickchange failed for some reason -- possibly existing nick?
+ userrec::QuitUser(ServerInstance, source, "Nickname collision");
+ return CMD_FAILURE;