fix little typo in syntax hint, type => action

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

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 0cf62dd35126571127753248aa1e2c2ba7db57d0..1127d397dbf27aa65fab9f587adeefb69b90c431 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -1,11 +1,17 @@
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <sstream>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *          the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
 #include "xline.h"
 
 /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */
@@ -26,7 +32,7 @@ public:
 
        bool Matches(User *u)
        {
-               if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(u->GetFullRealHost(), matchtext))
+               if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext))
                        return true;
 
                return false;
@@ -48,7 +54,7 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
        }
 
        const char* Displayable()
@@ -74,15 +80,16 @@ class ShunFactory : public XLineFactory
 
 //typedef std::vector<Shun> shunlist;
 
-class cmd_shun : public Command
+class CommandShun : public Command
 {
  private:
        InspIRCd *Srv;
 
  public:
-       cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me)
+       CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
        {
                this->source = "m_shun.so";
+               this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
        }
 
        CmdResult Handle(const std::vector<std::string>& parameters, User *user)
@@ -99,7 +106,7 @@ class cmd_shun : public Command
                        else
                        {
                                // XXX todo implement stats
-                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str());
+                               user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),parameters[0].c_str());
                        }
 
                        return CMD_SUCCESS;
@@ -125,13 +132,12 @@ class cmd_shun : public Command
                                {
                                        if (!duration)
                                        {
-                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
-                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
-                                               ServerInstance->TimeString(c_requires_crap).c_str());
+                                               ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
                                        }
 
                                        ServerInstance->XLines->ApplyLines();
@@ -150,8 +156,10 @@ class cmd_shun : public Command
 
 class ModuleShun : public Module
 {
-       cmd_shun* mycommand;
+       CommandShun* mycommand;
        ShunFactory *f;
+       std::set<std::string> ShunEnabledCommands;
+       bool NotifyOfShun;
 
  public:
        ModuleShun(InspIRCd* Me) : Module(Me)
@@ -159,15 +167,17 @@ class ModuleShun : public Module
                f = new ShunFactory(ServerInstance);
                ServerInstance->XLines->RegisterFactory(f);
 
-               mycommand = new cmd_shun(ServerInstance);
+               mycommand = new CommandShun(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
-               Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
+               OnRehash(NULL, "");
        }
 
        virtual ~ModuleShun()
        {
+               ServerInstance->XLines->DelAll("SHUN");
                ServerInstance->XLines->UnregisterFactory(f);
        }
 
@@ -180,6 +190,28 @@ class ModuleShun : public Module
                return 1;
        }
 
+       virtual void OnRehash(User* user, const std::string &parameter)
+       {
+               ConfigReader MyConf(ServerInstance);
+               std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
+
+               if (cmds.empty())
+                       cmds = "PING PONG QUIT";
+
+               ShunEnabledCommands.clear();
+               NotifyOfShun = true;
+
+               std::stringstream dcmds(cmds);
+               std::string thiscmd;
+
+               while (dcmds >> thiscmd)
+               {
+                       ShunEnabledCommands.insert(thiscmd);
+               }
+
+               NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+       }
+
        virtual void OnUserConnect(User* user)
        {
                if (!IS_LOCAL(user))
@@ -207,23 +239,32 @@ class ModuleShun : public Module
                        return 0;
                }
 
+               std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
+
+               if (i == ShunEnabledCommands.end())
+               {
+                       if (NotifyOfShun)
+                               user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+                       return 1;
+               }
+
                if (command == "QUIT")
                {
                        /* Allow QUIT but dont show any quit message */
                        parameters.clear();
-                       return 0;
                }
-
-               /* Always allow PONG and PING */
-               if (command == "PONG" || command == "PING")
-                       return 0;
+               else if (command == "PART")
+               {
+                       /* same for PART */
+                       parameters.clear();
+               }
 
                return 1;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION);
        }
 };