X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=dd0dadd69e2451c923e151121a3aa4262b3d8f8a;hb=b5965b08c23e3e89404b481386f2e56ce7cb7ce2;hp=126221dd22f1f84d020b23a1f0e7ee917895eee9;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 126221dd2..dd0dadd69 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,208 +14,153 @@ #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) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) { - 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; - } + levelrequired = OP_VALUE; } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding); }; class ModuleDelayJoin : public Module { - private: - DelayJoinMode* djm; - CUList nl; + DelayJoinMode djm; public: - ModuleDelayJoin(InspIRCd* Me) - : Module(Me) + LocalIntExt unjoined; + ModuleDelayJoin() : djm(this), unjoined("delayjoin", this) { - djm = new DelayJoinMode(ServerInstance, this); - if (!ServerInstance->Modes->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 }; + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText }; ServerInstance->Modules->Attach(eventlist, this, 6); } - - virtual ~ModuleDelayJoin() - { - ServerInstance->Modes->DelMode(djm); - delete djm; - } + ~ModuleDelayJoin(); + Version GetVersion(); + void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick); + void OnUserJoin(Membership*, bool, bool, CUList&); + void CleanUser(User* user); + 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); +}; + +/* $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) +{ + /* no change */ + if (channel->IsModeSet('D') == adding) + return MODEACTION_DENY; - virtual Version GetVersion() + 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! + */ + 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; +} - virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) - { - if (!channel->IsModeSet('D')) - return; +ModuleDelayJoin::~ModuleDelayJoin() +{ +} - if (nick.empty()) - return; +Version ModuleDelayJoin::GetVersion() +{ + return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_VENDOR); +} - /* 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, Membership* memb, std::string &prefixes, std::string &nick) +{ + /* don't prevent the user from seeing themself */ + if (issuer == memb->user) + return; - if (user->GetExt(key)) - nick.clear(); - } + /* If the user is hidden by delayed join, hide them from the NAMES list */ + if (unjoined.get(memb)) + nick.clear(); +} - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +static void populate(CUList& except, Membership* memb) +{ + const UserMembList* users = memb->chan->GetUsers(); + for(UserMembCIter i = users->begin(); i != users->end(); i++) { - 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"); - } + if (i->first == memb->user || !IS_LOCAL(i->first)) + continue; + except.insert(i->first); } +} - void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) +void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) +{ + if (memb->chan->IsModeSet('D')) { - 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()); - } - } + unjoined.set(memb, 1); + populate(except, memb); } +} - void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) - { - 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()); - } - } - } +void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) +{ + if (unjoined.set(memb, 0)) + populate(except, memb); +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) - { - 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++) - { - parameters[0] = f->first->name; - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); - } - } - } +void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except) +{ + if (unjoined.set(memb, 0)) + populate(except, memb); +} - void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) +void ModuleDelayJoin::OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) +{ + UCListIter i = include.begin(); + while (i != include.end()) { - 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); - - 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); - - /* 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"); + Channel* c = *i++; + Membership* memb = c->GetUser(source); + if (memb && unjoined.get(memb)) + include.erase(c); } +} - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) - { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; +void ModuleDelayJoin::OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) +{ + /* Server origin */ + if (!user) + return; - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer); + if (target_type != TYPE_CHANNEL) + return; - CUList *ulist = channel->GetUsers(); + Channel* channel = (Channel*) dest; - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - /* User doesnt get a JOIN sent to themselves */ - if (user == i->first) - continue; + Membership* memb = channel->GetUser(user); + if (!memb || !unjoined.set(memb, 0)) + return; - /* Users with a visibility state that hides them dont appear */ - if (user->Visibility && !user->Visibility->VisibleTo(i->first)) - continue; + /* Display the join to everyone else (the user who joined got it earlier) */ + channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str()); - i->first->Write(std::string(tb)); - } - } + std::string ms = memb->modes; + for(unsigned int i=0; i < memb->modes.length(); i++) + ms.append(" ").append(user->nick); -}; + if (ms.length() > 0) + channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), ms.c_str()); +} MODULE_INIT(ModuleDelayJoin)