#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
#include "inspircd.h"
/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
+
+
inline int strtoint(const std::string &str)
{
std::istringstream ss(str);
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) { }
ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
{
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)
delaylist* dl;
if (chan->GetExt("norejoinusers", dl))
{
- log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
std::vector<userrec*> itemstoremove;
for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
{
- log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
if (iter->second > time(NULL))
{
- log(DEBUG, "m_kicknorejoin.so: still inside time slot");
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot");
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);
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so: and we have the right user");
+ user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
return 1;
}
}
else
{
// Expired record, remove.
- log(DEBUG, "m_kicknorejoin.so: record expired");
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired");
itemstoremove.push_back(iter->first);
}
}
if (!dl->size())
{
// Now it's empty..
- DELETE(dl);
- chan->Shrink("norejoinusers");
+ DELETE(dl);
+ chan->Shrink("norejoinusers");
}
}
}
chan->Extend("norejoinusers", dl);
}
- log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
+ ServerInstance->Log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
(*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
}
}
virtual void Implements(char* List)
{
- List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
- }
-
- virtual void On005Numeric(std::string &output)
- {
- InsertMode(output, "J", 3);
+ List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
}
virtual ~ModuleKickNoRejoin()
{
+ ServerInstance->Modes->DelMode(kr);
DELETE(kr);
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+ return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleKickNoRejoin(Me);
}