#include "channels.h"
#include "modules.h"
#include "helperfuncs.h"
-#include "message.h"
#include <vector>
+#include "configreader.h"
#include "inspircd.h"
extern time_t TIME;
+
+
class ListData : public classbase
{
public:
{
private:
- Server* Srv;
char buffer[MAXBUF];
chanrec *chan;
+ InspIRCd* ServerInstance;
public:
- ListTimer(long interval, Server* Me) : InspTimer(interval,TIME), Srv(Me)
+ ListTimer(InspIRCd* Instance, long interval) : InspTimer(interval,TIME), ServerInstance(Instance)
{
}
/*
* What we do here:
* - Get where they are up to
- * - If it's > GetChannelCount, erase them from the iterator, set go_again to true
+ * - If it's more than total number of channels, erase
+ * them from the iterator, set go_again to true
* - If not, spool more channels
*/
userrec* u = (userrec*)(*iter);
ListData* ld;
u->GetExt("safelist_cache", ld);
- if (ld->list_position > Srv->GetChannelCount())
+ if ((size_t)ld->list_position > ServerInstance->chanlist.size())
{
u->Shrink("safelist_cache");
DELETE(ld);
log(DEBUG,"Channel %ld",ld->list_position);
if (!ld->list_position)
u->WriteServ("321 %s Channel :Users Name",u->nick);
- chan = Srv->GetChannelIndex(ld->list_position);
+ chan = ServerInstance->GetChannelIndex(ld->list_position);
/* spool details */
bool has_user = (chan && chan->HasUser(u));
if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
long users = chan->GetUserCounter();
if (users)
{
- int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chanmodes(chan,has_user),chan->topic);
+ int counter = snprintf(buffer,MAXBUF,"322 %s %s %ld :[+%s] %s",u->nick,chan->name,users,chan->ChanModes(has_user),chan->topic);
/* Increment total plus linefeed */
- amount_sent += counter + 4 + Srv->GetServerName().length();
+ amount_sent += counter + 4 + strlen(ServerInstance->Config->ServerName);
log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
u->WriteServ(std::string(buffer));
}
}
}
- ListTimer* MyTimer = new ListTimer(1,Srv);
- Srv->AddTimer(MyTimer);
+ ListTimer* MyTimer = new ListTimer(ServerInstance,1);
+ ServerInstance->Timers->AddTimer(MyTimer);
}
};
class ModuleSafeList : public Module
{
private:
- Server *Srv;
+
ListTimer* MyTimer;
public:
- ModuleSafeList(Server* Me) : Module::Module(Me)
+ ModuleSafeList(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
-
- MyTimer = new ListTimer(1,Srv);
- Srv->AddTimer(MyTimer);
+ MyTimer = new ListTimer(ServerInstance,1);
+ ServerInstance->Timers->AddTimer(MyTimer);
}
virtual ~ModuleSafeList()
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSafeList(Me);
}