X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_wallops.cpp;h=6b055f874a6df046e9c966963b26a80075600587;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=0210df8ee869d185be7f52e79a38a893d697f2f4;hpb=c0aba5b728b0a921d95ec120aa638dab1520b42f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp
index 0210df8ee..6b055f874 100644
--- a/src/coremods/core_wallops.cpp
+++ b/src/coremods/core_wallops.cpp
@@ -25,6 +25,7 @@
 class CommandWallops : public Command
 {
 	SimpleUserModeHandler wallopsmode;
+	ClientProtocol::EventProvider protoevprov;
 
  public:
 	/** Constructor for wallops.
@@ -32,6 +33,7 @@ class CommandWallops : public Command
 	CommandWallops(Module* parent)
 		: Command(parent, "WALLOPS", 1, 1)
 		, wallopsmode(parent, "wallops", 'w')
+		, protoevprov(parent, name)
 	{
 		flags_needed = 'o';
 		syntax = "<any-text>";
@@ -42,28 +44,46 @@ class CommandWallops : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE;
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_BROADCAST;
 	}
 };
 
-CmdResult CommandWallops::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandWallops::Handle(User* user, const Params& parameters)
 {
-	std::string wallop("WALLOPS :");
-	wallop.append(parameters[0]);
+	ClientProtocol::Message msg("WALLOPS", user);
+	msg.PushParamRef(parameters[0]);
+	ClientProtocol::Event wallopsevent(protoevprov, msg);
 
 	const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
 	for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
-		User* t = *i;
-		if (t->IsModeSet(wallopsmode))
-			t->WriteFrom(user, wallop);
+		LocalUser* curr = *i;
+		if (curr->IsModeSet(wallopsmode))
+			curr->Send(wallopsevent);
 	}
 
 	return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandWallops)
+class CoreModWallops : public Module
+{
+ private:
+	CommandWallops cmd;
+
+ public:
+	CoreModWallops()
+		: cmd(this)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the WALLOPS command", VF_CORE | VF_VENDOR);
+	}
+};
+
+MODULE_INIT(CoreModWallops)