}
}
- std::string ToString(Module* proto) const
+ std::string ToString(SerializeFormat format) const
{
std::ostringstream oss;
oss << lastnotify;
for (std::set<User*>::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
{
+ User* u = *i;
// Encode UIDs.
- oss << "," << proto->ProtoTranslate(*i);
+ oss << "," << (format == FORMAT_USER ? u->nick : u->uuid);
}
oss << std::ends;
return oss.str();
{
}
- std::string serialize(Module* requestor, const Extensible* container, void* item)
+ std::string serialize(SerializeFormat format, const Extensible* container, void* item)
{
callerid_data* dat = static_cast<callerid_data*>(item);
- return dat->ToString(requestor);
+ return dat->ToString(format);
}
- void unserialize(Module* requestor, Extensible* container, const std::string& value)
+ void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
{
callerid_data* dat = new callerid_data(value);
set_raw(container, dat);
class User_g : public SimpleUserModeHandler
{
public:
- User_g(InspIRCd* Instance, Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
+ User_g(Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
};
class CommandAccept : public Command
public:
CallerIDExtInfo extInfo;
unsigned int maxaccepts;
- CommandAccept(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "ACCEPT", 0, 1),
+ CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1),
extInfo(Creator)
{
syntax = "{[+|-]<nicks>}|*}";
}
public:
- ModuleCallerID(InspIRCd* Me) : Module(Me), cmd(Me, this), myumode(Me, this)
+ ModuleCallerID() : cmd(this), myumode(this)
{
OnRehash(NULL);
virtual Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
}
virtual void On005Numeric(std::string& output)
virtual void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigReader Conf;
cmd.maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);