Merge the addline/delline source files.

2 files changed, 15 insertions, 44 deletions

diff --git a/modules/spanningtree/delline.cpp b/modules/spanningtree/delline.cpp
deleted file mode 100644
index 673d0801a..000000000
--- a/modules/spanningtree/delline.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
- *   Copyright (C) 2018, 2020, 2023 Sadie Powell <sadie@sadiepowell.dev>
- *   Copyright (C) 2013, 2015 Attila Molnar <attilamolnar@hush.com>
- *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
- *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
- *   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
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include "inspircd.h"
-#include "xline.h"
-
-#include "commands.h"
-
-CmdResult CommandDelLine::Handle(User* user, Params& params)
-{
-	const std::string& setter = user->nick;
-	std::string reason;
-
-	// XLineManager::DelLine() returns true if the xline existed, false if it didn't
-	if (ServerInstance->XLines->DelLine(params[1], params[0], reason, user))
-	{
-		ServerInstance->SNO.WriteToSnoMask('X', "{} removed {}{} on {}: {}", setter,
-			params[0], params[0].length() <= 2 ? "-line" : "", params[1], reason);
-		return CmdResult::SUCCESS;
-	}
-	return CmdResult::FAILURE;
-}
diff --git a/modules/spanningtree/addline.cpp b/modules/spanningtree/xline.cpp
index b90f68948..4a25246bf 100644
--- a/modules/spanningtree/addline.cpp
+++ b/modules/spanningtree/xline.cpp
@@ -94,3 +94,18 @@ CommandAddLine::Builder::Builder(XLine* xline, User* user)
 	Push(xline->duration);
 	Push(xline->reason);
 }
+
+CmdResult CommandDelLine::Handle(User* user, Params& params)
+{
+	const std::string& setter = user->nick;
+	std::string reason;
+
+	// XLineManager::DelLine() returns true if the xline existed, false if it didn't
+	if (ServerInstance->XLines->DelLine(params[1], params[0], reason, user))
+	{
+		ServerInstance->SNO.WriteToSnoMask('X', "{} removed {}{} on {}: {}", setter,
+			params[0], params[0].length() <= 2 ? "-line" : "", params[1], reason);
+		return CmdResult::SUCCESS;
+	}
+	return CmdResult::FAILURE;
+}