* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
-inline int strtoint(const std::string &str)
-{
- std::istringstream ss(str);
- int result;
- ss >> result;
- return result;
-}
-
typedef std::map<User*, time_t> delaylist;
/** Handles channel mode +J
*/
-class KickRejoin : public ModeHandler
+class KickRejoin : public ParamChannelModeHandler
{
public:
- KickRejoin(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'J', 1, 0, false, MODETYPE_CHANNEL, false) { }
+ SimpleExtItem<delaylist> ext;
+ KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { }
- ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
+ bool ParamValidate(std::string& parameter)
{
- if (channel->IsModeSet('J'))
- return std::make_pair(true, channel->GetModeParameter('J'));
- else
- return std::make_pair(false, parameter);
+ int v = atoi(parameter.c_str());
+ if (v <= 0)
+ return false;
+ parameter = ConvToStr(v);
+ return true;
}
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (!adding)
- {
- // Taking the mode off, we need to clean up.
- delaylist* dl;
-
- if (channel->GetExt("norejoinusers", dl))
- {
- delete dl;
- channel->Shrink("norejoinusers");
- }
-
- if (!channel->IsModeSet('J'))
- {
- return MODEACTION_DENY;
- }
- else
- {
- channel->SetModeParam('J', "");
- return MODEACTION_ALLOW;
- }
- }
- else if (atoi(parameter.c_str()) > 0)
- {
- if (!channel->IsModeSet('J'))
- {
- parameter = ConvToStr(atoi(parameter.c_str()));
- channel->SetModeParam('J', parameter);
- return MODEACTION_ALLOW;
- }
- else
- {
- std::string cur_param = channel->GetModeParameter('J');
- if (cur_param == parameter)
- {
- // mode params match, don't change mode
- return MODEACTION_DENY;
- }
- else
- {
- // new mode param, replace old with new
- parameter = ConvToStr(atoi(parameter.c_str()));
- if (parameter != "0")
- {
- channel->SetModeParam('J', parameter);
- return MODEACTION_ALLOW;
- }
- else
- {
- /* Fix to jamie's fix, dont allow +J 0 on the new value! */
- return MODEACTION_DENY;
- }
- }
- }
- }
- else
- {
- return MODEACTION_DENY;
- }
+ ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding);
+ if (rv == MODEACTION_ALLOW && !adding)
+ ext.unset(channel);
+ return rv;
}
};
class ModuleKickNoRejoin : public Module
{
-
KickRejoin kr;
public:
- ModuleKickNoRejoin(InspIRCd* Me)
- : Module(Me), kr(Me, this)
+ ModuleKickNoRejoin()
+ : kr(this)
{
if (!ServerInstance->Modes->AddMode(&kr))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ ServerInstance->Extensions.Register(&kr.ext);
+ Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if (chan)
{
- delaylist* dl;
- if (chan->GetExt("norejoinusers", dl))
+ delaylist* dl = kr.ext.get(chan);
+ if (dl)
{
std::vector<User*> itemstoremove;
{
if (iter->first == user)
{
- user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter('J').c_str());
+ user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)",
+ user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter(&kr).c_str());
return MOD_RES_DENY;
}
}
dl->erase(itemstoremove[i]);
if (!dl->size())
- {
- // Now it's empty..
- delete dl;
- chan->Shrink("norejoinusers");
- }
+ kr.ext.unset(chan);
}
}
return MOD_RES_PASSTHRU;
}
- virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+ void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
{
- if (chan->IsModeSet('J') && (source != user))
+ if (memb->chan->IsModeSet(&kr) && (source != memb->user))
{
- delaylist* dl;
- if (!chan->GetExt("norejoinusers", dl))
+ delaylist* dl = kr.ext.get(memb->chan);
+ if (!dl)
{
dl = new delaylist;
- chan->Extend("norejoinusers", dl);
+ kr.ext.set(memb->chan, dl);
}
- (*dl)[user] = ServerInstance->Time() + strtoint(chan->GetModeParameter('J'));
+ (*dl)[memb->user] = ServerInstance->Time() + atoi(memb->chan->GetModeParameter(&kr).c_str());
}
}
- virtual void OnChannelDelete(Channel* chan)
- {
- delaylist* dl;
-
- if (chan->GetExt("norejoinusers", dl))
- {
- delete dl;
- chan->Shrink("norejoinusers");
- }
- }
-
- virtual void OnCleanup(int target_type, void* item)
- {
- if(target_type == TYPE_CHANNEL)
- OnChannelDelete((Channel*)item);
- }
-
-
- virtual ~ModuleKickNoRejoin()
+ ~ModuleKickNoRejoin()
{
- ServerInstance->Modes->DelMode(&kr);
}
- virtual Version GetVersion()
+ Version GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff