added raw_topic, raw_privmsg and wrote the small "dead channel garbage collector"

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index 17cafd3f9004a178162b2d4a816d1ebf98c88b71..3f8f9bf252783f826622a18b74d6d2da09e4fe71 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -84,8 +84,9 @@ 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);
-    struct ChanUser *chanuser;
     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);
     }
@@ -107,8 +108,8 @@ static IRC_CMD(raw_join) {
     if(chan == NULL) {
         chan = addChannel(argv[0]);
         //request member list
-        addChanUser(chan, user); //it must be a bot
-        get_userlist(chan, got_channel_userlist, NULL);
+        struct ChanUser *chanuser = addChanUser(chan, user); //it must be a bot
+        get_userlist(chan, got_channel_userlist, chanuser);
     } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = addChanUser(chan, user);
         event_join(chanuser);
@@ -129,14 +130,13 @@ static IRC_CMD(raw_part) {
         free(chanuser);
         if(user->flags & USERFLAG_ISBOT) {
             //check if theres another bot in the channel - otherwise free it
-            
+            checkChannelVisibility(chan);
         }
     }
     if(user->channel == NULL && !(user->flags & USERFLAG_ISBOT)) {
         //remove the user
         delUser(user, 1);
     }
-    
     return 1;
 }
 
@@ -148,27 +148,50 @@ static IRC_CMD(raw_quit) {
     event_quit(user, argv[1]);
     if(user->flags & USERFLAG_ISBOT) {
         //check if there are other bots in the users channel - otherwise free them
-        
+        struct ChanUser *chanuser, *next;
+        for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next) {
+            next = getUserChannels(user, chanuser);
+            checkChannelVisibility(chanuser->chan);
+        }
     }
     delUser(user, 1); //now we fully free the user
     return 1;
 }
 
+void bot_disconnect(struct ClientSocket *client) {
+    struct UserNode *user = client->user;
+    struct ChanUser *chanuser, *next;
+    delUser(user, 0);
+    event_quit(user, "disconnected");
+    for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = next) {
+        next = getUserChannels(user, chanuser);
+        checkChannelVisibility(chanuser->chan);
+        free(chanuser);
+    }
+    user->channel = NULL;
+}
+
 static IRC_CMD(raw_kick) {
     if(from == NULL || argc < 3) return 0;
     struct UserNode *user = getUserByMask(from);
     struct UserNode *target = getUserByNick(argv[1]);
-    if(user == NULL || target == NULL) return 0;
     struct ChanNode *chan = getChanByName(argv[0]);
-    if(chan == NULL) return 0;
+    if(chan == NULL || target == NULL) return 0;
     if(isUserOnChan(target, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
+        if(user == NULL) {
+            user = createTempUser(from);
+            user->flags |= USERFLAG_ISTMPUSER;
+        }
         struct ChanUser *chanuser = getChanUser(target, chan);
         delChanUser(chanuser, 0); //we need to free the chanuser manually!
         event_kick(user, chanuser, argv[1]);
         free(chanuser);
+        if(user->flags & USERFLAG_ISTMPUSER) {
+            free(user);
+        }
         if(target->flags & USERFLAG_ISBOT) {
             //check if theres another bot in the channel - otherwise free it
-            
+            checkChannelVisibility(chan);
         }
     }
     if(target->channel == NULL && !(target->flags & USERFLAG_ISBOT)) {
@@ -178,6 +201,39 @@ static IRC_CMD(raw_kick) {
     return 1;
 }
 
+static IRC_CMD(raw_topic) {
+    if(from == NULL || argc < 2) return 0;
+    struct UserNode *user = getUserByMask(from);
+    struct ChanNode *chan = getChanByName(argv[0]);
+    if(chan == NULL) return 0;
+    if(user == NULL) {
+        user = createTempUser(from);
+        user->flags |= USERFLAG_ISTMPUSER;
+    }
+    event_topic(user, chan, argv[1]);
+    strcpy(chan->topic, argv[1])
+    if(user->flags & USERFLAG_ISTMPUSER) {
+        free(user);
+    }
+    return 1;
+}
+
+static IRC_CMD(raw_privmsg) {
+    if(from == NULL || argc < 2) return 0;
+    struct UserNode *user = getUserByMask(from);
+    struct ChanNode *chan = getChanByName(argv[0]);
+    if(chan == NULL) return 0;
+    if(user == NULL) {
+        user = createTempUser(from);
+        user->flags |= USERFLAG_ISTMPUSER;
+    }
+    //event_topic(user, chan, argv[1]);
+    if(user->flags & USERFLAG_ISTMPUSER) {
+        free(user);
+    }
+    return 1;
+}
+
 static IRC_CMD(raw_ping) {
     if(argc == 0) return 0;
     putsock(client, "PONG :%s", argv[0]);
@@ -197,11 +253,13 @@ static IRC_CMD(raw_315) {
 void parser_init() {
     //all the raws we receive...
     register_irc_function("001", raw_001);
-    register_irc_function("354", raw_354);
-    register_irc_function("315", raw_315);
+    register_irc_function("TOPIC", raw_topic);
     register_irc_function("KICK", raw_kick);
     register_irc_function("JOIN", raw_join);
     register_irc_function("PART", raw_part);
     register_irc_function("QUIT", raw_quit);
+    register_irc_function("354", raw_354);
+    register_irc_function("315", raw_315);
     register_irc_function("PING", raw_ping);
+    register_irc_function("PRIVMSG", raw_privmsg);
 }