X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=8b5e83e88b5b6d3e82ced1e3929aec1ec0165857;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=b6fc00f2bfe601e06fc62fbe506fc06bfb51921d;hpb=d22271ed979f0fd5984bfa7e7fd1a9f3966d572e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index b6fc00f2b..8b5e83e88 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -2,204 +2,241 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" - -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ +#include class DelayJoinMode : public ModeHandler { + private: + CUList empty; + Module* Creator; public: - DelayJoinMode(InspIRCd* Instance) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false) { } + DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@'), Creator(Parent) {}; - ModeAction 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->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; - } - } + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool); }; class ModuleDelayJoin : public Module { private: - DelayJoinMode* djm; + DelayJoinMode djm; CUList nl; public: - ModuleDelayJoin(InspIRCd* Me) - : Module(Me) + ModuleDelayJoin(InspIRCd* Me) : Module(Me), djm(Me, this) { - djm = new DelayJoinMode(ServerInstance); - if (!ServerInstance->AddMode(djm)) + 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); } - - virtual ~ModuleDelayJoin() - { - ServerInstance->Modes->DelMode(djm); - DELETE(djm); - } + 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 created); + void CleanUser(User* user); + 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); + 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); +}; - Priority Prioritize() - { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so"); - } +/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ - 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, bool) +{ + /* 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! + */ + 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; +} - virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) - { - if (!nameslist) - return 0; +ModuleDelayJoin::~ModuleDelayJoin() +{ + ServerInstance->Modes->DelMode(&djm); +} - /* For +D channels ... */ - if (Ptr->IsModeSet('D')) - { - /* Modify the names list, erasing users with the delay join metadata - * for this channel (havent spoken yet) - */ - ServerInstance->Log(DEBUG,"Iterate"); +Version ModuleDelayJoin::GetVersion() +{ + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); +} - for (CUListIter n = nameslist->begin(); n != nameslist->end(); ++n) - { - ServerInstance->Log(DEBUG,"Item"); - - if (!n->first->GetExt("delayjoin_notspoken")) - nl.insert(*n); - } +void ModuleDelayJoin::OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) +{ + if (!channel->IsModeSet('D')) + return; - ServerInstance->Log(DEBUG,"Done"); - nl[user] = user->nick; - nameslist = &nl; - } - return 0; - } + if (nick.empty()) + return; + + /* don't prevent the user from seeing themself */ + if (issuer == user) + return; - virtual void OnUserJoin(User* user, Channel* channel, bool &silent) + /* If the user is hidden by delayed join, hide them from the NAMES list */ + if (user->GetExt("delayjoin_"+channel->name)) + nick.clear(); +} + +void ModuleDelayJoin::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) +{ + if (channel->IsModeSet('D')) { - 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); - - /* This metadata tells the module the user is delayed join on this specific channel */ - user->Extend(std::string("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"); - } + 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"); } +} - void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) +void ModuleDelayJoin::CleanUser(User* user) +{ + /* Check if the user is hidden on any other +D channels, if so don't take away the + * metadata that says they're hidden on one or more channels + */ + for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + if (user->GetExt("delayjoin_" + f->first->name)) + return; + + user->Shrink("delayjoin"); +} + +void ModuleDelayJoin::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +{ + if (!channel->IsModeSet('D')) + return; + if (user->GetExt("delayjoin_"+channel->name)) { - 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()); - } - } + user->Shrink("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()); + CleanUser(user); } +} - void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +void ModuleDelayJoin::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) +{ + if (!chan->IsModeSet('D')) + return; + /* Send silenced event only to the user being kicked and the user doing the kick */ + if (user->GetExt("delayjoin_"+chan->name)) { - 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()); - } - } + user->Shrink("delayjoin_"+chan->name); + silent = true; + user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); + CleanUser(user); } +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +bool ModuleDelayJoin::OnHostCycle(User* user) +{ + return user->GetExt("delayjoin"); +} + +void ModuleDelayJoin::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +{ + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); + if (parthandler && user->GetExt("delayjoin")) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - const char* parameters[2]; - if (parthandler && user->GetExt("delayjoin")) + for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + Channel* chan = f->first; + if (user->GetExt("delayjoin_"+chan->name)) { - parameters[0] = f->first->name; - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); + std::vector parameters; + parameters.push_back(chan->name); + /* Send a fake PART from the channel, which will be silent */ + parthandler->Handle(parameters, user); } } + user->Shrink("delayjoin"); } +} - int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - if (target_type != TYPE_CHANNEL) - return 0; +void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) +{ + /* Server origin */ + if (!user) + return; - Channel* channel = (Channel*) dest; + if (target_type != TYPE_CHANNEL) + return; - if (!user->GetExt(std::string("delayjoin_")+channel->name)) - return 0; + Channel* channel = (Channel*) dest; - /* Display the join to everyone else (the user who joined got it earlier) */ - channel->WriteAllExcept(user, false, 0, exempt_list, "JOIN %s", channel->name); + if (!user->GetExt("delayjoin_"+channel->name)) + return; - /* Shrink off the neccessary metadata for a specific channel */ - user->Shrink(std::string("delayjoin_")+channel->name); + /* Display the join to everyone else (the user who joined got it earlier) */ + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - /* 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 0; + 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()); - user->Shrink("delayjoin"); + /* Shrink off the neccessary metadata for a specific channel */ + user->Shrink("delayjoin_"+channel->name); + CleanUser(user); +} - return 0; - } +// .. is there a real need to duplicate WriteCommonExcept? +void ModuleDelayJoin::WriteCommonFrom(User *user, Channel* channel, const char* text, ...) +{ + 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); - int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + CUList *ulist = channel->GetUsers(); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - return OnUserPreMessage(user, dest, target_type, text, status, exempt_list); + /* User doesnt get a JOIN sent to themselves */ + if (user == i->first) + continue; + + /* Users with a visibility state that hides them dont appear */ + if (user->Visibility && !user->Visibility->VisibleTo(i->first)) + continue; + + i->first->Write(std::string(tb)); } -}; +} MODULE_INIT(ModuleDelayJoin)