X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=bb96b461745f32e37368caba054096802cdd7523;hb=87dbe508d5d897d73321c0e26efcddd36505e3ad;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..bb96b4617 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -2,35 +2,48 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * 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) + 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->WriteServ("482 %s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un"); + 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; } @@ -51,63 +64,41 @@ class ModuleDelayJoin : public Module ModuleDelayJoin(InspIRCd* Me) : Module(Me) { - djm = new DelayJoinMode(ServerInstance); - if (!ServerInstance->AddMode(djm)) + 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); - } - - 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"); + delete djm; } virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - void Implements(char* List) + virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = - List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1; - } + if (!channel->IsModeSet('D')) + return; - virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) - { - if (!nameslist) - return 0; + if (nick.empty()) + return; - /* 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"); + /* If the user is hidden by delayed join, hide them from the NAMES list */ + std::string key("delayjoin_"); + key.append(channel->name); - for (CUListIter n = nameslist->begin(); n != nameslist->end(); ++n) - { - ServerInstance->Log(DEBUG,"Item"); - - if (!n->first->GetExt("delayjoin_notspoken")) - nl.insert(*n); - } - - ServerInstance->Log(DEBUG,"Done"); - nl[user] = user->nick; - nameslist = &nl; - } - return 0; + if (user->GetExt(key)) + nick.clear(); } - virtual void OnUserJoin(User* user, Channel* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { if (channel->IsModeSet('D')) { @@ -167,18 +158,26 @@ class ModuleDelayJoin : public Module } } - int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + 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 0; + return; Channel* channel = (Channel*) dest; if (!user->GetExt(std::string("delayjoin_")+channel->name)) - return 0; + return; /* Display the join to everyone else (the user who joined got it earlier) */ - channel->WriteAllExcept(user, false, 0, exempt_list, "JOIN %s", channel->name); + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name); + + 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()); /* Shrink off the neccessary metadata for a specific channel */ user->Shrink(std::string("delayjoin_")+channel->name); @@ -188,17 +187,38 @@ class ModuleDelayJoin : public Module */ for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) if (f->first->IsModeSet('D')) - return 0; + return; user->Shrink("delayjoin"); - - return 0; } - int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5) { - return OnUserPreMessage(user, dest, target_type, text, status, exempt_list); + 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)