X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_delayjoin.cpp;h=1db0e7c0d58740ffaeffe222c8ed0602282e11a3;hb=085a8bc6605d3d07bfe5137423c4a7a02978cd88;hp=8b5e83e88b5b6d3e82ced1e3929aec1ec0165857;hpb=5abd3b1cc5fba26486d71c6a415fae797388ddf3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 8b5e83e88..1db0e7c0d 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -18,42 +18,41 @@ class DelayJoinMode : public ModeHandler { private: CUList empty; - Module* Creator; public: - DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@'), Creator(Parent) {}; + DelayJoinMode(Module* Parent) : ModeHandler(Parent, '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; public: - ModuleDelayJoin(InspIRCd* Me) : Module(Me), djm(Me, this) + LocalIntExt unjoined; + ModuleDelayJoin() : djm(this), unjoined("delayjoin", 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); + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - 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); + ~ModuleDelayJoin(); + Version GetVersion(); + void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick); + void OnUserJoin(Membership*, bool, bool, CUList&); 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 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); }; /* $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) { /* no change */ if (channel->IsModeSet('D') == adding) @@ -65,9 +64,9 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe * 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); + 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; @@ -75,112 +74,65 @@ 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, API_VERSION); + return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_COMMON | 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()) - return; - /* don't prevent the user from seeing themself */ - if (issuer == user) + if (issuer == memb->user) return; /* If the user is hidden by delayed join, hide them from the NAMES list */ - if (user->GetExt("delayjoin_"+channel->name)) + if (unjoined.get(memb)) nick.clear(); } -void ModuleDelayJoin::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) +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::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) +void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) { - if (!channel->IsModeSet('D')) - return; - if (user->GetExt("delayjoin_"+channel->name)) + if (memb->chan->IsModeSet('D')) { - 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); + 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')) - return; - /* Send silenced event only to the user being kicked and the user doing the kick */ - if (user->GetExt("delayjoin_"+chan->name)) - { - 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); - } + 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++) - { - Channel* chan = f->first; - if (user->GetExt("delayjoin_"+chan->name)) - { - 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"); + Channel* c = *i++; + Membership* memb = c->GetUser(source); + if (memb && unjoined.get(memb)) + include.erase(c); } } @@ -195,47 +147,16 @@ void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std: Channel* channel = (Channel*) 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()); + channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str()); - std::string n = this->ServerInstance->Modes->ModeString(user, channel); + std::string n = ServerInstance->Modes->ModeString(user, channel); if (n.length() > 0) - this->WriteCommonFrom(user, channel, "MODE %s +%s", channel->name.c_str(), n.c_str()); - - /* Shrink off the neccessary metadata for a specific channel */ - user->Shrink("delayjoin_"+channel->name); - CleanUser(user); -} - -// .. 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); - - 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; - - /* 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)); - } + channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), n.c_str()); } MODULE_INIT(ModuleDelayJoin)