X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_delaymsg.cpp;h=27e2c3e4011ca6c65870763b1c888c353f2580fa;hb=HEAD;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..27e2c3e40 100644 --- a/src/modules/m_delaymsg.cpp +++ b/src/modules/m_delaymsg.cpp @@ -1,171 +1,163 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include +#include "modules/ctctags.h" -class DelayMsgMode : public ModeHandler +class DelayMsgMode : public ParamMode { - 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) + : ParamMode(Parent, "delaymsg", 'd') + , jointime("delaymsg", ExtensionItem::EXT_MEMBERSHIP, Parent) { - std::string climit = channel->GetModeParameter('d'); - if (!climit.empty()) - { - return std::make_pair(true, climit); - } - else - { - return std::make_pair(false, parameter); - } + ranktoset = ranktounset = OP_VALUE; + syntax = ""; } - bool CheckTimeStamp(std::string &their_param, const std::string &our_param, Channel*) + bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel*) CXX11_OVERRIDE { - return (atoi(their_param.c_str()) < atoi(our_param.c_str())); + return ConvToNum(their_param) < ConvToNum(our_param); } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); + ModeAction OnSet(User* source, Channel* chan, std::string& parameter) CXX11_OVERRIDE; + void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE; + + void SerializeParam(Channel* chan, intptr_t n, std::string& out) + { + out += ConvToStr(n); + } }; -class ModuleDelayMsg : public Module +class ModuleDelayMsg + : public Module + , public CTCTags::EventListener { private: DelayMsgMode djm; + bool allownotice; + ModResult HandleMessage(User* user, const MessageTarget& target, bool notice); + public: - ModuleDelayMsg(InspIRCd* Me) : Module(Me), djm(Me, this) + ModuleDelayMsg() + : CTCTags::EventListener(this) + , 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); } - 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); -}; -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ + Version GetVersion() CXX11_OVERRIDE; + void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) CXX11_OVERRIDE; + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE; + ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE; + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; +}; -ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter) { - if (adding) - { - /* Setting a new limit, sanity check */ - long limit = atoi(parameter.c_str()); + // Setting a new limit, sanity check + intptr_t limit = ConvToNum(parameter); + if (limit <= 0) + limit = 1; - /* Wrap low values at 32768 */ - if (limit < 0) - limit = 0x7FFF; - - parameter = ConvToStr(limit); - } - else - { - /* - * Clean up metadata - */ - CUList* names = channel->GetUsers(); - for (CUListIter n = names->begin(); n != names->end(); ++n) - n->first->Shrink("delaymsg_" + channel->name); - } - channel->SetModeParam('d', adding ? parameter : ""); + ext.set(chan, limit); return MODEACTION_ALLOW; } -ModuleDelayMsg::~ModuleDelayMsg() +void DelayMsgMode::OnUnset(User* source, Channel* chan) { - ServerInstance->Modes->DelMode(&djm); + /* + * Clean up metadata + */ + const Channel::MemberMap& users = chan->GetUsers(); + for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n) + jointime.set(n->second, 0); } 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("Adds channel mode d (delaymsg) which prevents newly joined users from speaking until the specified number of seconds have passed.", 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); + if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet(djm))) + { + djm.jointime.set(memb, ServerInstance->Time()); + } } -void ModuleDelayMsg::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +ModResult ModuleDelayMsg::OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) { - user->Shrink("delaymsg_"+chan->name); + return HandleMessage(user, target, details.type == MSG_NOTICE); } -void ModuleDelayMsg::OnCleanup(int target_type, void* item) +ModResult ModuleDelayMsg::OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) { - if (target_type == TYPE_USER) - { - User* user = (User*)item; - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - { - Channel* chan = f->first; - user->Shrink("delaymsg_"+chan->name); - } - } + return HandleMessage(user, target, false); } -int ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list) +ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target, bool notice) { - /* Server origin */ - if (!user) - return false; + if (!IS_LOCAL(user)) + return MOD_RES_PASSTHRU; - if (target_type != TYPE_CHANNEL) - return false; + if ((target.type != MessageTarget::TYPE_CHANNEL) || ((!allownotice) && (notice))) + return MOD_RES_PASSTHRU; - Channel* channel = (Channel*) dest; + Channel* channel = target.Get(); + Membership* memb = channel->GetUser(user); - void* jointime_as_ptr; + if (!memb) + return MOD_RES_PASSTHRU; - if (!user->GetExt("delaymsg_"+channel->name, jointime_as_ptr)) - return false; + 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'); + int len = djm.ext.get(channel); - if (jointime + atoi(len.c_str()) > ServerInstance->Time()) + if ((ts + len) > 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; + const std::string message = InspIRCd::Format("You cannot send messages to this channel until you have been a member for %d seconds.", len); + user->WriteNumeric(Numerics::CannotSendTo(channel, message)); + 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) +void ModuleDelayMsg::ReadConfig(ConfigStatus& status) +{ + ConfigTag* tag = ServerInstance->Config->ConfValue("delaymsg"); + allownotice = tag->getBool("allownotice", true); +} +MODULE_INIT(ModuleDelayMsg)