don't block events coming from servers and ignore CTCP ACTION (/me)

diff --git a/src/UserNode.h b/src/UserNode.h
index 051a1539696ad12460cabf4c6c2e4adad485d334..ccd7dc61a7ffe28fdcdaf53409efb73c423e8b1a 100644 (file)
--- a/src/UserNode.h
+++ b/src/UserNode.h
@@ -48,7 +48,7 @@ struct UserNode {
     struct UserNode *next;
 };
 
-#define isNetworkService(USER) (USER->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP))
+#define isNetworkService(USER) (USER->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP | USERFLAG_ISSERVER))
 #define isBot(USER) (USER->flags & (USERFLAG_ISBOT))
 
 void init_UserNode();

diff --git a/src/event_neonserv_ctcp.c b/src/event_neonserv_ctcp.c
index fcc2a1ab471b5585b2ac38f89fae1e8cbffbb36b..9b7f700088c6c5e126428702749b5e894d488177 100644 (file)
--- a/src/event_neonserv_ctcp.c
+++ b/src/event_neonserv_ctcp.c
@@ -28,9 +28,10 @@ static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserN
 static int neonserv_ctcp(char *buffer, char *command, char *text);
 
 static void neonserv_event_chanctcp(struct UserNode *user, struct ChanNode *chan, char *command, char *text) {
+    if(!stricmp(command, "ACTION")) return; //always allow CTCP ACTION (/me)
     struct ClientSocket *client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
-    if(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)) return; 
+    if(isNetworkService(user)) return; 
     loadChannelSettings(chan);
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
     if(!(user->flags & USERFLAG_ISAUTHED)) {

diff --git a/src/event_neonserv_mode.c b/src/event_neonserv_mode.c
index eeeff8c5258556c8aa79558c7e96795dff4781a2..4c766739abc85acef208b1e6bd7bfaf95ff1f8ed 100644 (file)
--- a/src/event_neonserv_mode.c
+++ b/src/event_neonserv_mode.c
@@ -32,7 +32,7 @@ struct neonserv_event_mode_cache {
 static void neonserv_event_mode(struct UserNode *user, struct ChanNode *chan, char *modes, char **argv, int argc) {
     struct ClientSocket *client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
-    if(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)) return;
+    if(isNetworkService(user)) return;
     loadChannelSettings(chan);
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
     struct neonserv_event_mode_cache *cache = malloc(sizeof(*cache));

diff --git a/src/event_neonserv_notice.c b/src/event_neonserv_notice.c
index d4db61aa49c1346efec50161a989b434cfa1a153..7de55786eebce1a1667340ab2e68ec4ef9d41ab9 100644 (file)
--- a/src/event_neonserv_notice.c
+++ b/src/event_neonserv_notice.c
@@ -28,7 +28,7 @@ static void neonserv_event_notice_async1(struct ClientSocket *client, struct Use
 static void neonserv_event_channotice(struct UserNode *user, struct ChanNode *chan, char *message) {
     struct ClientSocket *client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
-    if(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)) return; 
+    if(isNetworkService(user)) return; 
     loadChannelSettings(chan);
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
     if(!(user->flags & USERFLAG_ISAUTHED)) {

diff --git a/src/event_neonserv_topic.c b/src/event_neonserv_topic.c
index dbd1f5fb5199b36f3012d8e9328669f974b353b1..06df4b513191f2bbeec3ce37ee883fab6cd2d9f9 100644 (file)
--- a/src/event_neonserv_topic.c
+++ b/src/event_neonserv_topic.c
@@ -28,7 +28,7 @@ static void neonserv_event_topic_async1(struct ClientSocket *client, struct User
 static void neonserv_event_topic(struct UserNode *user, struct ChanNode *chan, const char *new_topic) {
     struct ClientSocket *client = getBotForChannel(chan);
     if(!client) return; //we can't "see" this event
-    if(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP)) return; 
+    if(isNetworkService(user)) return; 
     loadChannelSettings(chan);
     if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
     if(!(user->flags & USERFLAG_ISAUTHED)) {