From ba0d264cced5fef1ee583bb9c86d7a558fd8564a Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 25 Jun 2026 01:27:11 +0100 Subject: Merge the addline/delline source files. --- modules/spanningtree/addline.cpp | 96 --------------------------------- modules/spanningtree/delline.cpp | 44 ---------------- modules/spanningtree/xline.cpp | 111 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 140 deletions(-) delete mode 100644 modules/spanningtree/addline.cpp delete mode 100644 modules/spanningtree/delline.cpp create mode 100644 modules/spanningtree/xline.cpp (limited to 'modules') diff --git a/modules/spanningtree/addline.cpp b/modules/spanningtree/addline.cpp deleted file mode 100644 index b90f68948..000000000 --- a/modules/spanningtree/addline.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/* - * InspIRCd -- Internet Relay Chat Daemon - * - * Copyright (C) 2018, 2020-2023, 2025 Sadie Powell - * Copyright (C) 2013-2014 Attila Molnar - * Copyright (C) 2012 Robby - * Copyright (C) 2009 Uli Schlachter - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Robin Burchell - * Copyright (C) 2008 Craig Edwards - * - * 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 . - */ - - -#include "inspircd.h" -#include "timeutils.h" -#include "xline.h" - -#include "treeserver.h" -#include "utils.h" -#include "commands.h" - -CmdResult CommandAddLine::Handle(User* usr, Params& params) -{ - XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]); - const std::string& setter = usr->nick; - - if (!xlf) - { - ServerInstance->SNO.WriteToSnoMask('x', "{} sent me an unknown ADDLINE type ({}).", setter, params[0]); - return CmdResult::FAILURE; - } - - XLine* xl = nullptr; - try - { - xl = xlf->Generate(ServerInstance->Time(), ConvToNum(params[4]), params[2], params[5], params[1]); - } - catch (const ModuleException& e) - { - ServerInstance->SNO.WriteToSnoMask('x', "Unable to ADDLINE type {} from {}: {}", params[0], setter, e.GetReason()); - return CmdResult::FAILURE; - } - xl->SetCreateTime(ServerCommand::ExtractTS(params[3])); - if (ServerInstance->XLines->AddLine(xl, nullptr)) - { - if (xl->duration) - { - ServerInstance->SNO.WriteToSnoMask('X', "{} added a timed {}{} on {}, expires in {} (on {}): {}", - setter, params[0], params[0].length() <= 2 ? "-line" : "", - params[1], Duration::ToLongString(xl->duration), - Time::ToString(xl->expiry), params[5]); - } - else - { - ServerInstance->SNO.WriteToSnoMask('X', "{} added a permanent {}{} on {}: {}", - setter, params[0], params[0].length() <= 2 ? "-line" : "", - params[1], params[5]); - } - - TreeServer* remoteserver = TreeServer::Get(usr); - - if (!remoteserver->IsBursting()) - { - ServerInstance->XLines->ApplyLines(); - } - return CmdResult::SUCCESS; - } - else - { - delete xl; - return CmdResult::FAILURE; - } -} - -CommandAddLine::Builder::Builder(XLine* xline, User* user) - : MessageBuilder(user, "ADDLINE") -{ - Push(xline->type); - Push(xline->Displayable()); - Push(xline->source); - Push(xline->set_time); - Push(xline->duration); - Push(xline->reason); -} 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 - * Copyright (C) 2018, 2020, 2023 Sadie Powell - * Copyright (C) 2013, 2015 Attila Molnar - * Copyright (C) 2012 Robby - * Copyright (C) 2009 Uli Schlachter - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2008 Robin Burchell - * - * 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 . - */ - - -#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/xline.cpp b/modules/spanningtree/xline.cpp new file mode 100644 index 000000000..4a25246bf --- /dev/null +++ b/modules/spanningtree/xline.cpp @@ -0,0 +1,111 @@ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2018, 2020-2023, 2025 Sadie Powell + * Copyright (C) 2013-2014 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards + * + * 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 . + */ + + +#include "inspircd.h" +#include "timeutils.h" +#include "xline.h" + +#include "treeserver.h" +#include "utils.h" +#include "commands.h" + +CmdResult CommandAddLine::Handle(User* usr, Params& params) +{ + XLineFactory* xlf = ServerInstance->XLines->GetFactory(params[0]); + const std::string& setter = usr->nick; + + if (!xlf) + { + ServerInstance->SNO.WriteToSnoMask('x', "{} sent me an unknown ADDLINE type ({}).", setter, params[0]); + return CmdResult::FAILURE; + } + + XLine* xl = nullptr; + try + { + xl = xlf->Generate(ServerInstance->Time(), ConvToNum(params[4]), params[2], params[5], params[1]); + } + catch (const ModuleException& e) + { + ServerInstance->SNO.WriteToSnoMask('x', "Unable to ADDLINE type {} from {}: {}", params[0], setter, e.GetReason()); + return CmdResult::FAILURE; + } + xl->SetCreateTime(ServerCommand::ExtractTS(params[3])); + if (ServerInstance->XLines->AddLine(xl, nullptr)) + { + if (xl->duration) + { + ServerInstance->SNO.WriteToSnoMask('X', "{} added a timed {}{} on {}, expires in {} (on {}): {}", + setter, params[0], params[0].length() <= 2 ? "-line" : "", + params[1], Duration::ToLongString(xl->duration), + Time::ToString(xl->expiry), params[5]); + } + else + { + ServerInstance->SNO.WriteToSnoMask('X', "{} added a permanent {}{} on {}: {}", + setter, params[0], params[0].length() <= 2 ? "-line" : "", + params[1], params[5]); + } + + TreeServer* remoteserver = TreeServer::Get(usr); + + if (!remoteserver->IsBursting()) + { + ServerInstance->XLines->ApplyLines(); + } + return CmdResult::SUCCESS; + } + else + { + delete xl; + return CmdResult::FAILURE; + } +} + +CommandAddLine::Builder::Builder(XLine* xline, User* user) + : MessageBuilder(user, "ADDLINE") +{ + Push(xline->type); + Push(xline->Displayable()); + Push(xline->source); + Push(xline->set_time); + 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; +} -- cgit v1.3.1-10-gc9f91