X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=20d4c8e8faeeed905350aac88dfc2eb79c90b511;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=a7a8575b4c7a19bff41d7ccd08fe79269b6312a7;hpb=d9e3bb8d4343643504ab7ee6ab943a000065cc8a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index a7a8575b4..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-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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 @@ -19,7 +30,7 @@ class DelayJoinMode : public ModeHandler private: CUList empty; public: - DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Parent, 'D', PARAM_NONE, MODETYPE_CHANNEL) + DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) { levelrequired = OP_VALUE; } @@ -32,27 +43,29 @@ class ModuleDelayJoin : public Module DelayJoinMode djm; public: LocalIntExt unjoined; - ModuleDelayJoin(InspIRCd* Me) : Module(Me), djm(Me, this), unjoined("delayjoin", this) + ModuleDelayJoin() : djm(this), unjoined("delayjoin", this) + { + } + + void init() { - 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)); } ~ModuleDelayJoin(); Version GetVersion(); void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick); void OnUserJoin(Membership*, bool, bool, CUList&); void CleanUser(User* user); - ModResult OnHostCycle(User* user); void OnUserPart(Membership*, std::string &partmessage, CUList&); void OnUserKick(User* source, Membership*, const std::string &reason, CUList&); - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); + 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); }; -/* $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) { /* no change */ @@ -75,12 +88,11 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe ModuleDelayJoin::~ModuleDelayJoin() { - ServerInstance->Modes->DelMode(&djm); } Version ModuleDelayJoin::GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR); + 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) @@ -126,28 +138,15 @@ void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::stri populate(except, memb); } -ModResult ModuleDelayJoin::OnHostCycle(User* user) -{ - // TODO - return MOD_RES_DENY; -} - -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) - return; - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + UCListIter i = include.begin(); + while (i != include.end()) { - Channel* chan = *f; - Membership* memb = chan->GetUser(user); + Channel* c = *i++; + Membership* memb = c->GetUser(source); if (memb && unjoined.get(memb)) - { - std::vector parameters; - parameters.push_back(chan->name); - /* Send a fake PART from the channel, which will be silent */ - parthandler->Handle(parameters, user); - } + include.erase(c); } } @@ -160,7 +159,7 @@ 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); Membership* memb = channel->GetUser(user); if (!memb || !unjoined.set(memb, 0)) @@ -169,10 +168,38 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std: /* 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 n = ServerInstance->Modes->ModeString(user, channel); - if (n.length() > 0) - channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), n.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()); } -MODULE_INIT(ModuleDelayJoin) +/* 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)