virtual void SendFilter(Module* proto, void* opaque, FilterResult* iter);
virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) = 0;
virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
- virtual void OnRehash(const std::string ¶meter);
+ virtual void OnRehash(userrec* user, const std::string ¶meter);
virtual Version GetVersion();
std::string EncodeFilter(FilterResult* filter);
FilterResult DecodeFilter(const std::string &data);
if (command == "QUIT")
{
+ /* QUIT with no reason: nothing to do */
+ if (pcnt < 1)
+ return 0;
+
checkline = parameters[0];
replacepoint = 0;
parting = false;
}
else if (command == "PART")
{
+ /* PART with no reason: nothing to do */
+ if (pcnt < 2)
+ return 0;
+
checkline = parameters[1];
replacepoint = 1;
parting = true;
params[item] = parameters[item];
params[replacepoint] = "Reason filtered";
- if (f->action == "block")
+ /* We're blocking, OR theyre quitting and its a KILL action
+ * (we cant kill someone whos already quitting, so filter them anyway)
+ */
+ if ((f->action == "block") || (((!parting) && (f->action == "kill"))))
{
c->Handle(params, pcnt, user);
return 1;
return 0;
}
-void FilterBase::OnRehash(const std::string ¶meter)
+void FilterBase::OnRehash(userrec* user, const std::string ¶meter)
{
}