m_spanningtree Remove unneeded #includes

[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 c858e62ec30ebb4dbf3ed5b536c56789f8f27ddb..cbaa6840991d3dda1163352cf94de001b0987c7b 100644 (file)
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -36,10 +36,6 @@ public:
                this->matchtext = shunmask;
        }
 
-       ~Shun()
-       {
-       }
-
        bool Matches(User *u)
        {
                // E: overrides shun
@@ -60,12 +56,6 @@ public:
                return false;
        }
 
-       void DisplayExpiry()
-       {
-               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)",
-                       this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-       }
-
        const char* Displayable()
        {
                return matchtext.c_str();
@@ -128,11 +118,11 @@ class CommandShun : public Command
                else
                {
                        // Adding - XXX todo make this respect <insane> tag perhaps..
-                       long duration;
+                       unsigned long duration;
                        std::string expr;
                        if (parameters.size() > 2)
                        {
-                               duration = ServerInstance->Duration(parameters[1]);
+                               duration = InspIRCd::Duration(parameters[1]);
                                expr = parameters[2];
                        }
                        else
@@ -254,7 +244,7 @@ class ModuleShun : public Module
                        return MOD_RES_PASSTHRU;
                }
 
-               if (!affectopers && IS_OPER(user))
+               if (!affectopers && user->IsOper())
                {
                        /* Don't do anything if the user is an operator and affectopers isn't set */
                        return MOD_RES_PASSTHRU;
@@ -291,4 +281,3 @@ class ModuleShun : public Module
 };
 
 MODULE_INIT(ModuleShun)
-