X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=651cbb23e66aede32b25adf5beea7febe68fc921;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=abdee355a40dc3e4b23c66f5c35f46816ac4e537;hpb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index abdee355a..651cbb23e 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,45 +14,15 @@ #include "inspircd.h" #include -/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ - 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(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, bool) - { - if (channel->IsModeSet('D') != adding) - { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - if (channel->IsModeSet('D')) - { - /* Make all delayed join users visible, or if an op removes +D - * while users exist that havent spoken, they remain permenantly - * 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 - { - return MODEACTION_DENY; - } - } + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool); }; class ModuleDelayJoin : public Module @@ -61,165 +31,214 @@ class ModuleDelayJoin : public Module DelayJoinMode* djm; CUList nl; public: - ModuleDelayJoin(InspIRCd* Me) - : Module(Me) + ModuleDelayJoin(InspIRCd* Me) : Module(Me) { 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 }; - ServerInstance->Modules->Attach(eventlist, this, 6); - } - - virtual ~ModuleDelayJoin() - { - ServerInstance->Modes->DelMode(djm); - delete djm; + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText, I_OnHostCycle }; + ServerInstance->Modules->Attach(eventlist, this, 7); } + 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); + 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); +}; + +/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ - virtual Version GetVersion() +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; + + if (!adding) { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + /* + * 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 void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) - { - if (!channel->IsModeSet('D')) - return; +ModuleDelayJoin::~ModuleDelayJoin() +{ + ServerInstance->Modes->DelMode(djm); + delete djm; +} - if (nick.empty()) - return; +Version ModuleDelayJoin::GetVersion() +{ + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); +} - /* If the user is hidden by delayed join, hide them from the NAMES list */ - std::string key("delayjoin_"); - key.append(channel->name); +void ModuleDelayJoin::OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) +{ + if (!channel->IsModeSet('D')) + return; - if (user->GetExt(key)) - nick.clear(); - } + if (nick.empty()) + return; - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) + /* don't prevent the user from seeing themself */ + if (issuer == user) + return; + + /* 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) +{ + 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"); - 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)) { std::vector parameters; - parameters.push_back(f->first->name); - /* This triggers our OnUserPart, above, making the PART silent */ + parameters.push_back(chan->name); + /* Send a fake PART from the channel, which will be silent */ parthandler->Handle(parameters, user); } } + user->Shrink("delayjoin"); } +} - void 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 = (Channel*) dest; +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 (!user->GetExt(std::string("delayjoin_")+channel->name)) - return; + if (target_type != TYPE_CHANNEL) + return; - /* Display the join to everyone else (the user who joined got it earlier) */ - this->WriteCommonFrom(user, channel, "JOIN %s", channel->name); + Channel* channel = (Channel*) dest; - std::string n = this->ServerInstance->Modes->ModeString(user, channel); - if (n.length() > 0) - this->WriteCommonFrom(user, channel, "MODE %s +%s", channel->name, n.c_str()); + 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; + 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); +} - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5) - { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; +// .. 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(),textbuffer); + va_start(argsPtr, text); + vsnprintf(textbuffer, MAXBUF, text, argsPtr); + va_end(argsPtr); + snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer); - CUList *ulist = channel->GetUsers(); + CUList *ulist = channel->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - /* User doesnt get a JOIN sent to themselves */ - if (user == i->first) - continue; + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + /* 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; + /* 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)); - } + i->first->Write(std::string(tb)); } - -}; +} MODULE_INIT(ModuleDelayJoin)