TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle(const char** parameters, int pcnt, User *user)
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
{
/* syntax: svshold nickname time :reason goes here */
/* 'time' is a human-readable timestring, like 2d3h2s. */
return CMD_FAILURE;
}
- if (pcnt == 1)
+ if (parameters.size() == 1)
{
- SVSHoldMap::iterator n = HoldMap.find(parameters[0]);
+ SVSHoldMap::iterator n = HoldMap.find(parameters[0].c_str());
if (n != HoldMap.end())
{
/* form: svshold nickname removes a hold. */
if ((*iter)->length)
{
remaining = ((*iter)->set_on + (*iter)->length) - ServerInstance->Time();
- user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick, (*iter)->nickname.c_str(), remaining, (*iter)->reason.c_str());
+ user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick.c_str(), (*iter)->nickname.c_str(), (unsigned long)remaining, (*iter)->reason.c_str());
}
else
{
- user->WriteServ( "386 %s %s :Removed permanent SVSHOLD (%s)", user->nick, (*iter)->nickname.c_str(), (*iter)->reason.c_str());
+ user->WriteServ( "386 %s %s :Removed permanent SVSHOLD (%s)", user->nick.c_str(), (*iter)->nickname.c_str(), (*iter)->reason.c_str());
}
SVSHolds.erase(iter);
break;
delete n->second;
}
}
- else if (pcnt >= 2)
+ else if (parameters.size() >= 2)
{
/* full form to add a SVSHold */
- if (ServerInstance->IsNick(parameters[0]))
+
+ /* NOTE: We check nicks up to 512 in length here, as a hax to allow
+ * remote nicks that are longer than our configuration to be held
+ */
+ if (ServerInstance->IsNick(parameters[0].c_str(), 512))
{
// parameters[0] = w00t
// parameters[1] = 1h3m2s
// parameters[2] = Registered nickname
-
+
/* Already exists? */
- if (HoldMap.find(parameters[0]) != HoldMap.end())
+ if (HoldMap.find(parameters[0].c_str()) != HoldMap.end())
{
- user->WriteServ( "385 %s %s :SVSHOLD already exists", user->nick, parameters[0]);
+ user->WriteServ( "385 %s %s :SVSHOLD already exists", user->nick.c_str(), parameters[0].c_str());
return CMD_FAILURE;
}
- long length = ServerInstance->Duration(parameters[1]);
- std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied";
-
+ unsigned long length = ServerInstance->Duration(parameters[1]);
+ std::string reason = (parameters.size() > 2) ? parameters[2] : "No reason supplied";
+
SVSHold* S = new SVSHold(parameters[0], user->nick, ServerInstance->Time(), length, reason);
SVSHolds.push_back(S);
- HoldMap[parameters[0]] = S;
+ HoldMap[parameters[0].c_str()] = S;
std::sort(SVSHolds.begin(), SVSHolds.end(), SVSHoldComp);
if(length > 0)
{
- user->WriteServ( "385 %s %s :Added %lu second SVSHOLD (%s)", user->nick, parameters[0], length, reason.c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "%s added %lu second SVSHOLD on %s (%s)", user->nick, length, parameters[0], reason.c_str());
+ user->WriteServ( "385 %s %s :Added %lu second SVSHOLD (%s)", user->nick.c_str(), parameters[0].c_str(), length, reason.c_str());
}
else
{
- user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], parameters[0], reason.c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "%s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str());
+ user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick.c_str(), parameters[0].c_str(), parameters[0].c_str(), reason.c_str());
}
}
else
class ModuleSVSHold : public Module
{
CommandSvshold *mycommand;
-
+
public:
ModuleSVSHold(InspIRCd* Me) : Module(Me)
ServerInstance->Modules->Attach(eventlist, this, 4);
}
-
+
virtual int OnStats(char symbol, User* user, string_list &results)
{
ExpireBans();
-
+
if(symbol == 'S')
{
for(SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++)
results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+(*iter)->nickname.c_str()+" "+(*iter)->set_by+" "+ConvToStr((*iter)->set_on)+" "+ConvToStr((*iter)->length)+" "+ConvToStr(remaining)+" :"+(*iter)->reason);
}
}
-
+
return 0;
}
virtual int OnUserPreNick(User *user, const std::string &newnick)
{
ExpireBans();
-
+
/* check SVSHolds in here, and apply as necessary. */
SVSHoldMap::iterator n = HoldMap.find(assign(newnick));
if (n != HoldMap.end())
{
- user->WriteServ( "432 %s %s :Reserved nickname: %s", user->nick, newnick.c_str(), n->second->reason.c_str());
+ user->WriteServ( "432 %s %s :Reserved nickname: %s", user->nick.c_str(), newnick.c_str(), n->second->reason.c_str());
return 1;
}
return 0;
}
-
+
virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable)
{
for(SVSHoldMap::iterator iter = HoldMap.begin(); iter != HoldMap.end(); iter++)
virtual ~ModuleSVSHold()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
}
std::string EncodeSVSHold(const SVSHold* ban)
{
- std::ostringstream stream;
+ std::ostringstream stream;
stream << ban->nickname << " " << ban->set_by << " " << ban->set_on << " " << ban->length << " :" << ban->reason;
- return stream.str();
+ return stream.str();
}
SVSHold* DecodeSVSHold(const std::string &data)
{
if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
{
- ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
- ServerInstance->SNO->WriteToSnoMask('A',"%li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
+ ServerInstance->Logs->Log("m_svshold",DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
HoldMap.erase(assign((*iter)->nickname));
delete *iter;
safeiter = iter;
projects / user / henk / code / inspircd.git / blobdiff