* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
/* $ModDesc: Adds timed bans */
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
-#include "configreader.h"
/** Holds a timed ban
*/
/** Handle /TBAN
*/
-class cmd_tban : public command_t
+class CommandTban : public Command
{
public:
- cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3)
+ CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
{
this->source = "m_timedbans.so";
syntax = "<channel> <duration> <banmask>";
+ TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- chanrec* channel = ServerInstance->FindChan(parameters[0]);
+ Channel* channel = ServerInstance->FindChan(parameters[0]);
if (channel)
{
int cm = channel->GetStatus(user);
}
for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
{
- if (!strcasecmp(i->data,parameters[2]))
+ if (!strcasecmp(i->data,parameters[2].c_str()))
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0]));
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]);
return CMD_FAILURE;
}
}
return CMD_FAILURE;
}
std::string mask = parameters[2];
- const char *setban[32];
- setban[0] = parameters[0];
- setban[1] = "+b";
- setban[2] = parameters[2];
+ std::vector<std::string> setban;
+ setban.push_back(parameters[0]);
+ setban.push_back("+b");
+ setban.push_back(parameters[2]);
// use CallCommandHandler to make it so that the user sets the mode
// themselves
- ServerInstance->CallCommandHandler("MODE",setban,3,user);
+ ServerInstance->CallCommandHandler("MODE",setban,user);
/* Check if the ban was actually added (e.g. banlist was NOT full) */
bool was_added = false;
for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
was_added = true;
if (was_added)
{
+ CUList tmp;
T.channel = channelname;
T.mask = mask;
T.expire = expire;
TimedBanList.push_back(T);
- channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+ channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
+ if (ServerInstance->Config->AllowHalfop)
+ channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration);
return CMD_SUCCESS;
}
return CMD_FAILURE;
}
- else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name);
+ else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, channel->name,
+ ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
return CMD_FAILURE;
}
- user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]);
+ user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0].c_str());
return CMD_FAILURE;
}
};
class ModuleTimedBans : public Module
{
- cmd_tban* mycommand;
+ CommandTban* mycommand;
public:
ModuleTimedBans(InspIRCd* Me)
: Module(Me)
{
- mycommand = new cmd_tban(ServerInstance);
+ mycommand = new CommandTban(ServerInstance);
ServerInstance->AddCommand(mycommand);
TimedBanList.clear();
+ Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
virtual ~ModuleTimedBans()
TimedBanList.clear();
}
- void Implements(char* List)
- {
- List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
- }
-
- virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
+ virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
{
irc::string listitem = banmask.c_str();
irc::string thischan = chan->name;
virtual void OnBackgroundTimer(time_t curtime)
{
- bool again = true;
- while (again)
+ timedbans::iterator safei;
+ for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end();)
{
- again = false;
- for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+ /* Safe copy of iterator, so we can erase as we iterate */
+ safei = i;
+ ++i;
+
+ if (curtime > safei->expire)
{
- if (curtime > i->expire)
+ Channel* cr = ServerInstance->FindChan(safei->channel);
+ if (cr)
{
- chanrec* cr = ServerInstance->FindChan(i->channel);
- again = true;
- if (cr)
- {
- cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str());
- const char *setban[3];
- setban[0] = i->channel.c_str();
- setban[1] = "-b";
- setban[2] = i->mask.c_str();
- // kludge alert!
- // ::SendMode expects a userrec* to send the numeric replies
- // back to, so we create it a fake user that isnt in the user
- // hash and set its descriptor to FD_MAGIC_NUMBER so the data
- // falls into the abyss :p
- userrec* temp = new userrec(ServerInstance);
- temp->SetFd(FD_MAGIC_NUMBER);
- /* FIX: Send mode remotely*/
- std::deque<std::string> n;
- n.push_back(setban[0]);
- n.push_back("-b");
- n.push_back(setban[2]);
- ServerInstance->SendMode(setban,3,temp);
- Event rmode((char *)&n, NULL, "send_mode");
- rmode.Send(ServerInstance);
- DELETE(temp);
- }
- else
- {
- /* Where the hell did our channel go?! */
- TimedBanList.erase(i);
- }
- // we used to delete the item here, but we dont need to as the servermode above does it for us,
- break;
+ std::string mask = safei->mask;
+ std::vector<std::string> setban;
+ setban.push_back(safei->channel);
+ setban.push_back("-b");
+ setban.push_back(mask);
+
+ CUList empty;
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str());
+ if (ServerInstance->Config->AllowHalfop)
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str());
+
+ /* Removes the ban item for us, no ::erase() needed */
+ ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]);
+ ServerInstance->SendMode(setban, ServerInstance->FakeClient);
+
+ if (ServerInstance->Modes->GetLastParse().empty())
+ TimedBanList.erase(safei);
+ }
+ else
+ {
+ /* Where the hell did our channel go?! */
+ TimedBanList.erase(safei);
}
}
}
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_VENDOR,API_VERSION);
- }
-};
-
-
-class ModuleTimedBansFactory : public ModuleFactory
-{
- public:
- ModuleTimedBansFactory()
- {
- }
-
- ~ModuleTimedBansFactory()
- {
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleTimedBans(Me);
- }
-
};
+MODULE_INIT(ModuleTimedBans)
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleTimedBansFactory;
-}
projects / user / henk / code / inspircd.git / blobdiff