added cmd_reconnect

[NeonServV5.git] / src / WHOHandler.c

diff --git a/src/WHOHandler.c b/src/WHOHandler.c
index c8c65820043017651b46e52ac13b76bdeacfca04..b0c3513e0ae93a6a56628a206a48d26f5d1beba0 100644 (file)
--- a/src/WHOHandler.c
+++ b/src/WHOHandler.c
@@ -75,6 +75,7 @@ void clear_whoqueue(struct ClientSocket *client) {
         free(entry);
     }
     client->whoqueue_last = NULL;
+    client->whoqueue_first = NULL;
 }
 
 void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *data) {
@@ -208,6 +209,9 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
                 case '@':
                     chanuserflags |= CHANUSERFLAG_OPPED;
                     break;
+                case '%':
+                    chanuserflags |= CHANUSERFLAG_HALFOPPED;
+                    break;
                 case '+':
                     chanuserflags |= CHANUSERFLAG_VOICED;
                     break;
@@ -222,23 +226,22 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
             }
         }
         
-        struct UserNode *user;
+        struct UserNode *user = getUserByNick(argv[4]);
         struct ChanUser *chanuser;
-        if(chanuserflags & CHANUSERFLAG_INVISIBLE) {
+        if((chanuserflags & CHANUSERFLAG_INVISIBLE) && (!user || !isBot(user))) {
             user = createTempUser(argv[4]);
             user->flags |= USERFLAG_ISTMPUSER;
             chan->flags |= CHANFLAG_HAVE_INVISIBLES;
             chanuser = addInvisibleChanUser(chan, user);
             chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
         } else {
-            user = getUserByNick(argv[4]);
             if(user == NULL) {
                 user = addUser(argv[4]);
             }
             if(!(chanuser = getChanUser(user, chan))) {
                 chanuser = addChanUser(chan, user);
             }
-            chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
+            chanuser->flags = (chanuser->flags & ~(CHANUSERFLAG_OPPED_OR_VOICED | CHANUSERFLAG_INVISIBLE)) | chanuserflags;
         }
         user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags;
         user->last_who = time(0);
@@ -290,7 +293,7 @@ void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
             struct ChanUser *chanuser, *next;
             for(chanuser = getChannelUsers(entry->chan, NULL); chanuser; chanuser = next) {
                 next = getChannelUsers(entry->chan, chanuser);
-                if(chanuser->flags & CHANUSERFLAG_INVISIBLE) {
+                if((chanuser->flags & CHANUSERFLAG_INVISIBLE) && !isBot(chanuser->user)) {
                     delChanUser(chanuser, 1);
                 }
             }