* | 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
: 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 };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
virtual ~ModuleDelayJoin()
{
ServerInstance->Modes->DelMode(djm);
- DELETE(djm);
+ delete djm;
}
- Priority Prioritize()
+ void Prioritize()
{
- /* To ensure that we get priority over namesx for names list generation on +u channels */
- return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
+ /* 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);
}
virtual Version GetVersion()
return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
- void Implements(char* List)
- {
- List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnText] = 1;
- }
virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
{
return 0;
}
- virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+ virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
{
if (channel->IsModeSet('D'))
{
/* 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);
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* User only appears to vanish for non-opers */
+ /* 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))
- {
- i->first->Write(std::string(tb));
- }
+ continue;
+
+ i->first->Write(std::string(tb));
}
}