made cmd_opall oping invisible users

diff --git a/cmd_neonserv_opall.c b/cmd_neonserv_opall.c
index b187abc95e2d20e5bd7bba59174144f631db2160..b9128ca9c3965506cdc3f7f618439eb731d3a0f0 100644 (file)
--- a/cmd_neonserv_opall.c
+++ b/cmd_neonserv_opall.c
@@ -3,18 +3,47 @@
 * argv[0]    "force"
 * argv[1]    (optional) nick mask
 */
+static USERLIST_CALLBACK(neonserv_cmd_opall_userlist_lookup);
+static void neonserv_cmd_opall_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nickmask);
+
+struct neonserv_cmd_opall_cache {
+    struct ClientSocket *client, *textclient;
+    struct UserNode *user;
+    char *nickmask;
+};
 
 static CMD_BIND(neonserv_cmd_opall) {
-    int done_users = 0;
-    char *nickmask = NULL;
-    struct ChanUser *chanuser;
-    struct ModeBuffer *modeBuf;
     if(!argc || strcmp(argv[0], "FORCE")) {
         reply(getTextBot(), user, "NS_OPALL_SECURITY", chan->name);
         return;
     }
-    if(argc > 1)
-        nickmask = argv[1];
+    struct neonserv_cmd_opall_cache *cache = malloc(sizeof(*cache));
+    if (!cache) {
+        perror("malloc() failed");
+        return;
+    }
+    cache->client = client;
+    cache->textclient = getTextBot();
+    cache->user = user;
+    if(argc > 1) {
+        cache->nickmask = strdup(argv[1]);
+    } else
+        cache->nickmask = NULL;
+    get_userlist_with_invisible(chan, neonserv_cmd_opall_userlist_lookup, cache);
+}
+
+static USERLIST_CALLBACK(neonserv_cmd_opall_userlist_lookup) {
+    struct neonserv_cmd_opall_cache *cache = data;
+    neonserv_cmd_opall_async1(cache->client, cache->textclient, cache->user, chan, cache->nickmask);
+    if(cache->nickmask)
+        free(cache->nickmask);
+    free(cache);
+}
+
+static void neonserv_cmd_opall_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nickmask) {
+    int done_users = 0;
+    struct ChanUser *chanuser;
+    struct ModeBuffer *modeBuf;
     modeBuf = initModeBuffer(client, chan);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(nickmask && match(nickmask, chanuser->user->nick)) continue;
@@ -23,5 +52,5 @@ static CMD_BIND(neonserv_cmd_opall) {
         done_users++;
     }
     freeModeBuffer(modeBuf);
-    reply(getTextBot(), user, "NS_OPALL_DONE", done_users, chan->name);
+    reply(textclient, user, "NS_OPALL_DONE", done_users, chan->name);
 }