* | 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
#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)
- {
- 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");
- 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;
- }
- }
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool);
};
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->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_OnUserList, I_OnText };
+ 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;
- }
+ 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);
+};
- void Prioritize()
+/* $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)
+{
+ if (channel->IsModeSet('D') != adding)
{
- /* To ensure that we get priority over namesx for names list generation */
- Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
- ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
+ 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(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return MODEACTION_DENY;
}
+}
+ModuleDelayJoin::~ModuleDelayJoin()
+{
+ ServerInstance->Modes->DelMode(djm);
+ delete djm;
+}
- virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
- {
- CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
+Version ModuleDelayJoin::GetVersion()
+{
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+}
- nl.clear();
+void ModuleDelayJoin::OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
+{
+ if (!channel->IsModeSet('D'))
+ return;
- /* For +D channels ... */
- if (Ptr->IsModeSet('D'))
- {
- std::string key("delayjoin_");
- key.append(Ptr->name);
+ if (nick.empty())
+ return;
- /* 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(key))
- nl.insert(*n);
- }
+ /* If the user is hidden by delayed join, hide them from the NAMES list */
+ std::string key("delayjoin_");
+ key.append(channel->name);
- /* Always show self */
- nl[user] = user->nick;
- nameslist = &nl;
- }
- return 0;
- }
+ if (user->GetExt(key))
+ nick.clear();
+}
- virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+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);
+ 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(std::string("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, const 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(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());
- }
+ 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(std::string("delayjoin_")+chan->name))
- {
- silent = true;
- user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, 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");
- const char* parameters[2];
- 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++)
- {
- parameters[0] = f->first->name;
- /* This triggers our OnUserPart, above, making the PART silent */
- parthandler->Handle(parameters, 1, 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)
- {
- if (target_type != TYPE_CHANNEL)
- 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;
- Channel* channel = (Channel*) dest;
+ if (target_type != TYPE_CHANNEL)
+ return;
- if (!user->GetExt(std::string("delayjoin_")+channel->name))
- return;
+ Channel* channel = (Channel*) dest;
- /* Display the join to everyone else (the user who joined got it earlier) */
- this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
+ if (!user->GetExt("delayjoin_"+channel->name))
+ return;
- /* Shrink off the neccessary metadata for a specific channel */
- user->Shrink(std::string("delayjoin_")+channel->name);
+ /* Display the join to everyone else (the user who joined got it earlier) */
+ this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str());
- /* 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;
+ 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());
- user->Shrink("delayjoin");
- }
+ /* Shrink off the neccessary metadata for a specific channel */
+ user->Shrink("delayjoin_"+channel->name);
- void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
- {
- va_list argsPtr;
- char textbuffer[MAXBUF];
- char tb[MAXBUF];
+ /* 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;
- va_start(argsPtr, text);
- vsnprintf(textbuffer, MAXBUF, text, argsPtr);
- va_end(argsPtr);
- snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+ user->Shrink("delayjoin");
+}
- CUList *ulist = channel->GetUsers();
+// .. 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];
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
- {
- /* User doesnt get a JOIN sent to themselves */
- if (user == i->first)
- continue;
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer);
- /* Users with a visibility state that hides them dont appear */
- if (user->Visibility && !user->Visibility->VisibleTo(i->first))
- continue;
+ CUList *ulist = channel->GetUsers();
- i->first->Write(std::string(tb));
- }
- }
+ 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)