X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delaymsg.cpp;h=89d62a6a0d69f07f03558947aa16a8fb093d6192;hb=46e56dedd37abe33af4e8b970d5b83729dc1ef05;hp=c40439ea8be2a72155eef2a2239ea9a4c87575ca;hpb=3d8ec5dbd9cfde34fcbc63ad7b9b1369866f0a33;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp index c40439ea8..89d62a6a0 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -2,7 +2,7 @@ * | 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 @@ -14,27 +14,21 @@ #include "inspircd.h" #include +/* $ModDesc: Provides channelmode +d , to deny messages to a channel until 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, '@') {}; - - ModePair ModeSet(User*, User*, Channel* channel, const std::string ¶meter) + LocalIntExt jointime; + DelayMsgMode(Module* Parent) : ModeHandler(Parent, "delaymsg", 'd', PARAM_SETONLY, MODETYPE_CHANNEL) + , jointime("delaymsg", Parent) { - std::string climit = channel->GetModeParameter('d'); - if (!climit.empty()) - { - return std::make_pair(true, climit); - } - else - { - return std::make_pair(false, parameter); - } + levelrequired = OP_VALUE; } - 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())); } @@ -47,24 +41,20 @@ class ModuleDelayMsg : public Module 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); + ServerInstance->Extensions.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); - int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list); + ~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) @@ -83,9 +73,9 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel /* * 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; @@ -93,78 +83,58 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel ModuleDelayMsg::~ModuleDelayMsg() { - ServerInstance->Modes->DelMode(&djm); } Version ModuleDelayMsg::GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); -} - -void ModuleDelayMsg::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) -{ - if (channel->IsModeSet('d')) - user->Extend("delaymsg_"+channel->name, reinterpret_cast(ServerInstance->Time())); + return Version("Provides channelmode +d , to deny messages to a channel until seconds.", VF_VENDOR); } -void ModuleDelayMsg::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&) { - 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()); } } -int ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list) +ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list) { /* Server origin */ if (!user) - return false; + return MOD_RES_PASSTHRU; if (target_type != TYPE_CHANNEL) - return false; + 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)) - return false; + if (!memb) + return MOD_RES_PASSTHRU; + + time_t ts = djm.jointime.get(memb); - time_t jointime = reinterpret_cast(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()); - return true; + return MOD_RES_DENY; } } else { /* Timer has expired, we can stop checking now */ - user->Shrink("delaymsg_"+channel->name); + djm.jointime.set(memb, 0); } - return false; + return MOD_RES_PASSTHRU; } MODULE_INIT(ModuleDelayMsg)