* | 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
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)
+ 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->WriteServ("482 %s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un");
+ 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!
+ /*
+ * 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)
: 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_OnNamesListItem, I_OnText };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
virtual ~ModuleDelayJoin()
{
ServerInstance->Modes->DelMode(djm);
- DELETE(djm);
- }
-
- 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");
+ delete djm;
}
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
- void Implements(char* List)
+ virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
{
- 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)
- {
- CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
-
- nl.clear();
+ 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)
+ virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
{
if (channel->IsModeSet('D'))
{
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;
+ std::vector<std::string> parameters;
+ parameters.push_back(f->first->name);
/* This triggers our OnUserPart, above, making the PART silent */
- parthandler->Handle(parameters, 1, user);
+ 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;
+
if (target_type != TYPE_CHANNEL)
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);
user->Shrink("delayjoin");
}
- void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+ // .. 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];
projects / user / henk / code / inspircd.git / blobdiff