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 739bfb36a8a6a807bb2eb5590eee1e5954f3464e..1127d397dbf27aa65fab9f587adeefb69b90c431 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | 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 "xline.h"
 
@@ -41,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()
@@ -67,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)
@@ -92,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;
@@ -118,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();
@@ -143,9 +156,9 @@ class cmd_shun : public Command
 
 class ModuleShun : public Module
 {
-       cmd_shun* mycommand;
+       CommandShun* mycommand;
        ShunFactory *f;
-       std::map<std::string, bool> ShunEnabledCommands;
+       std::set<std::string> ShunEnabledCommands;
        bool NotifyOfShun;
 
  public:
@@ -154,7 +167,7 @@ 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, I_OnRehash };
@@ -193,7 +206,7 @@ class ModuleShun : public Module
 
                while (dcmds >> thiscmd)
                {
-                       ShunEnabledCommands[thiscmd] = true;
+                       ShunEnabledCommands.insert(thiscmd);
                }
 
                NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
@@ -226,11 +239,12 @@ class ModuleShun : public Module
                        return 0;
                }
 
-               std::map<std::string, bool>::iterator i = ShunEnabledCommands.find(command);
+               std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
 
                if (i == ShunEnabledCommands.end())
                {
-                       user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+                       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;
                }