X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delaymsg.cpp;h=cfc06866a90996ac7991f44d66305433fffd4e46;hb=561f4f642e5bc391300dd33989c3624986808ed8;hp=cc09629e358f434385f215104991241caf9e90c4;hpb=edd159566de1cdae6f39302961a10e1800b0ff2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index cc09629e3..cfc06866a 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -46,11 +46,14 @@ class ModuleDelayMsg : public Module
  public:
 	ModuleDelayMsg() : djm(this)
 	{
-		if (!ServerInstance->Modes->AddMode(&djm))
-			throw ModuleException("Could not add new modes!");
-		ServerInstance->Extensions.Register(&djm.jointime);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(djm);
+		ServerInstance->Modules->AddService(djm.jointime);
 		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPreMessage};
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 	Version GetVersion();
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&);
@@ -96,7 +99,7 @@ Version ModuleDelayMsg::GetVersion()
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-	if (memb->chan->IsModeSet('d'))
+	if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
 	{
 		djm.jointime.set(memb, ServerInstance->Time());
 	}
@@ -105,7 +108,7 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
 ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
 {
 	/* Server origin */
-	if (!user)
+	if ((!user) || (!IS_LOCAL(user)))
 		return MOD_RES_PASSTHRU;
 
 	if (target_type != TYPE_CHANNEL)