converting m_d* done

[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 db800527d5411d6692a75f1867b34339a558cc5d..95c7cd37b1c51052890b4dea0abdbcf96e03cfbd 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -41,7 +41,8 @@ public:
 
        void Apply(User *u)
        {
-               // Application is done by the module.
+               if (!u->GetExt("shunned"))
+                       u->Extend("shunned");
        }
 
 
@@ -69,12 +70,6 @@ class ShunFactory : public XLineFactory
        {
                return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
        }
-
-       virtual bool AutoApplyToUserList(XLine*)
-       {
-               // No, we don't want to be applied to users automagically.
-               return false;
-       }
 };
 
 //typedef std::vector<Shun> shunlist;
@@ -97,7 +92,7 @@ class cmd_shun : public Command
 
                if(pcnt == 1)
                {
-                       if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+                       if (ServerInstance->XLines->DelLine(parameters[0], "SHUN", user))
                        {
                                ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
                        }
@@ -167,8 +162,8 @@ class ModuleShun : public Module
                mycommand = new cmd_shun(ServerInstance);
                ServerInstance->AddCommand(mycommand);
 
-               Implementation eventlist[] = { I_OnStats, I_OnPreCommand };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual ~ModuleShun()
@@ -185,20 +180,27 @@ class ModuleShun : public Module
                return 0;
        }
 
-       virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+       virtual void OnUserConnect(User* user)
        {
-               if (user->registered != REG_ALL)
-                       return 0;
+               if (!IS_LOCAL(user))
+                       return;
 
-               if((command != "PONG") && (command != "PING"))
+               // Apply lines on user connect
+               XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
+
+               if (rl)
                {
-                       // Don't let them issue cmd if they are shunned..
-                       XLine *rl = ServerInstance->XLines->MatchesLine("S", user);
+                       // Bang. :P
+                       rl->Apply(user);
+               }
+       }
 
-                       if (rl)
-                       {
+       virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+       {
+               if((command != "PONG") && (command != "PING"))
+               {
+                       if (user->GetExt("shunned"))
                                return 1;
-                       }
                }
 
                return 0;