X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=05a8d09b107c7cee5b622c523b729fc3a353dcf5;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=e27adf1e1b5878df317882a21560a18fbde9d32f;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index e27adf1e1..05a8d09b1 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -38,10 +38,6 @@ public:
 		this->nickname = nick.c_str();
 	}
 
-	~SVSHold()
-	{
-	}
-
 	bool Matches(User *u)
 	{
 		if (u->nick == nickname)
@@ -56,12 +52,6 @@ public:
 		return false;
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-			this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return nickname.c_str();
@@ -123,8 +113,10 @@ class CommandSvshold : public Command
 		}
 		else
 		{
-			// Adding - XXX todo make this respect <insane> tag perhaps..
-			long duration = ServerInstance->Duration(parameters[1]);
+			if (parameters.size() < 3)
+				return CMD_FAILURE;
+
+			unsigned long duration = InspIRCd::Duration(parameters[1]);
 			SVSHold* r = new SVSHold(ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str());
 
 			if (ServerInstance->XLines->AddLine(r, user))
@@ -170,7 +162,7 @@ class ModuleSVSHold : public Module
 	void init()
 	{
 		ServerInstance->XLines->RegisterFactory(&s);
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}