More tweaks from Eric, when an oper is invisible, attempting to /notice or /privmsg them returns 'no such nick' :)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7026 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 21 insertions, 1 deletions

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 3d1592b48..0f9578666 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -174,7 +174,7 @@ class ModuleInvisible : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
+		List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
 	}
 	
 	virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
@@ -228,6 +228,26 @@ class ModuleInvisible : public Module
 		}
 	}
 
+	/* No privmsg response when hiding - submitted by Eric at neowin */
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	{
+		if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
+		{
+			userrec* target = (userrec*)dest;
+			if(target->IsModeSet('Q') && !*user->oper)
+			{
+				user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
+				return 1;
+			}
+		}
+		return 0;
+	}
+	
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+	{
+		return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
+	}
+
 	/* Fix by Eric @ neowin.net, thanks :) -- Brain */
 	void WriteCommonFrom(userrec *user, chanrec* channel, const char* text, ...)
 	{