{
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(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 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)
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);
{
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);
+ 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);
+ 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.
}
}
- void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+ void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent)
{
if (channel->IsModeSet('D'))
{
- if (user->GetExt(std::string("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, partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str());
+ user->WriteFrom(user, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str());
}
}
}
if (chan->IsModeSet('D'))
{
/* Send silenced event only to the user being kicked and the user doing the kick */
- if (user->GetExt(std::string("delayjoin_")+chan->name))
+ if (user->GetExt("delayjoin_"+chan->name))
{
silent = true;
- user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str());
+ 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)
{
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;
Channel* channel = (Channel*) dest;
- if (!user->GetExt(std::string("delayjoin_")+channel->name))
+ 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);
+ 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, n.c_str());
+ 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(std::string("delayjoin_")+channel->name);
+ 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
+ * 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'))
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];
va_start(argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
- snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+ snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer);
CUList *ulist = channel->GetUsers();
projects / user / henk / code / inspircd.git / blobdiff