1 files changed, 10 insertions, 17 deletions

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index cfc06866a..1e16647f3 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channelmode +d <int>, to deny messages to a channel until <int> seconds. */
-
 class DelayMsgMode : public ModeHandler
 {
  public:
@@ -41,30 +39,27 @@ class DelayMsgMode : public ModeHandler
 
 class ModuleDelayMsg : public Module
 {
- private:
 	DelayMsgMode djm;
  public:
 	ModuleDelayMsg() : djm(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(djm);
 		ServerInstance->Modules->AddService(djm.jointime);
-		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	Version GetVersion();
-	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&);
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list);
+	Version GetVersion() CXX11_OVERRIDE;
+	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) CXX11_OVERRIDE;
+	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
 };
 
 ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	if (adding)
 	{
-		if ((channel->IsModeSet('d')) && (channel->GetModeParameter('d') == parameter))
+		if ((channel->IsModeSet(this)) && (channel->GetModeParameter(this) == parameter))
 			return MODEACTION_DENY;
 
 		/* Setting a new limit, sanity check */
@@ -78,7 +73,7 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 	}
 	else
 	{
-		if (!channel->IsModeSet('d'))
+		if (!channel->IsModeSet(this))
 			return MODEACTION_DENY;
 
 		/*
@@ -88,7 +83,6 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 		for (UserMembCIter n = names->begin(); n != names->end(); ++n)
 			jointime.set(n->second, 0);
 	}
-	channel->SetModeParam('d', adding ? parameter : "");
 	return MODEACTION_ALLOW;
 }
 
@@ -99,19 +93,19 @@ Version ModuleDelayMsg::GetVersion()
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-	if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
+	if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet(djm)))
 	{
 		djm.jointime.set(memb, ServerInstance->Time());
 	}
 }
 
-ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype)
 {
 	/* Server origin */
 	if ((!user) || (!IS_LOCAL(user)))
 		return MOD_RES_PASSTHRU;
 
-	if (target_type != TYPE_CHANNEL)
+	if ((target_type != TYPE_CHANNEL) || (msgtype != MSG_PRIVMSG))
 		return MOD_RES_PASSTHRU;
 
 	Channel* channel = (Channel*) dest;
@@ -125,7 +119,7 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 	if (ts == 0)
 		return MOD_RES_PASSTHRU;
 
-	std::string len = channel->GetModeParameter('d');
+	std::string len = channel->GetModeParameter(&djm);
 
 	if (ts + atoi(len.c_str()) > ServerInstance->Time())
 	{
@@ -145,4 +139,3 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 }
 
 MODULE_INIT(ModuleDelayMsg)
-