#include "inspircd.h"
#include <stdarg.h>
+/* $ModDesc: Provides channelmode +d <int>, to deny messages to a channel until <int> seconds. */
+
class DelayMsgMode : public ModeHandler
{
private:
CUList empty;
public:
- DelayMsgMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, Parent, 'd', 1, 0, false, MODETYPE_CHANNEL, false, 0, '@') {};
+ LocalIntExt jointime;
+ DelayMsgMode(Module* Parent) : ModeHandler(Parent, 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
+ , jointime("delaymsg", Parent)
+ {
+ levelrequired = OP_VALUE;
+ }
ModePair ModeSet(User*, User*, Channel* channel, const std::string ¶meter)
{
}
}
- bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*)
+ bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel*)
{
return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
}
private:
DelayMsgMode djm;
public:
- ModuleDelayMsg(InspIRCd* Me) : Module(Me), djm(Me, this)
+ ModuleDelayMsg() : djm(this)
{
if (!ServerInstance->Modes->AddMode(&djm))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnCleanup, I_OnUserPreMessage};
- ServerInstance->Modules->Attach(eventlist, this, 5);
+ Extensible::Register(&djm.jointime);
+ Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
+ ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual ~ModuleDelayMsg();
- virtual Version GetVersion();
- void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created);
- void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent);
- void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent);
- void OnCleanup(int target_type, void* item);
+ ~ModuleDelayMsg();
+ Version GetVersion();
+ void OnUserJoin(Membership* memb, bool sync, bool created, CUList&);
ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list);
};
-/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
-
ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
if (adding)
/*
* Clean up metadata
*/
- CUList* names = channel->GetUsers();
- for (CUListIter n = names->begin(); n != names->end(); ++n)
- n->first->Shrink("delaymsg_" + channel->name);
+ const UserMembList* names = channel->GetUsers();
+ for (UserMembCIter n = names->begin(); n != names->end(); ++n)
+ jointime.set(n->second, 0);
}
channel->SetModeParam('d', adding ? parameter : "");
return MODEACTION_ALLOW;
ModuleDelayMsg::~ModuleDelayMsg()
{
- ServerInstance->Modes->DelMode(&djm);
}
Version ModuleDelayMsg::GetVersion()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR, API_VERSION);
}
-void ModuleDelayMsg::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)
+void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
{
- if (channel->IsModeSet('d'))
- user->Extend("delaymsg_"+channel->name, reinterpret_cast<char*>(ServerInstance->Time()));
-}
-
-void ModuleDelayMsg::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
-{
- user->Shrink("delaymsg_"+channel->name);
-}
-
-void ModuleDelayMsg::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
-{
- user->Shrink("delaymsg_"+chan->name);
-}
-
-void ModuleDelayMsg::OnCleanup(int target_type, void* item)
-{
- if (target_type == TYPE_USER)
+ if (memb->chan->IsModeSet('d'))
{
- User* user = (User*)item;
- for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
- {
- Channel* chan = f->first;
- user->Shrink("delaymsg_"+chan->name);
- }
+ djm.jointime.set(memb, ServerInstance->Time());
}
}
return MOD_RES_PASSTHRU;
Channel* channel = (Channel*) dest;
+ Membership* memb = channel->GetUser(user);
- void* jointime_as_ptr;
-
- if (!user->GetExt("delaymsg_"+channel->name, jointime_as_ptr))
+ if (!memb)
return MOD_RES_PASSTHRU;
+
+ time_t ts = djm.jointime.get(memb);
- time_t jointime = reinterpret_cast<time_t>(jointime_as_ptr);
+ if (ts == 0)
+ return MOD_RES_PASSTHRU;
std::string len = channel->GetModeParameter('d');
- if (jointime + atoi(len.c_str()) > ServerInstance->Time())
+ if (ts + atoi(len.c_str()) > ServerInstance->Time())
{
- if (channel->GetStatus(user) < STATUS_VOICE)
+ if (channel->GetPrefixValue(user) < VOICE_VALUE)
{
user->WriteNumeric(404, "%s %s :You must wait %s seconds after joining to send to channel (+d)",
user->nick.c_str(), channel->name.c_str(), len.c_str());
else
{
/* Timer has expired, we can stop checking now */
- user->Shrink("delaymsg_"+channel->name);
+ djm.jointime.set(memb, 0);
}
return MOD_RES_PASSTHRU;
}