X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=20d4c8e8faeeed905350aac88dfc2eb79c90b511;hb=b111d5098fe1ee306d2718c82c72f969db9d183d;hp=3a574d485d07c7642828ee2a106c5cacc17237ff;hpb=5d172e0dfc4f316e21b55bf5349c90fd74ba2c3b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 3a574d485..20d4c8e8f 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -20,6 +20,8 @@
  */
 
 
+/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */
+
 #include "inspircd.h"
 #include <stdarg.h>
 
@@ -43,10 +45,14 @@ class ModuleDelayJoin : public Module
 	LocalIntExt unjoined;
 	ModuleDelayJoin() : djm(this), unjoined("delayjoin", this)
 	{
-		if (!ServerInstance->Modes->AddMode(&djm))
-			throw ModuleException("Could not add new modes!");
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(djm);
+		ServerInstance->Modules->AddService(unjoined);
 		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
-		ServerInstance->Modules->Attach(eventlist, this, 7);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 	~ModuleDelayJoin();
 	Version GetVersion();
@@ -60,8 +66,6 @@ class ModuleDelayJoin : public Module
 	ModResult OnRawMode(User* user, Channel* channel, const char mode, const std::string &param, bool adding, int pcnt);
 };
 
-/* $ModDesc: Allows for delay-join channels (+D) where users don't appear to join until they speak */
-
 ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
 	/* no change */
@@ -178,6 +182,11 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mo
 	if (!user || !channel || param.empty())
 		return MOD_RES_PASSTHRU;
 
+	ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_CHANNEL);
+	// If not a prefix mode then we got nothing to do here
+	if (!mh || !mh->GetPrefixRank())
+		return MOD_RES_PASSTHRU;
+
 	User* dest;
 	if (IS_LOCAL(user))
 		dest = ServerInstance->FindNickOnly(param);
@@ -194,4 +203,3 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, const char mo
 }
 
 MODULE_INIT(ModuleDelayJoin)
-