None of the modules use an extern InspIRCd* any more

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 97b766e361bae1c705ba6fcd69cc1bee1bef807b..9ad952f11ff30db1e968c2520d4a51d4918683a3 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -10,6 +10,8 @@
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
+
+
 inline int strtoint(const std::string &str)
 {
        std::istringstream ss(str);
@@ -23,9 +25,9 @@ typedef std::map<userrec*, time_t> delaylist;
 class KickRejoin : public ModeHandler
 {
  public:
-       KickRejoin() : ModeHandler('J', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       KickRejoin(InspIRCd* Instance) : ModeHandler(Instance, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
         {
                 if (channel->IsModeSet('J'))
                         return std::make_pair(true, channel->GetModeParameter('J'));
@@ -33,6 +35,12 @@ class KickRejoin : public ModeHandler
                         return std::make_pair(false, parameter);
         } 
 
+        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       {
+               /* When TS is equal, the alphabetically later one wins */
+               return (their_param < our_param);
+       }
+       
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
                if (!adding)
@@ -62,17 +70,17 @@ class KickRejoin : public ModeHandler
 
 class ModuleKickNoRejoin : public Module
 {
-       Server *Srv;
+       
        KickRejoin* kr;
        
 public:
  
-       ModuleKickNoRejoin(Server* Me)
+       ModuleKickNoRejoin(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               kr = new KickRejoin();
-               Srv->AddMode(kr, 'J');
+               
+               kr = new KickRejoin(ServerInstance);
+               ServerInstance->AddMode(kr, 'J');
        }
 
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -94,7 +102,7 @@ public:
                                                if (iter->first == user)                                        
                                                {
                                                        log(DEBUG, "m_kicknorejoin.so: and we have the right user");
-                                                       WriteServ(user->fd, "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
+                                                       user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
                                                        return 1;
                                                }
                                        }
@@ -160,7 +168,7 @@ public:
 
        virtual void On005Numeric(std::string &output)
        {
-               InsertMode(output, "J", 3);
+               ServerInstance->ModeGrok->InsertMode(output, "J", 3);
        }
 
        virtual ~ModuleKickNoRejoin()
@@ -186,7 +194,7 @@ class ModuleKickNoRejoinFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleKickNoRejoin(Me);
        }