*** VERSION 5.2.0 ***

[NeonServV5.git] / src / event_neonserv_ctcp.c

diff --git a/src/event_neonserv_ctcp.c b/src/event_neonserv_ctcp.c
index fcc2a1ab471b5585b2ac38f89fae1e8cbffbb36b..ddaff392dece8eb889c46884011adc36ec1dd8d2 100644 (file)
--- a/src/event_neonserv_ctcp.c
+++ b/src/event_neonserv_ctcp.c
@@ -1,4 +1,4 @@
-/* event_neonserv_ctcp.c - NeonServ v5.0
+/* event_neonserv_ctcp.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -25,12 +25,12 @@ struct neonserv_event_ctcp_cache {
 
 static USERAUTH_CALLBACK(neonserv_event_ctcp_nick_lookup);
 static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, char *command, char *text);
-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)) {
@@ -110,40 +110,3 @@ static void neonserv_event_ctcp_async1(struct ClientSocket *client, struct UserN
     }
 }
 
-static void neonserv_event_privctcp(struct UserNode *user, struct UserNode *target, char *command, char *text) {
-    char ctcpBuf[MAXLEN];
-    if(neonserv_ctcp(ctcpBuf, command, text)) {
-        struct ClientSocket *bot;
-        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
-            if(bot->user == target) break;
-        }
-        if(bot)
-            putsock(bot, "NOTICE %s :\001%s\001", user->nick, ctcpBuf);
-    }
-}
-
-static int neonserv_ctcp(char *buffer, char *command, char *text) {
-    if(!stricmp(command, "VERSION")) {
-        sprintf(buffer, "VERSION NeonServ v" NEONSERV_VERSION " by pk910 (%s)", (strcmp(revision, "") ? revision : "-"));
-        return 1;
-    }
-    if(!stricmp(command, "FINGER")) {
-        sprintf(buffer, "FINGER NeonServ v" NEONSERV_VERSION " (%s) build %s lines C code using " COMPILER " (see +netinfo)", (strcmp(revision, "") ? revision : "-"), codelines);
-        return 1;
-    }
-    if(!stricmp(command, "PING")) {
-        sprintf(buffer, "PING %s", (text ? text : "0"));
-        return 1;
-    }
-    if(!stricmp(command, "TIME")) {
-        time_t rawtime;
-        struct tm *timeinfo;
-        char timeBuf[80];
-        time(&rawtime);
-        timeinfo = localtime(&rawtime);
-        strftime(timeBuf, 80, "%c", timeinfo);
-        sprintf(buffer, "TIME %s", timeBuf);
-        return 1;
-    }
-    return 0;
-}