fixed ban timeout check

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index ac2cb60a2fe06f29736914a76d9a0302142d6775..04ec1446510e8b287817e45c74702557bd257d2b 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -6,6 +6,8 @@
 #include "IRCEvents.h"
 #include "ClientSocket.h"
 #include "WHOHandler.h"
+#include "lang.h"
+#include "DBHelper.h"
 
 struct irc_cmd *irc_commands = NULL;
 
@@ -44,6 +46,7 @@ static void parse_line(struct ClientSocket *client, char *line) {
         if (*line == ':') {
            //the rest is a single parameter
            argv[argc++] = line + 1;
+           break;
         }
         argv[argc++] = line;
         if (argc >= MAXNUMPARAMS)
@@ -88,15 +91,11 @@ static void parse_raw(struct ClientSocket *client, char *from, char *cmd, char *
 static USERLIST_CALLBACK(got_channel_userlist) {
     struct ChanUser *chanuser = data;
     event_join(chanuser);
-    putsock(client, "PRIVMSG %s :[BOT JOIN] Users on this Channel:", chan->name);
-    for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
-        putsock(client, "PRIVMSG %s :  %s!%s@%s [%s]  rights: %d", chan->name, chanuser->user->nick, chanuser->user->ident, chanuser->user->host, ((chanuser->user->flags & USERFLAG_ISAUTHED) ? chanuser->user->auth : "*"), chanuser->flags);
-    }
 }
 
 static IRC_CMD(raw_001) {
     client->flags |= SOCKET_FLAG_READY;
-    putsock(client, "JOIN #pktest");
+    event_bot_ready(client);
     return 1;
 }
 
@@ -114,6 +113,7 @@ static IRC_CMD(raw_join) {
         chan->chanbot = user;
         struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot
         get_userlist(chan, got_channel_userlist, chanuser);
+        putsock(client, "MODE %s", chan->name);
     } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = addChanUser(chan, user);
         event_join(chanuser);
@@ -197,7 +197,7 @@ static IRC_CMD(raw_kick) {
     }
     if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
         //remove the user
-        delUser(user, 1);
+        delUser(target, 1);
     }
     return 1;
 }
@@ -254,7 +254,7 @@ static IRC_CMD(raw_privmsg) {
                         text[strlen(text)-1] = '\0';
                 } else if(strlen(cmd) && cmd[strlen(cmd)-1] == '\001')
                     cmd[strlen(cmd)-1] = '\0';
-                event_privctcp(user, chan, cmd, text);
+                event_privctcp(user, target, cmd, text);
             } else
                 event_privmsg(user, target, argv[1]);
         }
@@ -284,6 +284,7 @@ static IRC_CMD(raw_notice) {
 static IRC_CMD(raw_nick) {
     if(from == NULL || argc == 0) return 0;
     struct UserNode *user = getUserByMask(from);
+    if(user == NULL) return 0;
     event_nick(user, argv[0]);
     renameUser(user, argv[0]);
     return 1;
@@ -305,6 +306,15 @@ static IRC_CMD(raw_315) {
     return 1;
 }
 
+static IRC_CMD(raw_324) { //MODE LIST
+    //Watchcat #pktest +stnzN
+    if(from == NULL || argc < 3) return 0;
+    struct ChanNode *chan = getChanByName(argv[1]);
+    if(chan == NULL) return 0;
+    parseModes(chan, argv[2], argv+3, argc-3);
+    return 1;
+}
+
 static IRC_CMD(raw_invite) {
     if(from == NULL || argc < 2) return 0;
     struct UserNode *user = getUserByMask(from);
@@ -312,9 +322,30 @@ static IRC_CMD(raw_invite) {
     return 1;
 }
 
-void parser_init() {
+static IRC_CMD(raw_mode) {
+    if(from == NULL || argc < 2) return 0;
+    struct UserNode *user = getUserByMask(from);
+    if(user == NULL) {
+        user = createTempUser(from);
+        user->flags |= USERFLAG_ISTMPUSER;
+    }
+    if(argv[0][0] == '#') {
+        //ChannelMode
+        struct ChanNode *chan = getChanByName(argv[0]);
+        if(!chan) return 0;
+        if(chan->chanbot != client->user) return 1;
+        event_mode(user, chan, argv[1], argv+2, argc-2);
+        parseModes(chan, argv[1], argv+2, argc-2);
+    } else {
+        //UserMode
+    }
+    return 1;
+}
+
+void init_parser() {
     //all the raws we receive...
     register_irc_function("001", raw_001);
+    register_irc_function("324", raw_324);
     register_irc_function("INVITE", raw_invite);
     register_irc_function("NOTICE", raw_notice);
     register_irc_function("TOPIC", raw_topic);
@@ -322,9 +353,55 @@ void parser_init() {
     register_irc_function("PART", raw_part);
     register_irc_function("QUIT", raw_quit);
     register_irc_function("JOIN", raw_join);
+    register_irc_function("MODE", raw_mode);
     register_irc_function("NICK", raw_nick);
     register_irc_function("354", raw_354);
     register_irc_function("315", raw_315);
     register_irc_function("PING", raw_ping);
     register_irc_function("PRIVMSG", raw_privmsg);
 }
+
+void free_parser() {
+    struct irc_cmd *cmd, *next;
+    for(cmd = irc_commands; cmd; cmd = next) {
+        next = cmd->next;
+        free(cmd);
+    }
+}
+
+void reply(struct ClientSocket *client, struct UserNode *user, const char *text, ...) {
+    const char *reply_format = get_language_string(user, text);
+    if(reply_format == NULL)
+        reply_format = text;
+    loadUserSettings(user);
+    char formatBuf[MAXLEN];
+    sprintf(formatBuf, "%s %s :%s", ((user->flags & USERFLAG_REPLY_PRIVMSG) ? "PRIVMSG" : "NOTICE"), user->nick, reply_format);
+    va_list arg_list;
+    char sendBuf[MAXLEN];
+    int pos;
+    if (!(client->flags & SOCKET_FLAG_CONNECTED)) return;
+    sendBuf[0] = '\0';
+    va_start(arg_list, text);
+    pos = vsnprintf(sendBuf, MAXLEN - 2, formatBuf, arg_list);
+    va_end(arg_list);
+    if (pos < 0 || pos > (MAXLEN - 2)) pos = MAXLEN - 2;
+    sendBuf[pos] = '\n';
+    sendBuf[pos+1] = '\0';
+    write_socket(client, sendBuf, pos+1);
+}
+
+char* merge_argv(char **argv, int start, int end) {
+    return merge_argv_char(argv, start, end, ' ');
+}
+
+char* merge_argv_char(char **argv, int start, int end, char seperator) {
+    int i;
+    char *p = NULL;
+    for(i = start; i < end; i++) {
+        p = argv[i];
+        while(*p) p++;
+        *p = seperator;
+    }
+    if(p) *p = '\0';
+    return argv[start];
+}