@@ -184,17+182,17 @@ class JoinFlood : public ModeHandler
class ModuleJoinFlood : public Module
{
class ModuleJoinFlood : public Module
{
- Server *Srv;
+
JoinFlood* jf;
public:
JoinFlood* jf;
public:
- ModuleJoinFlood(Server* Me)
+ ModuleJoinFlood(InspIRCd* Me)
: Module::Module(Me)
{
: Module::Module(Me)
{
- Srv = Me;
- jf = new JoinFlood();
- Srv->AddMode(jf, 'j');
+
+ jf = new JoinFlood(ServerInstance);
+ ServerInstance->AddMode(jf, 'j');
}
virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
}
virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -206,7+204,7 @@ class ModuleJoinFlood : public Module
{
if (f->islocked())
{
{
if (f->islocked())
{
- WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+ user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
return 1;
}
}
return 1;
}
}
@@ -224,7+222,7 @@ class ModuleJoinFlood : public Module
{
f->clear();
f->lock();
{
f->clear();
f->lock();
- WriteChannelWithServ((char*)Srv->GetServerName().c_str(), channel, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.",channel->name,f->joins,f->secs);
+ channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
}
}
}
}
}
}
@@ -241,12+239,7 @@ class ModuleJoinFlood : public Module