X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=20d4c8e8faeeed905350aac88dfc2eb79c90b511;hb=b111d5098fe1ee306d2718c82c72f969db9d183d;hp=6a048146556d927c6dedcd84cae964065541b7c4;hpb=7a2a85535c14a66c2dd7e1c2c281bfe6fcbaf7ad;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 6a0481465..20d4c8e8f 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -1,163 +1,205 @@ -/* +------------------------------------+ - * | 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) 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 . */ -#include "inspircd.h" -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ +/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */ + +#include "inspircd.h" +#include class DelayJoinMode : public ModeHandler { + private: + CUList empty; public: - DelayJoinMode(InspIRCd* Instance) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) { - if (channel->IsModeSet('D') != adding) - { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - channel->SetMode('D', adding); - return MODEACTION_ALLOW; - } - } - else - { - return MODEACTION_DENY; - } + levelrequired = OP_VALUE; } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); }; class ModuleDelayJoin : public Module { - private: - DelayJoinMode* djm; - CUList nl; - CUList except_list; + DelayJoinMode djm; public: - ModuleDelayJoin(InspIRCd* Me) - : Module(Me) - { - djm = new DelayJoinMode(ServerInstance); - if (!ServerInstance->AddMode(djm)) - throw ModuleException("Could not add new modes!"); - } - - virtual ~ModuleDelayJoin() + LocalIntExt unjoined; + ModuleDelayJoin() : djm(this), unjoined("delayjoin", this) { - ServerInstance->Modes->DelMode(djm); - DELETE(djm); } - Priority Prioritize() + void init() { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so"); + 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)); } + ~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); + ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string ¶m, bool adding, int pcnt); +}; - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } +ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +{ + /* no change */ + if (channel->IsModeSet('D') == adding) + return MODEACTION_DENY; - void Implements(char* List) + if (!adding) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; + /* + * 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; +} - virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) - { - if (Ptr->IsModeSet('D')) - { - nl = *nameslist; - - for (CUListIter n = nameslist->begin(); n != nameslist->end(); ++n) - { - if (n->first->GetExt("delayjoin_notspoken")) - nl.erase(n->first); - } - - nl[user] = user->nick; - nameslist = &nl; - } - return 0; - } - - virtual void OnUserJoin(User* user, Channel* channel, bool &silent) - { - if (channel->IsModeSet('D')) - { - 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); - user->Extend(std::string("delayjoin_")+channel->name); - user->Extend("delayjoin"); - } - } +ModuleDelayJoin::~ModuleDelayJoin() +{ +} + +Version ModuleDelayJoin::GetVersion() +{ + 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, Membership* memb, std::string &prefixes, std::string &nick) +{ + /* 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 */ + if (unjoined.get(memb)) + nick.clear(); +} - void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) +static void populate(CUList& except, Membership* memb) +{ + const UserMembList* users = memb->chan->GetUsers(); + for(UserMembCIter i = users->begin(); i != users->end(); i++) { - if (channel->IsModeSet('D')) - { - if (user->GetExt(std::string("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, partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str()); - } - } + if (i->first == memb->user || !IS_LOCAL(i->first)) + continue; + except.insert(i->first); } +} - void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) +{ + if (memb->chan->IsModeSet('D')) { - if (chan->IsModeSet('D')) - { - /* Send silenced event only to the user being kicked and the user doing the kick */ - if (user->GetExt(std::string("delayjoin_")+chan->name)) - { - silent = true; - user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); - } - } + unjoined.set(memb, 1); + populate(except, memb); } +} + +void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) +{ + if (unjoined.set(memb, 0)) + populate(except, memb); +} + +void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except) +{ + if (unjoined.set(memb, 0)) + populate(except, memb); +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +void ModuleDelayJoin::OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) +{ + UCListIter i = include.begin(); + while (i != include.end()) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - const char* parameters[2]; - if (parthandler && user->GetExt("delayjoin")) - { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - { - if (f->first->IsModeSet('D')) - to_leave.push_back(f->first->name); - } - /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ - for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) - { - parameters[0] = n->c_str(); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); - } - } + Channel* c = *i++; + Membership* memb = c->GetUser(source); + if (memb && unjoined.get(memb)) + include.erase(c); } -}; +} -MODULE_INIT(ModuleDelayJoin) +void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) +{ + /* Server origin */ + if (!user) + return; + + if (target_type != TYPE_CHANNEL) + return; + + Channel* channel = static_cast(dest); + 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) */ + channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str()); + + std::string ms = memb->modes; + for(unsigned int i=0; i < memb->modes.length(); i++) + ms.append(" ").append(user->nick); + + if (ms.length() > 0) + channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), ms.c_str()); +} + +/* 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) +{ + if (!user || !channel || param.empty()) + return MOD_RES_PASSTHRU; + + 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; + + User* dest; + if (IS_LOCAL(user)) + dest = ServerInstance->FindNickOnly(param); + else + dest = ServerInstance->FindNick(param); + + if (!dest) + return MOD_RES_PASSTHRU; + + 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)