MetaData rework

[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 05f4bfe3c3bc7a369bde5eaa3a07308e48f333a4..f4532ecd1b5befc0a3b0bb198779aa4090a1ef76 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -32,7 +32,11 @@ public:
 
        bool Matches(User *u)
        {
-               if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext))
+               // E: overrides shun
+               if (u->exempt)
+                       return false;
+
+               if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext))
                        return true;
 
                return false;
@@ -47,8 +51,6 @@ public:
 
        void Apply(User *u)
        {
-               if (!u->GetExt("shunned"))
-                       u->Extend("shunned");
        }
 
 
@@ -82,11 +84,8 @@ class ShunFactory : public XLineFactory
 
 class CommandShun : public Command
 {
- private:
-       InspIRCd *Srv;
-
  public:
-       CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
+       CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3)
        {
                this->source = "m_shun.so";
                this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
@@ -97,16 +96,22 @@ class CommandShun : public Command
                /* syntax: SHUN nick!user@host time :reason goes here */
                /* 'time' is a human-readable timestring, like 2d3h2s. */
 
+               std::string target = parameters[0];
+               
+               User *find = ServerInstance->FindNick(target.c_str());
+               if (find)
+                       target = std::string("*!*@") + find->GetIPString();
+
                if (parameters.size() == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
+                       if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),parameters[0].c_str());
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),target.c_str());
                        }
                        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(),target.c_str());
                        }
 
                        return CMD_SUCCESS;
@@ -130,7 +135,7 @@ class CommandShun : public Command
 
                        try
                        {
-                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), parameters[0].c_str());
+                               r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str());
                        }
                        catch (...)
                        {
@@ -144,13 +149,13 @@ class CommandShun : public Command
                                        if (!duration)
                                        {
                                                ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s",
-                                                       user->nick.c_str(), parameters[0].c_str(), expr.c_str());
+                                                       user->nick.c_str(), target.c_str(), expr.c_str());
                                        }
                                        else
                                        {
                                                time_t c_requires_crap = duration + ServerInstance->Time();
                                                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(), expr.c_str());
+                                                       user->nick.c_str(), target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str());
                                        }
 
                                        ServerInstance->XLines->ApplyLines();
@@ -169,30 +174,27 @@ class CommandShun : public Command
 
 class ModuleShun : public Module
 {
-       CommandShun* mycommand;
-       ShunFactory *f;
+       CommandShun cmd;
+       ShunFactory f;
        std::set<std::string> ShunEnabledCommands;
        bool NotifyOfShun;
        bool affectopers;
 
  public:
-       ModuleShun(InspIRCd* Me) : Module(Me)
+       ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me), f(Me)
        {
-               f = new ShunFactory(ServerInstance);
-               ServerInstance->XLines->RegisterFactory(f);
-
-               mycommand = new CommandShun(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->XLines->RegisterFactory(&f);
+               ServerInstance->AddCommand(&cmd);
 
                Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 4);
-               OnRehash(NULL, "");
+               OnRehash(NULL);
        }
 
        virtual ~ModuleShun()
        {
                ServerInstance->XLines->DelAll("SHUN");
-               ServerInstance->XLines->UnregisterFactory(f);
+               ServerInstance->XLines->UnregisterFactory(&f);
        }
 
        virtual int OnStats(char symbol, User* user, string_list& out)
@@ -204,7 +206,7 @@ class ModuleShun : public Module
                return 1;
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ConfigReader MyConf(ServerInstance);
                std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
@@ -245,13 +247,12 @@ class ModuleShun : public Module
 
        virtual int OnPreCommand(std::string &command, std::vector<std::string>& parameters, User* user, bool validated, const std::string &original_line)
        {
-               if (validated || !user->GetExt("shunned"))
+               if (validated)
                        return 0;
 
                if (!ServerInstance->XLines->MatchesLine("SHUN", user))
                {
-                       /* The shun previously set on this user has expired or been removed */
-                       user->Shrink("shunned");
+                       /* Not shunned, don't touch. */
                        return 0;
                }