* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include "inspircd.h"
-
-/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
+#include <stdarg.h>
class DelayJoinMode : public ModeHandler
{
+ private:
+ CUList empty;
public:
- DelayJoinMode(InspIRCd* Instance) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ DelayJoinMode(Module* Parent) : ModeHandler(Parent, 'D', PARAM_NONE, MODETYPE_CHANNEL)
{
- 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
- {
- 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);
- 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_OnNamesListItem, I_OnText, I_OnHostCycle };
+ ServerInstance->Modules->Attach(eventlist, this, 7);
}
-
- 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);
+ ModResult OnHostCycle(User* user);
+ void OnUserPart(Membership*, std::string &partmessage, CUList&);
+ void OnUserKick(User* source, Membership*, const std::string &reason, CUList&);
+ 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);
+};
- 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");
- }
+/* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
- virtual Version GetVersion()
- {
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
- }
+ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+{
+ /* no change */
+ if (channel->IsModeSet('D') == adding)
+ return MODEACTION_DENY;
- void Implements(char* List)
+ if (!adding)
{
- List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] =
- List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+ /*
+ * 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 int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
- {
- CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
+ModuleDelayJoin::~ModuleDelayJoin()
+{
+ ServerInstance->Modes->DelMode(&djm);
+}
- nl.clear();
+Version ModuleDelayJoin::GetVersion()
+{
+ return Version("Allows for delay-join channels (+D) where users dont appear to join until they speak", VF_COMMON | VF_VENDOR);
+}
- /* For +D channels ... */
- if (Ptr->IsModeSet('D'))
- {
- std::string key("delayjoin_");
- key.append(Ptr->name);
- ServerInstance->Log(DEBUG,"Key: %s", key.c_str());
- /* 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)
- {
- ServerInstance->Log(DEBUG,"Item: %s", n->first->nick);
- if (!n->first->GetExt(key))
- {
- nl.insert(*n);
- ServerInstance->Log(DEBUG,"Spoken: %s", n->first->nick);
- }
- }
- ServerInstance->Log(DEBUG,"Insert self");
- nl[user] = user->nick;
- nameslist = &nl;
- }
- return 0;
- }
+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;
- virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+ /* If the user is hidden by delayed join, hide them from the NAMES list */
+ if (unjoined.get(memb))
+ nick.clear();
+}
+
+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 ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except)
+{
+ if (unjoined.set(memb, 0))
+ populate(except, memb);
+}
- void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except)
+{
+ if (unjoined.set(memb, 0))
+ populate(except, memb);
+}
+
+ModResult ModuleDelayJoin::OnHostCycle(User* user)
+{
+ for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
{
- if (chan->IsModeSet('D'))
+ Channel* chan = *f;
+ Membership* memb = chan->GetUser(user);
+
+ if (memb && unjoined.get(memb))
{
- /* 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());
- }
+ return MOD_RES_DENY;
}
}
+ return MOD_RES_PASSTHRU;
+}
- 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)
+ return;
+ for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
{
- Command* parthandler = ServerInstance->Parser->GetHandler("PART");
- const char* parameters[2];
- if (parthandler && user->GetExt("delayjoin"))
+ Channel* chan = *f;
+ Membership* memb = chan->GetUser(user);
+ if (memb && unjoined.get(memb))
{
- 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(chan->name);
+ /* Send a fake PART from the channel, which will be silent */
+ parthandler->Handle(parameters, user);
}
}
+}
- void OnText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
- {
- if (target_type != TYPE_CHANNEL)
- return;
-
- Channel* channel = (Channel*) dest;
+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 (!user->GetExt(std::string("delayjoin_")+channel->name))
- return;
+ if (target_type != TYPE_CHANNEL)
+ 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);
+ Channel* channel = (Channel*) dest;
- /* Shrink off the neccessary metadata for a specific channel */
- user->Shrink(std::string("delayjoin_")+channel->name);
+ Membership* memb = channel->GetUser(user);
+ if (!memb || !unjoined.set(memb, 0))
+ 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;
+ /* Display the join to everyone else (the user who joined got it earlier) */
+ channel->WriteAllExceptSender(user, false, 0, "JOIN %s", channel->name.c_str());
- user->Shrink("delayjoin");
- }
-};
+ std::string n = ServerInstance->Modes->ModeString(user, channel);
+ if (n.length() > 0)
+ channel->WriteAllExceptSender(user, false, 0, "MODE %s +%s", channel->name.c_str(), n.c_str());
+}
MODULE_INIT(ModuleDelayJoin)
projects / user / henk / code / inspircd.git / blobdiff