*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides channel mode +f (message flood protection) */
}
else
{
- if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+ std::string cur_param = channel->GetModeParameter('f');
+ parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+ if (cur_param == parameter)
+ {
+ // mode params match
+ return MODEACTION_DENY;
+ }
+ else
{
- delete f;
- floodsettings *f = new floodsettings(ban,nsecs,nlines);
- parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
- channel->Shrink("flood");
- channel->Extend("flood",f);
- channel->SetModeParam('f', parameter.c_str(), true);
- return MODEACTION_ALLOW;
+ if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+ {
+ delete f;
+ floodsettings *f = new floodsettings(ban,nsecs,nlines);
+ channel->Shrink("flood");
+ channel->Extend("flood",f);
+ channel->SetModeParam('f', cur_param.c_str(), false);
+ channel->SetModeParam('f', parameter.c_str(), true);
+ return MODEACTION_ALLOW;
+ }
+ else
+ {
+ return MODEACTION_DENY;
+ }
}
}
}
throw ModuleException("Could not add new modes!");
}
- void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
+ int ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
{
if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
{
- return;
+ return 0;
}
floodsettings *f;
}
char kickmessage[MAXBUF];
snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
- dest->ServerKickUser(user, kickmessage, true);
+ if (!dest->ServerKickUser(user, kickmessage, true))
+ {
+ delete dest;
+ return 1;
+ }
}
}
+
+ return 0;
}
- virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+ virtual int OnUserPreMessage(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
- {
- ProcessMessages(user,(chanrec*)dest,text);
- }
+ return ProcessMessages(user,(chanrec*)dest,text);
+
+ return 0;
}
- virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+ virtual int OnUserPreNotice(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
- {
- ProcessMessages(user,(chanrec*)dest,text);
- }
+ return ProcessMessages(user,(chanrec*)dest,text);
+
+ return 0;
}
void OnChannelDelete(chanrec* chan)
void Implements(char* List)
{
- List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
+ List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
}
virtual ~ModuleMsgFlood()
}
};
-MODULE_INIT(ModuleMsgFlood);
+MODULE_INIT(ModuleMsgFlood)