Only assign NewServices once the duplicate check is done.

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

diff --git a/src/modules/m_spanningtree/delline.cpp b/src/modules/m_spanningtree/delline.cpp
index 6ac70283c42e4335ce5ba613c0273be251c66cf4..a64576de5c57c3ffc71f94b42ff76b8810f4ea7e 100644 (file)
--- a/src/modules/m_spanningtree/delline.cpp
+++ b/src/modules/m_spanningtree/delline.cpp
@@ -1,6 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -20,35 +27,19 @@
 #include "inspircd.h"
 #include "xline.h"
 
-#include "treesocket.h"
-#include "treeserver.h"
-#include "utils.h"
+#include "commands.h"
 
-bool TreeSocket::DelLine(const std::string &prefix, parameterlist &params)
+CmdResult CommandDelLine::Handle(User* user, Params& params)
 {
-       if (params.size() < 2)
-               return true;
+       const std::string& setter = user->nick;
+       std::string reason;
 
-       std::string setter = "<unknown>";
-
-       User* user = ServerInstance->FindNick(prefix);
-       if (user)
-               setter = user->nick;
-       else
-       {
-               TreeServer* t = Utils->FindServer(prefix);
-               if (t)
-                       setter = t->GetName();
-       }
-
-
-       /* NOTE: No check needed on 'user', this function safely handles NULL */
-       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], user))
+       // XLineManager::DelLine() returns true if the xline existed, false if it didn't
+       if (ServerInstance->XLines->DelLine(params[1].c_str(), params[0], reason, user))
        {
-               ServerInstance->SNO->WriteToSnoMask('X',"%s removed %s%s on %s", setter.c_str(),
-                               params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str());
-               Utils->DoOneToAllButSender(prefix,"DELLINE", params, prefix);
+               ServerInstance->SNO->WriteToSnoMask('X', "%s removed %s%s on %s: %s", setter.c_str(),
+                               params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str(), reason.c_str());
+               return CMD_SUCCESS;
        }
-       return true;
+       return CMD_FAILURE;
 }
-