added get_userauth to WHOHandler.c and continues modcmd

[NeonServV5.git] / WHOHandler.c

diff --git a/WHOHandler.c b/WHOHandler.c
index 38e0ce745b28a37281d953850816aa014318264a..994f288aa399fc3edfe462bb897679b8a10bd389 100644 (file)
--- a/WHOHandler.c
+++ b/WHOHandler.c
@@ -7,6 +7,7 @@
 
 #define WHOQUEUETYPE_ISONQUEUE 0x01
 #define WHOQUEUETYPE_USERLIST  0x02
+#define WHOQUEUETYPE_USERAUTH  0x04
 
 struct WHOQueueEntry {
     char type;
@@ -14,7 +15,7 @@ struct WHOQueueEntry {
     struct ChanNode *chan;
     struct UserNode *user;
     struct WHOQueueEntry *next;
-    userlist_callback_t *callback;
+    void *callback;
     void *data;
 };
 
@@ -68,6 +69,22 @@ void get_userlist(struct ChanNode *chan, userlist_callback_t callback, void *dat
     putsock(bot, "WHO %s,%d %%tuhnaf,%d", chan->name, entry->type, entry->type);
 }
 
+void get_userauth(struct UserNode *user, userauth_callback_t callback, void *data) {
+    struct ClientSocket *bot;
+    for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+        if(isUserOnChan(bot->user, chan))
+            break;
+    }
+    if(bot == NULL) return;
+    struct WHOQueueEntry* entry = addWHOQueueEntry(bot);
+    entry->type = WHOQUEUETYPE_ISONQUEUE | WHOQUEUETYPE_USERAUTH;
+    entry->user = user;
+    entry->callback = callback;
+    entry->data = data;
+    //WHO ".$user->getNick().",".$id." %tuhna,".$id
+    putsock(bot, "WHO %s,%d %%tuhna,%d", user->nick, entry->type, entry->type);
+}
+
 void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int argc) {
     int i;
     if(argc < 2) return;
@@ -115,6 +132,14 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
             strcpy(user->auth, argv[6]);
             user->flags |= USERFLAG_ISAUTHED;
         }
+    } else if(type & WHOQUEUETYPE_USERAUTH) {
+        //:OGN2.OnlineGamesNet.net 354 Skynet 1 pk910 2001:41d0:2:1d3b::babe Skynet pk910
+        if(!strcmp(argv[5], "0") && !(entry->user->flags & USERFLAG_ISAUTHED)) {
+            strcpy(entry->user->auth, argv[5]);
+            entry->user->flags |= USERFLAG_ISAUTHED;
+        }
+        userauth_callback_t *callback = entry->callback;
+        callback(client, entry->user, entry->data);
     }
 }
 
@@ -128,7 +153,8 @@ void recv_whohandler_315(struct ClientSocket *client, char **argv, unsigned int
     if(type & WHOQUEUETYPE_USERLIST) {
         //:OGN2.OnlineGamesNet.net 315 skynet #pk910,1 :End of /WHO list.
         entry->chan->flags |= CHANFLAG_RECEIVED_USERLIST;
-        entry->callback(client, entry->chan, entry->data);
+        userlist_callback_t *callback = entry->callback;
+        callback(client, entry->chan, entry->data);
     }
     free(entry);
 }