Route WALLOPS like a regular command, remove OnWallops hook

6 files changed, 7 insertions, 22 deletions

diff --git a/include/modules.h b/include/modules.h
index 89961a6f5..959025367 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -361,7 +361,7 @@ enum Implementation
 	I_OnSendSnotice, I_OnUserPreJoin, I_OnUserPreKick, I_OnUserKick, I_OnOper, I_OnInfo, I_OnWhois,
 	I_OnUserPreInvite, I_OnUserInvite, I_OnUserPreMessage, I_OnUserPreNick,
 	I_OnUserMessage, I_OnMode, I_OnGetServerDescription, I_OnSyncUser,
-	I_OnSyncChannel, I_OnDecodeMetaData, I_OnWallops, I_OnAcceptConnection, I_OnUserInit,
+	I_OnSyncChannel, I_OnDecodeMetaData, I_OnAcceptConnection, I_OnUserInit,
 	I_OnChangeHost, I_OnChangeName, I_OnAddLine, I_OnDelLine, I_OnExpireLine,
 	I_OnUserPostNick, I_OnPreMode, I_On005Numeric, I_OnKill, I_OnRemoteKill, I_OnLoadModule,
 	I_OnUnloadModule, I_OnBackgroundTimer, I_OnPreCommand, I_OnCheckReady, I_OnCheckInvite,
@@ -799,12 +799,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata);
 
-	/** Called after every WALLOPS command.
-	 * @param user The user sending the WALLOPS
-	 * @param text The content of the WALLOPS message
-	 */
-	virtual void OnWallops(User* user, const std::string &text);
-
 	/** Called whenever a user's hostname is changed.
 	 * This event triggers after the host has been set.
 	 * @param user The user whos host is being changed
diff --git a/src/commands/cmd_wallops.cpp b/src/commands/cmd_wallops.cpp
index 198997a95..3cd8abc42 100644
--- a/src/commands/cmd_wallops.cpp
+++ b/src/commands/cmd_wallops.cpp
@@ -38,6 +38,11 @@ class CommandWallops : public Command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 CmdResult CommandWallops::Handle (const std::vector<std::string>& parameters, User *user)
@@ -52,7 +57,6 @@ CmdResult CommandWallops::Handle (const std::vector<std::string>& parameters, Us
 			user->WriteTo(t,wallop);
 	}
 
-	FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0]));
 	return CMD_SUCCESS;
 }
 
diff --git a/src/modules.cpp b/src/modules.cpp
index 871bb9499..acd80323d 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -152,7 +152,6 @@ void		Module::OnSyncNetwork(Module*, void*) { }
 void		Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
 void		Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { }
 void		Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { }
-void		Module::OnWallops(User*, const std::string&) { }
 void		Module::OnChangeHost(User*, const std::string&) { }
 void		Module::OnChangeName(User*, const std::string&) { }
 void		Module::OnChangeIdent(User*, const std::string&) { }
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 4934c3d61..764c8b8ec 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -73,7 +73,7 @@ void ModuleSpanningTree::init()
 	Implementation eventlist[] =
 	{
 		I_OnPreCommand, I_OnGetServerDescription, I_OnUserInvite, I_OnPostTopicChange,
-		I_OnWallops, I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
+		I_OnUserMessage, I_OnBackgroundTimer, I_OnUserJoin,
 		I_OnChangeHost, I_OnChangeName, I_OnChangeIdent, I_OnUserPart, I_OnUnloadModule,
 		I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash, I_OnPreRehash,
 		I_OnOper, I_OnAddLine, I_OnDelLine, I_OnMode, I_OnLoadModule, I_OnStats,
@@ -454,16 +454,6 @@ void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std:
 	Utils->DoOneToMany(user->uuid,"TOPIC",params);
 }
 
-void ModuleSpanningTree::OnWallops(User* user, const std::string &text)
-{
-	if (IS_LOCAL(user))
-	{
-		parameterlist params;
-		params.push_back(":"+text);
-		Utils->DoOneToMany(user->uuid,"WALLOPS",params);
-	}
-}
-
 void ModuleSpanningTree::LocalMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list, const char* message_type)
 {
 	/* Server or remote origin, dest should always be non-null */
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 947eddd37..21e4e156a 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -147,7 +147,6 @@ class ModuleSpanningTree : public Module
 	void OnUserConnect(LocalUser* source) CXX11_OVERRIDE;
 	void OnUserInvite(User* source,User* dest,Channel* channel, time_t) CXX11_OVERRIDE;
 	void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
-	void OnWallops(User* user, const std::string &text) CXX11_OVERRIDE;
 	void OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
 	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE;
diff --git a/src/modules/m_testnet.cpp b/src/modules/m_testnet.cpp
index 0aeeebb88..d32f26a4b 100644
--- a/src/modules/m_testnet.cpp
+++ b/src/modules/m_testnet.cpp
@@ -119,7 +119,6 @@ static void checkall(Module* noimpl)
 	CHK(OnSyncUser);
 	CHK(OnSyncChannel);
 	CHK(OnDecodeMetaData);
-	CHK(OnWallops);
 	CHK(OnAcceptConnection);
 	CHK(OnChangeHost);
 	CHK(OnChangeName);