X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=ef7d96f5adfe7d59221834dfdaa94eb5fae16321;hb=8fd2f620cef9d43a7271d05e82bdce6705b9af3b;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..ef7d96f5a 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -6,19 +6,22 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ #include "inspircd.h" +#include /* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */ class DelayJoinMode : public ModeHandler { + 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), Creator(Parent) { } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { @@ -31,6 +34,16 @@ class DelayJoinMode : public ModeHandler } 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; } @@ -47,12 +60,11 @@ class ModuleDelayJoin : public Module private: DelayJoinMode* djm; CUList nl; - CUList except_list; public: ModuleDelayJoin(InspIRCd* Me) : Module(Me) { - djm = new DelayJoinMode(ServerInstance); + djm = new DelayJoinMode(ServerInstance, this); if (!ServerInstance->AddMode(djm)) throw ModuleException("Could not add new modes!"); } @@ -76,28 +88,37 @@ class ModuleDelayJoin : public Module void Implements(char* List) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; + List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnText] = 1; } virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) { + CUList* newlist = nameslist ? nameslist : Ptr->GetUsers(); + + nl.clear(); + + /* For +D channels ... */ if (Ptr->IsModeSet('D')) { - nl = *nameslist; + std::string key("delayjoin_"); + key.append(Ptr->name); - for (CUListIter n = nameslist->begin(); n != nameslist->end(); ++n) + /* Modify the names list, erasing users with the delay join metadata + * for this channel (havent spoken yet) + */ + for (CUListIter n = newlist->begin(); n != newlist->end(); ++n) { - if (n->first->GetExt("delayjoin_notspoken")) - nl.erase(n->first); + if (!n->first->GetExt(key)) + nl.insert(*n); } + /* Always show self */ nl[user] = user->nick; nameslist = &nl; } return 0; } - + virtual void OnUserJoin(User* user, Channel* channel, bool &silent) { if (channel->IsModeSet('D')) @@ -105,8 +126,15 @@ class ModuleDelayJoin : public Module 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); - user->Extend("delayjoin"); + + /* 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"); } } @@ -139,24 +167,71 @@ class ModuleDelayJoin : public Module void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { 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(); + parameters[0] = f->first->name; /* This triggers our OnUserPart, above, making the PART silent */ parthandler->Handle(parameters, 1, user); } } } + + void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) + { + if (target_type != TYPE_CHANNEL) + return; + + Channel* channel = (Channel*) dest; + + if (!user->GetExt(std::string("delayjoin_")+channel->name)) + return; + + /* Display the join to everyone else (the user who joined got it earlier) */ + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name); + + /* Shrink off the neccessary metadata for a specific channel */ + user->Shrink(std::string("delayjoin_")+channel->name); + + /* 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; + + user->Shrink("delayjoin"); + } + + void 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); + + 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)); + } + } + }; MODULE_INIT(ModuleDelayJoin)