X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_join.cpp;h=ee479771616dc227d75d42eaf391d14b9325dd4a;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=5abee8303077cac79a08a09ea29fecf99562f7f6;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index 5abee8303..ee4797716 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -1,93 +1,120 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2014 Daniel Vassdal + * Copyright (C) 2013-2015 Attila Molnar + * Copyright (C) 2013, 2017, 2019 Sadie Powell + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Craig Edwards * - * 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" -/* $ModDesc: Forces users to join the specified channel(s) on connect */ +#include "inspircd.h" -class ModuleConnJoin : public Module +static void JoinChannels(LocalUser* u, const std::string& chanlist) { - private: - std::string JoinChan; - std::vector Joinchans; - + irc::commasepstream chans(chanlist); + std::string chan; - int tokenize(const string &str, std::vector &tokens) - { - // skip delimiters at beginning. - string::size_type lastPos = str.find_first_not_of(",", 0); - // find first "non-delimiter". - string::size_type pos = str.find_first_of(",", lastPos); - - while (string::npos != pos || string::npos != lastPos) - { - // found a token, add it to the vector. - tokens.push_back(str.substr(lastPos, pos - lastPos)); - // skip delimiters. Note the "not_of" - lastPos = str.find_first_not_of(",", pos); - // find next "non-delimiter" - pos = str.find_first_of(",", lastPos); - } - return tokens.size(); - } - - public: - ModuleConnJoin(InspIRCd* Me) - : Module(Me) - { - OnRehash(NULL, ""); - } - - Priority Prioritize() - { - return PRIORITY_LAST; - } - - void Implements(char* List) - { - List[I_OnPostConnect] = List[I_OnRehash] = 1; - } + while (chans.GetToken(chan)) + { + if (ServerInstance->IsChannel(chan)) + Channel::JoinUser(u, chan); + } +} - virtual void OnRehash(User* user, const std::string ¶meter) - { - ConfigReader* conf = new ConfigReader(ServerInstance); - JoinChan = conf->ReadValue("autojoin", "channel", 0); - Joinchans.clear(); - if (!JoinChan.empty()) - tokenize(JoinChan,Joinchans); - DELETE(conf); - } - - virtual ~ModuleConnJoin() - { - } - - virtual Version GetVersion() - { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); - } +class JoinTimer : public Timer +{ + private: + LocalUser* const user; + const std::string channels; + SimpleExtItem& ext; + + public: + JoinTimer(LocalUser* u, SimpleExtItem& ex, const std::string& chans, unsigned int delay) + : Timer(delay, false) + , user(u), channels(chans), ext(ex) + { + ServerInstance->Timers.AddTimer(this); + } + + bool Tick(time_t time) CXX11_OVERRIDE + { + if (user->chans.empty()) + JoinChannels(user, channels); + + ext.unset(user); + return false; + } +}; - virtual void OnPostConnect(User* user) +class ModuleConnJoin : public Module +{ + SimpleExtItem ext; + std::string defchans; + unsigned int defdelay; + + public: + ModuleConnJoin() + : ext("join_timer", ExtensionItem::EXT_USER, this) + { + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + ConfigTag* tag = ServerInstance->Config->ConfValue("autojoin"); + defchans = tag->getString("channel"); + defdelay = tag->getDuration("delay", 0, 0, 60*15); + } + + void Prioritize() CXX11_OVERRIDE + { + ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST); + } + + Version GetVersion() CXX11_OVERRIDE + { + return Version("Allows the server administrator to force users to join one or more channels on connect.", VF_VENDOR); + } + + void OnPostConnect(User* user) CXX11_OVERRIDE + { + LocalUser* localuser = IS_LOCAL(user); + if (!localuser) + return; + + std::string chanlist = localuser->GetClass()->config->getString("autojoin"); + unsigned int chandelay = localuser->GetClass()->config->getDuration("autojoindelay", 0, 0, 60*15); + + if (chanlist.empty()) { - if (!IS_LOCAL(user)) + if (defchans.empty()) return; - - for(std::vector::iterator it = Joinchans.begin(); it != Joinchans.end(); it++) - if (ServerInstance->IsChannel(it->c_str())) - Channel::JoinUser(ServerInstance, user, it->c_str(), false, "", ServerInstance->Time(true)); + chanlist = defchans; + chandelay = defdelay; } + if (!chandelay) + JoinChannels(localuser, chanlist); + else + ext.set(localuser, new JoinTimer(localuser, ext, chanlist, chandelay)); + } }; - MODULE_INIT(ModuleConnJoin)