X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_monitor.cpp;h=b76922b481d709ba1a685b180f44a938aff159d2;hb=823f5b3ee0d9dcb83e379f0e404500361c2e5cb5;hp=fd72c7320dd5ed8596d1eb0780ff82459bba4e9d;hpb=f8a9b6ba4ae0b4b3c7b2a408332230dd82eb4608;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index fd72c7320..b76922b48 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -1,6 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -82,12 +84,9 @@ class IRCv3::Monitor::Manager
 			free(container, unset_raw(container));
 		}
 
-		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
+		std::string ToInternal(const Extensible* container, void* item) const CXX11_OVERRIDE
 		{
 			std::string ret;
-			if (format == FORMAT_NETWORK)
-				return ret;
-
 			const ExtData* extdata = static_cast<ExtData*>(item);
 			for (WatchedList::const_iterator i = extdata->list.begin(); i != extdata->list.end(); ++i)
 			{
@@ -99,7 +98,7 @@ class IRCv3::Monitor::Manager
 			return ret;
 		}
 
-		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
+		void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE;
 
 		void free(Extensible* container, void* item) CXX11_OVERRIDE
 		{
@@ -245,12 +244,8 @@ class IRCv3::Monitor::Manager
  	WatchedList emptywatchedlist;
 };
 
-// inline is needed in static builds to support m_watch including the Manager code from this file
-inline void IRCv3::Monitor::Manager::ExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void IRCv3::Monitor::Manager::ExtItem::FromInternal(Extensible* container, const std::string& value)
 {
-	if (format == FORMAT_NETWORK)
-		return;
-
 	irc::spacesepstream ss(value);
 	for (std::string nick; ss.GetToken(nick); )
 		manager.Watch(static_cast<LocalUser*>(container), nick, UINT_MAX);
@@ -316,7 +311,7 @@ class CommandMonitor : public SplitCommand
 	{
 		Penalty = 2;
 		allow_empty_last_param = false;
-		syntax = "[C|L|S|+ <nick1>[,<nick2>]|- <nick1>[,<nick2>]";
+		syntax = "C|L|S|(+|-) <nick>[,<nick>]+";
 	}
 
 	CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE