split oper:spy in to oper:spy_user and oper:spy_channel

Author: jesopo

include/s_newconf.h

@@ -156,7 +156,8 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperHiddenAdmin(x)    (HasPrivilege((x), "oper:hidden_admin"))
 #define IsOperAdmin(x)          (HasPrivilege((x), "oper:admin") || HasPrivilege((x), "oper:hidden_admin"))
 #define IsOperOperwall(x)       (HasPrivilege((x), "oper:operwall"))
-#define IsOperSpy(x)            (HasPrivilege((x), "oper:spy"))
+#define IsOperSpyChannel(x)     (HasPrivilege((x), "oper:spy_channel"))
+#define IsOperSpyUser(x)        (HasPrivilege((x), "oper:spy_user"))
 #define IsOperInvis(x)          (HasPrivilege((x), "oper:hidden"))
 #define IsOperRemoteBan(x)      (HasPrivilege((x), "oper:remoteban"))
 #define IsOperMassNotice(x)     (HasPrivilege((x), "oper:mass_notice"))

modules/core/m_mode.c

@@ -85,7 +85,7 @@ m_mode(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 
 	dest = parv[1];
 
-	if(IsOperSpy(source_p) && *dest == '!')
+	if(IsOperSpyChannel(source_p) && *dest == '!')
 	{
 		dest++;
 		operspy = 1;

modules/m_etrace.c

@@ -236,7 +236,7 @@ m_chantrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
 
 	name = parv[1];
 
-	if(IsOperSpy(source_p) && parv[1][0] == '!')
+	if(IsOperSpyChannel(source_p) && parv[1][0] == '!')
 	{
 		name++;
 		operspy = 1;
@@ -347,7 +347,7 @@ mo_masktrace(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *so
 	name = LOCAL_COPY(parv[1]);
 	collapse(name);
 
-	if(IsOperSpy(source_p) && parv[1][0] == '!')
+	if(IsOperSpyUser(source_p) && parv[1][0] == '!')
 	{
 		name++;
 		mask++;

modules/m_list.c

@@ -183,7 +183,7 @@ mo_list(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		args = LOCAL_COPY(parv[1]);
 	}
 
-	if (args && *args == '!' && IsOperSpy(source_p))
+	if (args && *args == '!' && IsOperSpyChannel(source_p))
 	{
 		args++;
 		report_operspy(source_p, "LIST", args);

modules/m_scan.c

@@ -187,7 +187,7 @@ scan_umodes(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sou
 	}
 	if (target_list == &global_client_list && list_users)
 	{
-		if (IsOperSpy(source_p))
+		if (IsOperSpyUser(source_p))
 		{
 			if (!ConfigFileEntry.operspy_dont_care_user_info)
 			{

modules/m_topic.c

@@ -74,7 +74,7 @@ m_topic(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
 	name = parv[1];
 
-	if(IsOperSpy(source_p) && parv[1][0] == '!')
+	if(IsOperSpyChannel(source_p) && parv[1][0] == '!')
 	{
 		name++;
 		operspy = 1;

modules/m_whois.c

@@ -181,7 +181,7 @@ do_whois(struct Client *client_p, struct Client *source_p, int parc, const char
 	if((p = strchr(nick, ',')))
 		*p = '\0';
 
-	if(IsOperSpy(source_p) && *nick == '!')
+	if(IsOperSpyUser(source_p) && *nick == '!')
 	{
 		operspy = 1;
 		nick++;