X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delaymsg.cpp;h=32a0ba96ee03d9bdba01e44167fae735482d3fe6;hb=682ab97e473b5325f5c5e0d0747a44df1aa33b9d;hp=06a05db0238cc51287156e3e7d85b939953b51e2;hpb=fb8cb2114483689c5a52f951e301c31bdd2a60a2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 06a05db02..32a0ba96e 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -47,6 +47,7 @@ class DelayMsgMode : public ParamMode<DelayMsgMode, LocalIntExt>
 class ModuleDelayMsg : public Module
 {
 	DelayMsgMode djm;
+	bool allownotice;
  public:
 	ModuleDelayMsg() : djm(this)
 	{
@@ -55,6 +56,7 @@ class ModuleDelayMsg : public Module
 	Version GetVersion() CXX11_OVERRIDE;
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) CXX11_OVERRIDE;
 	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE;
 };
 
 ModeAction DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter)
@@ -93,11 +95,10 @@ 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, MessageType msgtype)
 {
-	/* Server origin */
-	if ((!user) || (!IS_LOCAL(user)))
+	if (!IS_LOCAL(user))
 		return MOD_RES_PASSTHRU;
 
-	if ((target_type != TYPE_CHANNEL) || (msgtype != MSG_PRIVMSG))
+	if ((target_type != TYPE_CHANNEL) || ((!allownotice) && (msgtype == MSG_NOTICE)))
 		return MOD_RES_PASSTHRU;
 
 	Channel* channel = (Channel*) dest;
@@ -130,4 +131,10 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 	return MOD_RES_PASSTHRU;
 }
 
+void ModuleDelayMsg::ReadConfig(ConfigStatus& status)
+{
+	ConfigTag* tag = ServerInstance->Config->ConfValue("delaymsg");
+	allownotice = tag->getBool("allownotice", true);
+}
+
 MODULE_INIT(ModuleDelayMsg)