Merge pull request #1162 from SaberUK/insp20+fix-deinstall

[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 7931a598204445b74f1c05ffb1106a4ac327ef1a..978ab55d2191c94b31bb74862bf454f4f01ce72d 100644 (file)
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -1,47 +1,37 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include <stdarg.h>
 
 /* $ModDesc: Provides channelmode +d <int>, to deny messages to a channel until <int> seconds. */
 
 class DelayMsgMode : public ModeHandler
 {
- private:
-       CUList empty;
  public:
        LocalIntExt jointime;
-       DelayMsgMode(Module* Parent) : ModeHandler(Parent, 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
+       DelayMsgMode(Module* Parent) : ModeHandler(Parent, "delaymsg", 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
                , jointime("delaymsg", Parent)
        {
                levelrequired = OP_VALUE;
        }
 
-       ModePair ModeSet(User*, User*, Channel* channel, const std::string &parameter)
-       {
-               std::string climit = channel->GetModeParameter('d');
-               if (!climit.empty())
-               {
-                       return std::make_pair(true, climit);
-               }
-               else
-               {
-                       return std::make_pair(false, parameter);
-               }
-       }
-
-       bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*)
+       bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
        {
                return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
        }
@@ -56,22 +46,30 @@ class ModuleDelayMsg : public Module
  public:
        ModuleDelayMsg() : djm(this)
        {
-               if (!ServerInstance->Modes->AddMode(&djm))
-                       throw ModuleException("Could not add new modes!");
-               Extensible::Register(&djm.jointime);
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       ~ModuleDelayMsg();
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(djm);
+               ServerInstance->Modules->AddService(djm.jointime);
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               OnRehash(NULL);
+       }
        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);
+       ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list);
+       void OnRehash(User* user);
 };
 
 ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
        if (adding)
        {
+               if ((channel->IsModeSet('d')) && (channel->GetModeParameter('d') == parameter))
+                       return MODEACTION_DENY;
+
                /* Setting a new limit, sanity check */
                long limit = atoi(parameter.c_str());
 
@@ -83,6 +81,9 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
        }
        else
        {
+               if (!channel->IsModeSet('d'))
+                       return MODEACTION_DENY;
+
                /*
                 * Clean up metadata
                 */
@@ -94,19 +95,14 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
        return MODEACTION_ALLOW;
 }
 
-ModuleDelayMsg::~ModuleDelayMsg()
-{
-       ServerInstance->Modes->DelMode(&djm);
-}
-
 Version ModuleDelayMsg::GetVersion()
 {
-       return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR, API_VERSION);
+       return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR);
 }
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-       if (memb->chan->IsModeSet('d'))
+       if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
        {
                djm.jointime.set(memb, ServerInstance->Time());
        }
@@ -115,7 +111,7 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
 ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 {
        /* Server origin */
-       if (!user)
+       if ((!user) || (!IS_LOCAL(user)))
                return MOD_RES_PASSTHRU;
 
        if (target_type != TYPE_CHANNEL)
@@ -126,7 +122,7 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 
        if (!memb)
                return MOD_RES_PASSTHRU;
-       
+
        time_t ts = djm.jointime.get(memb);
 
        if (ts == 0)
@@ -151,5 +147,19 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
        return MOD_RES_PASSTHRU;
 }
 
+ModResult ModuleDelayMsg::OnUserPreNotice(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list)
+{
+       return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
+}
+
+void ModuleDelayMsg::OnRehash(User* user)
+{
+       ConfigTag* tag = ServerInstance->Config->ConfValue("delaymsg");
+       if (tag->getBool("allownotice", true))
+               ServerInstance->Modules->Detach(I_OnUserPreNotice, this);
+       else
+               ServerInstance->Modules->Attach(I_OnUserPreNotice, this);
+}
+
 MODULE_INIT(ModuleDelayMsg)