X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=20d4c8e8faeeed905350aac88dfc2eb79c90b511;hb=b111d5098fe1ee306d2718c82c72f969db9d183d;hp=7ecc81a0e5482f5c680b626955e9541cfd2bd822;hpb=697098bb47651b40ed9c768361d1a3b1ca452856;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 7ecc81a0e..20d4c8e8f 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -1,16 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2010 Jens Voss + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007-2008 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 . */ + +/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */ + #include "inspircd.h" #include @@ -18,161 +29,124 @@ class DelayJoinMode : public ModeHandler { private: CUList empty; - Module* Creator; public: - DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false), Creator(Parent) {}; + DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) + { + levelrequired = OP_VALUE; + } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool); + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); }; class ModuleDelayJoin : public Module { - private: - DelayJoinMode* djm; - CUList nl; + DelayJoinMode djm; public: - ModuleDelayJoin(InspIRCd* Me) : Module(Me) + LocalIntExt unjoined; + ModuleDelayJoin() : djm(this), unjoined("delayjoin", this) + { + } + + void init() { - djm = new DelayJoinMode(ServerInstance, this); - if (!ServerInstance->Modes->AddMode(djm)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText, I_OnHostCycle }; - ServerInstance->Modules->Attach(eventlist, this, 7); + ServerInstance->Modules->AddService(djm); + ServerInstance->Modules->AddService(unjoined); + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual ~ModuleDelayJoin(); - virtual Version GetVersion(); - virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick); - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent); - bool OnHostCycle(User* user); - 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 OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); + ~ModuleDelayJoin(); + Version GetVersion(); + void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick); + void OnUserJoin(Membership*, bool, bool, CUList&); + void CleanUser(User* user); + void OnUserPart(Membership*, std::string &partmessage, CUList&); + void OnUserKick(User* source, Membership*, const std::string &reason, CUList&); + void OnBuildNeighborList(User* source, UserChanList &include, std::map &exception); void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list); - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5); + ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string ¶m, bool adding, int pcnt); }; -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ - -ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) +ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (channel->IsModeSet('D') != adding) - { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +D", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - if (channel->IsModeSet('D')) - { - /* - * Make all users visible, as +D is being removed. If we don't do this, - * they remain permanently invisible on this channel! - */ - CUList* names = channel->GetUsers(); - for (CUListIter n = names->begin(); n != names->end(); ++n) - Creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty); - } - channel->SetMode('D', adding); - return MODEACTION_ALLOW; - } - } - else - { + /* no change */ + if (channel->IsModeSet('D') == adding) return MODEACTION_DENY; + + if (!adding) + { + /* + * Make all users visible, as +D is being removed. If we don't do this, + * they remain permanently invisible on this channel! + */ + const UserMembList* names = channel->GetUsers(); + for (UserMembCIter n = names->begin(); n != names->end(); ++n) + creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty); } + channel->SetMode('D', adding); + return MODEACTION_ALLOW; } ModuleDelayJoin::~ModuleDelayJoin() { - ServerInstance->Modes->DelMode(djm); - delete djm; } Version ModuleDelayJoin::GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR); } -void ModuleDelayJoin::OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) +void ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) { - if (!channel->IsModeSet('D')) - return; - - if (nick.empty()) + /* don't prevent the user from seeing themself */ + if (issuer == memb->user) return; /* If the user is hidden by delayed join, hide them from the NAMES list */ - std::string key("delayjoin_"); - key.append(channel->name); - - if (user->GetExt(key)) + if (unjoined.get(memb)) nick.clear(); } -void ModuleDelayJoin::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +static void populate(CUList& except, Membership* memb) { - if (channel->IsModeSet('D')) + const UserMembList* users = memb->chan->GetUsers(); + for(UserMembCIter i = users->begin(); i != users->end(); i++) { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - user->WriteFrom(user, "JOIN %s", channel->name.c_str()); - - /* This metadata tells the module the user is delayed join on this specific channel */ - user->Extend("delayjoin_"+channel->name); - - /* This metadata tells the module the user is delayed join on at least one (or more) channels. - * It is only cleared when the user is no longer on ANY +D channels. - */ - if (!user->GetExt("delayjoin")) - user->Extend("delayjoin"); + if (i->first == memb->user || !IS_LOCAL(i->first)) + continue; + except.insert(i->first); } } -void ModuleDelayJoin::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) { - if (channel->IsModeSet('D')) + if (memb->chan->IsModeSet('D')) { - if (user->GetExt("delayjoin_"+channel->name)) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - user->WriteFrom(user, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str()); - } + unjoined.set(memb, 1); + populate(except, memb); } } -void ModuleDelayJoin::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) { - if (chan->IsModeSet('D')) - { - /* Send silenced event only to the user being kicked and the user doing the kick */ - if (user->GetExt("delayjoin_"+chan->name)) - { - silent = true; - user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); - } - } + if (unjoined.set(memb, 0)) + populate(except, memb); } -bool ModuleDelayJoin::OnHostCycle(User* user) +void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except) { - return user->GetExt("delayjoin"); + if (unjoined.set(memb, 0)) + populate(except, memb); } -void ModuleDelayJoin::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +void ModuleDelayJoin::OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - if (parthandler && user->GetExt("delayjoin")) + UCListIter i = include.begin(); + while (i != include.end()) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - { - std::vector parameters; - parameters.push_back(f->first->name); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, user); - } + Channel* c = *i++; + Membership* memb = c->GetUser(source); + if (memb && unjoined.get(memb)) + include.erase(c); } } @@ -185,58 +159,47 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std: if (target_type != TYPE_CHANNEL) return; - Channel* channel = (Channel*) dest; + Channel* channel = static_cast(dest); - if (!user->GetExt("delayjoin_"+channel->name)) + Membership* memb = channel->GetUser(user); + if (!memb || !unjoined.set(memb, 0)) return; /* Display the join to everyone else (the user who joined got it earlier) */ - this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - - std::string n = this->ServerInstance->Modes->ModeString(user, channel); - if (n.length() > 0) - this->WriteCommonFrom(user, channel, "MODE %s +%s", channel->name.c_str(), n.c_str()); + channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str()); - /* Shrink off the neccessary metadata for a specific channel */ - user->Shrink("delayjoin_"+channel->name); + std::string ms = memb->modes; + for(unsigned int i=0; i < memb->modes.length(); i++) + ms.append(" ").append(user->nick); - /* Check if the user is left on any other +D channels, if so don't take away the - * metadata that says theyre on one or more channels - */ - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - if (f->first->IsModeSet('D')) - return; - - user->Shrink("delayjoin"); + if (ms.length() > 0) + channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), ms.c_str()); } -// .. is there a real need to duplicate WriteCommonExcept? -void ModuleDelayJoin::WriteCommonFrom(User *user, Channel* channel, const char* text, ...) +/* make the user visible if he receives any mode change */ +ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mode, const std::string ¶m, bool adding, int pcnt) { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer); + if (!user || !channel || param.empty()) + return MOD_RES_PASSTHRU; - CUList *ulist = channel->GetUsers(); + ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_CHANNEL); + // If not a prefix mode then we got nothing to do here + if (!mh || !mh->GetPrefixRank()) + return MOD_RES_PASSTHRU; - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - /* User doesnt get a JOIN sent to themselves */ - if (user == i->first) - continue; + User* dest; + if (IS_LOCAL(user)) + dest = ServerInstance->FindNickOnly(param); + else + dest = ServerInstance->FindNick(param); - /* Users with a visibility state that hides them dont appear */ - if (user->Visibility && !user->Visibility->VisibleTo(i->first)) - continue; + if (!dest) + return MOD_RES_PASSTHRU; - i->first->Write(std::string(tb)); - } + Membership* memb = channel->GetUser(dest); + if (memb && unjoined.set(memb, 0)) + channel->WriteAllExceptSender(dest, false, 0, "JOIN %s", channel->name.c_str()); + return MOD_RES_PASSTHRU; } MODULE_INIT(ModuleDelayJoin) -