Add support for the IRCv3 extensions to the SETNAME command.

[user/henk/code/inspircd.git] / include / xline.h

diff --git a/include/xline.h b/include/xline.h
index dbb89277b95ab328926befe67780dfa15757f00b..0aaa21a16f06fa9e6e50783b1fd007b24b28fb6a 100644 (file)
--- a/include/xline.h
+++ b/include/xline.h
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012-2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2004-2007 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * 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
@@ -467,11 +471,12 @@ class CoreExport XLineManager
        /** Delete an XLine
         * @param hostmask The xline-specific string identifying the line, e.g. "*@foo"
         * @param type The type of xline
+        * @param reason The xline reason, if it is being removed successfully
         * @param user The user removing the line or NULL if its the local server
         * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool DelLine(const char* hostmask, const std::string &type, User* user, bool simulate = false);
+       bool DelLine(const char* hostmask, const std::string& type, std::string& reason, User* user, bool simulate = false);
 
        /** Registers an xline factory.
         * An xline factory is a class which when given a particular xline type,
@@ -514,8 +519,9 @@ class CoreExport XLineManager
        /** Expire a line given two iterators which identify it in the main map.
         * @param container Iterator to the first level of entries the map
         * @param item Iterator to the second level of entries in the map
+        * @param silent If true, doesn't send an expiry SNOTICE.
         */
-       void ExpireLine(ContainerIter container, LookupIter item);
+       void ExpireLine(ContainerIter container, LookupIter item, bool silent = false);
 
        /** Apply any new lines that are pending to be applied.
         * This will only apply lines in the pending_lines list, to save on
@@ -532,6 +538,6 @@ class CoreExport XLineManager
         */
        void InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats);
 
-       /** Clears any XLines which were added by the server configuration. */
-       void ClearConfigLines();
+       /** Expire X-lines which were added by the server configuration and have been removed. */
+       void ExpireRemovedConfigLines(const std::string& type, const insp::flat_set<std::string>& configlines);
 };