#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
-#include <vector>
#include "configreader.h"
#include "inspircd.h"
+#include "wildcard.h"
+/** Holds a users m_safelist state
+ */
class ListData : public classbase
{
public:
long list_start;
long list_position;
bool list_ended;
+ const std::string glob;
ListData() : list_start(0), list_position(0), list_ended(false) {};
- ListData(long pos, time_t t) : list_start(t), list_position(pos), list_ended(false) {};
+ ListData(long pos, time_t t, const std::string &pattern) : list_start(t), list_position(pos), list_ended(false), glob(pattern) {};
};
/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
char buffer[MAXBUF];
chanrec *chan;
InspIRCd* ServerInstance;
+ const std::string glob;
public:
break;
}
- log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
+ ServerInstance->Log(DEBUG, "m_safelist.so: resuming spool of list to client %s at channel %ld", u->nick, ld->list_position);
chan = NULL;
/* Attempt to fill up to half the user's sendq with /LIST output */
long amount_sent = 0;
do
{
- log(DEBUG,"Channel %ld",ld->list_position);
+ ServerInstance->Log(DEBUG,"Channel %ld",ld->list_position);
if (!ld->list_position)
u->WriteServ("321 %s Channel :Users Name",u->nick);
chan = ServerInstance->GetChannelIndex(ld->list_position);
bool has_user = (chan && chan->HasUser(u));
if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
{
+ bool display = match(chan->name, ld->glob.c_str());
+
long users = chan->GetUserCounter();
- if (users)
+ if ((users) && (display))
{
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 + strlen(ServerInstance->Config->ServerName);
- log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
+ ServerInstance->Log(DEBUG,"m_safelist.so: Sent %ld of safe %ld / 4",amount_sent,u->sendqmax);
u->WriteServ(std::string(buffer));
}
}
/*
* start at channel 0! ;)
*/
- ld = new ListData(0,ServerInstance->Time());
+ ld = new ListData(0,ServerInstance->Time(), pcnt ? parameters[0] : "*");
user->Extend("safelist_cache", ld);
listusers.push_back(user);
}
};
-
-
-
-/******************************************************************************************************/
-
+
+
class ModuleSafeListFactory : public ModuleFactory
{
public: