m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

[user/henk/code/inspircd.git] / src / modules / m_delaymsg.cpp

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index c0ff09ccf44f138e645ea02bc41188e15e4dbbfd..1e16647f3e89a51c3c5b6537d204bd37f509d616 100644 (file)
--- 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,26 +39,29 @@ class DelayMsgMode : public ModeHandler
 
 class ModuleDelayMsg : public Module
 {
- private:
        DelayMsgMode djm;
  public:
        ModuleDelayMsg() : djm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&djm))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Extensions.Register(&djm.jointime);
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       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);
+
+       void init() CXX11_OVERRIDE
+       {
+               ServerInstance->Modules->AddService(djm);
+               ServerInstance->Modules->AddService(djm.jointime);
+       }
+       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(this)) && (channel->GetModeParameter(this) == parameter))
+                       return MODEACTION_DENY;
+
                /* Setting a new limit, sanity check */
                long limit = atoi(parameter.c_str());
 
@@ -72,7 +73,7 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
        }
        else
        {
-               if (!channel->IsModeSet('d'))
+               if (!channel->IsModeSet(this))
                        return MODEACTION_DENY;
 
                /*
@@ -82,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;
 }
 
@@ -93,19 +93,19 @@ Version ModuleDelayMsg::GetVersion()
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-       if (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)
+       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;
@@ -119,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())
        {
@@ -139,4 +139,3 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 }
 
 MODULE_INIT(ModuleDelayMsg)
-