diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_delayjoin.cpp | 292 | ||||
| -rw-r--r-- | src/modules/m_invisible.cpp | 161 |
2 files changed, 236 insertions, 217 deletions
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index 190bcb38c..613fe6f37 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -14,45 +14,15 @@ #include "inspircd.h" #include <stdarg.h> -/* $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), 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(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +D", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - if (channel->IsModeSet('D')) - { - /* - * 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; - } - } - else - { - return MODEACTION_DENY; - } - } + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool); }; class ModuleDelayJoin : public Module @@ -61,8 +31,7 @@ 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)) @@ -70,157 +39,198 @@ class ModuleDelayJoin : public Module Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, 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); + 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 ~ModuleDelayJoin() +ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) +{ + if (channel->IsModeSet('D') != adding) { - ServerInstance->Modes->DelMode(djm); - delete djm; + if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) + { + source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +D", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un"); + return MODEACTION_DENY; + } + else + { + if (channel->IsModeSet('D')) + { + /* + * 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 Version GetVersion() + else { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return MODEACTION_DENY; } +} - 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) + /* If the user is hidden by delayed join, hide them from the NAMES list */ + std::string key("delayjoin_"); + key.append(channel->name); + + if (user->GetExt(key)) + 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.c_str()); + 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 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"); - } + /* 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, std::string &partmessage, bool &silent) +void ModuleDelayJoin::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +{ + if (channel->IsModeSet('D')) { - if (channel->IsModeSet('D')) + if (user->GetExt("delayjoin_"+channel->name)) { - if (user->GetExt("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()); - } + 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()); } } +} - 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')) { - if (chan->IsModeSet('D')) + /* Send silenced event only to the user being kicked and the user doing the kick */ + if (user->GetExt("delayjoin_"+chan->name)) { - /* Send silenced event only to the user being kicked and the user doing the kick */ - if (user->GetExt("delayjoin_"+chan->name)) - { - silent = true; - user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); - } + silent = true; + user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); } } +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +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++) - { - std::vector<std::string> parameters; - parameters.push_back(f->first->name); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, user); - } + std::vector<std::string> parameters; + parameters.push_back(f->first->name); + /* This triggers our OnUserPart, above, making the PART silent */ + parthandler->Handle(parameters, user); } } +} - void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list) - { - /* Server origin */ - if (!user) - return; +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 (target_type != TYPE_CHANNEL) - return; + if (target_type != TYPE_CHANNEL) + return; - Channel* channel = (Channel*) dest; + Channel* channel = (Channel*) dest; - if (!user->GetExt("delayjoin_"+channel->name)) - return; + if (!user->GetExt("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.c_str()); + /* Display the join to everyone else (the user who joined got it earlier) */ + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - 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()); + 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()); - /* Shrink off the neccessary metadata for a specific channel */ - user->Shrink("delayjoin_"+channel->name); + /* Shrink off the neccessary metadata for a specific channel */ + user->Shrink("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; + /* 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"); - } + user->Shrink("delayjoin"); +} - // .. is there a real need to duplicate WriteCommonExcept? - 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().c_str(), 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) diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 517cda10a..836369b8f 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -171,7 +171,7 @@ class ModuleInvisible : public Module ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible"); Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash }; ServerInstance->Modules->Attach(eventlist, this, 6); - } + }; virtual ~ModuleInvisible() { @@ -180,109 +180,118 @@ class ModuleInvisible : public Module delete qm; delete ido; delete conf; - } + }; - virtual Version GetVersion() - { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); - } + virtual Version GetVersion(); + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent); + virtual void OnRehash(User* user, const std::string ¶meter); + void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent); + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); + /* No privmsg response when hiding - submitted by Eric at neowin */ + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + /* Fix by Eric @ neowin.net, thanks :) -- Brain */ + void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5); +}; +Version ModuleInvisible::GetVersion() +{ + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); +} - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +void ModuleInvisible::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); - } + silent = true; + /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ + this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); } +} - virtual void OnRehash(User* user, const std::string ¶meter) - { - delete conf; - conf = new ConfigReader(ServerInstance); - } +void ModuleInvisible::OnRehash(User* user, const std::string ¶meter) +{ + delete conf; + conf = new ConfigReader(ServerInstance); +} - void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +void ModuleInvisible::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name.c_str(), - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - } + silent = true; + /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ + this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name.c_str(), + partmessage.empty() ? "" : " :", + partmessage.empty() ? "" : partmessage.c_str()); } +} - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +void ModuleInvisible::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +{ + if (user->IsModeSet('Q')) { - if (user->IsModeSet('Q')) + Command* parthandler = ServerInstance->Parser->GetHandler("PART"); + std::vector<std::string> to_leave; + if (parthandler) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector<std::string> to_leave; - if (parthandler) + for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + 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<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - 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<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++) - { - std::vector<std::string> parameters; - parameters.push_back(*n); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, user); - } + std::vector<std::string> parameters; + parameters.push_back(*n); + /* This triggers our OnUserPart, above, making the PART silent */ + parthandler->Handle(parameters, user); } } } +} - /* No privmsg response when hiding - submitted by Eric at neowin */ - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +/* No privmsg response when hiding - submitted by Eric at neowin */ +int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +{ + if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { - if ((target_type == TYPE_USER) && (IS_LOCAL(user))) + User* target = (User*)dest; + if(target->IsModeSet('Q') && !IS_OPER(user)) { - User* target = (User*)dest; - if(target->IsModeSet('Q') && !IS_OPER(user)) - { - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str()); - return 1; - } + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str()); + return 1; } - return 0; } + return 0; +} - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) - { - return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); - } +int ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +{ + return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); +} - /* Fix by Eric @ neowin.net, thanks :) -- Brain */ - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4,5) - { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; +/* Fix by Eric @ neowin.net, thanks :) -- Brain */ +void ModuleInvisible::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); + 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++) + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + /* User only appears to vanish for non-opers */ + if (IS_LOCAL(i->first) && IS_OPER(i->first)) { - /* User only appears to vanish for non-opers */ - if (IS_LOCAL(i->first) && IS_OPER(i->first)) - { - i->first->Write(std::string(tb)); - } + i->first->Write(std::string(tb)); } } - -}; +} MODULE_INIT(ModuleInvisible) |