X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nickflood.cpp;h=f34cc81e42700708086a8b85a8bcf6f37918a1aa;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=d4b07b0c4dfaa1bc8950048c4a98933844e94327;hpb=de25d946733f774e3a5b53a58438a9c92af0acbe;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index d4b07b0c4..f34cc81e4 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -17,7 +17,7 @@
 
 /** Holds settings and state associated with channel mode +F
  */
-class nickfloodsettings : public classbase
+class nickfloodsettings
 {
  public:
 	int secs;
@@ -89,18 +89,9 @@ class NickFlood : public ModeHandler
 {
  public:
 	SimpleExtItem<nickfloodsettings> ext;
-	NickFlood(Module* Creator) : ModeHandler(Creator, 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
+	NickFlood(Module* Creator) : ModeHandler(Creator, "nickflood", 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
 		ext("nickflood", Creator) { }
 
-	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
-	{
-		nickfloodsettings* x = ext.get(channel);
-		if (x)
-			return std::make_pair(true, ConvToStr(x->nicks)+":"+ConvToStr(x->secs));
-		else
-			return std::make_pair(false, parameter);
-	}
-
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		nickfloodsettings *f = ext.get(channel);
@@ -200,7 +191,7 @@ class ModuleNickFlood : public Module
 	{
 		if (!ServerInstance->Modes->AddMode(&nf))
 			throw ModuleException("Could not add new modes!");
-		Extensible::Register(&nf.ext);
+		ServerInstance->Extensions.Register(&nf.ext);
 		Implementation eventlist[] = { I_OnUserPreNick, I_OnUserPostNick };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
@@ -213,11 +204,13 @@ class ModuleNickFlood : public Module
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel *channel = *i;
+			ModResult res;
 
 			nickfloodsettings *f = nf.ext.get(channel);
 			if (f)
 			{
-				if (CHANOPS_EXEMPT('F') && channel->GetPrefixValue(user) == OP_VALUE)
+				FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,channel,"nickflood"));
+				if (res == MOD_RES_ALLOW)
 					continue;
 
 				if (f->islocked())
@@ -250,11 +243,13 @@ class ModuleNickFlood : public Module
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
 		{
 			Channel *channel = *i;
+			ModResult res;
 
 			nickfloodsettings *f = nf.ext.get(channel);
 			if (f)
 			{
-				if (CHANOPS_EXEMPT('F') && channel->GetPrefixValue(user) == OP_VALUE)
+				FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,channel,"nickflood"));
+				if (res == MOD_RES_ALLOW)
 					return;
 				
 				/* moved this here to avoid incrementing the counter for nick
@@ -269,7 +264,6 @@ class ModuleNickFlood : public Module
 
 	~ModuleNickFlood()
 	{
-		ServerInstance->Modes->DelMode(&nf);
 	}
 
 	Version GetVersion()