added .gitignore

[NeonServV5.git] / IRCParser.c

diff --git a/IRCParser.c b/IRCParser.c
index f4e8bd4ae8ebb85805af062d88e9f86b9b6a0e65..682cdf0fc811e170969388315791f34a5ef689d1 100644 (file)
--- a/IRCParser.c
+++ b/IRCParser.c
@@ -88,15 +88,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 +110,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);
@@ -284,6 +281,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 +303,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);
@@ -323,6 +330,7 @@ static IRC_CMD(raw_mode) {
         //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 {
@@ -331,9 +339,10 @@ static IRC_CMD(raw_mode) {
     return 1;
 }
 
-void parser_init() {
+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);
@@ -348,3 +357,12 @@ void parser_init() {
     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);
+    }
+}
+