CHANSERV: fix issue where chanserv_relay doesn't wait for db to be loaded before...

[irc/quakenet/newserv.git] / helpmod2 / hqueue.c

diff --git a/helpmod2/hqueue.c b/helpmod2/hqueue.c
index 347f76a81b31069f999a8d7306a2f5d8170c3ead..8eb74d65c8ea5457c1fed6484e41d327b1f7f13d 100644 (file)
--- a/helpmod2/hqueue.c
+++ b/helpmod2/hqueue.c
@@ -4,6 +4,7 @@
 #include "hqueue.h"
 #include "hgen.h"
 #include "hstat.h"
+#include "huser.h"
 
 #include "hcommands.h"
 
@@ -142,7 +143,7 @@ void hqueue_advance(hchannel *hchan, huser *oper, int nadv)
 
         counter--;
 
-        strcat(buffer, hchanuser->husr->real_user->nick);
+        strcat(buffer, huser_get_nick(hchanuser->husr));
         strcat(buffer, " ");
 
         if (hchan->flags & H_DO_STATS)
@@ -150,9 +151,9 @@ void hqueue_advance(hchannel *hchan, huser *oper, int nadv)
 
         if ((hchan->flags & H_QUEUE_SPAMMY) && (oper != NULL))
         {
-           helpmod_reply(hchanuser->husr, hchan->real_channel, "It is now your time to state your problem. Please do so on channel %s and direct your questions to %s %s", (huser_get_level(oper) < H_OPER)?hlevel_name(H_STAFF):hlevel_name(H_OPER), hchannel_get_name(hchan), oper->real_user->nick);
+           helpmod_reply(hchanuser->husr, hchan->real_channel, "It is now your time to state your problem. Please do so on channel %s and direct your questions to %s %s",  hchannel_get_name(hchan), hlevel_title(huser_get_level(oper)), huser_get_nick(oper));
             if (!(huser_get_account_flags(oper) & H_NOSPAM))
-                helpmod_reply(oper, hchan->real_channel, "User %s (%s@%s) is yours, he has been in queue for %s", hchanuser->husr->real_user->nick, hchanuser->husr->real_user->ident, hchanuser->husr->real_user->host->name->content, helpmod_strtime(time(NULL) - hchanuser->time_joined));
+                helpmod_reply(oper, hchan->real_channel, "User %s (%s@%s) is yours, he has been in queue for %s", huser_get_nick(hchanuser->husr), huser_get_ident(hchanuser->husr), huser_get_host(hchanuser->husr), helpmod_strtime(time(NULL) - hchanuser->time_joined));
         }
 
         helpmod_channick_modes(hchanuser->husr, hchan, MC_VOICE, HLAZY);
@@ -161,7 +162,7 @@ void hqueue_advance(hchannel *hchan, huser *oper, int nadv)
         hchanuser = hchanuser->next;
     }
     if (oper != NULL)
-        helpmod_message_channel(hchan, "user%s %s: Please state your questions on this channel and direct them to %s %s", (nadv - counter == 1)?"":"s", buffer, (huser_get_level(oper) < H_OPER)?hlevel_name(H_STAFF):hlevel_name(H_OPER), oper->real_user->nick);
+        helpmod_message_channel(hchan, "user%s %s: Please state your questions on this channel and direct them to %s %s", (nadv - counter == 1)?"":"s", buffer, hlevel_title(huser_get_level(oper)), huser_get_nick(oper));
     else
         helpmod_message_channel(hchan, "user%s %s: Please state your questions on this channel", (nadv - counter == 1)?"":"s", buffer);
 
@@ -199,6 +200,18 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             helpmod_reply(sender, returntype, "Queue deactivated for channel %s", hchannel_get_name(hchan));
            hchannel_conf_change(hchan, hchan->flags | H_QUEUE);
            hchan->autoqueue = 0;
+
+           {   /* devoice all users of level H_PEON */
+               hchannel_user *hchanuser;
+                huser_channel *huserchan;
+               for (hchanuser = hchan->channel_users;hchanuser != NULL;hchanuser = hchanuser->next)
+               {
+                   huserchan = huser_on_channel(hchanuser->husr, hchan);
+                   if (huser_get_level(hchanuser->husr) == H_PEON && huserchan->flags & HCUMODE_VOICE)
+                       helpmod_channick_modes(hchanuser->husr, hchan, MC_DEVOICE, HLAZY);
+               }
+           }
+
        }
         return;
     }
@@ -215,7 +228,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             int i;
             if (argc == 0)
             {
-                helpmod_reply(sender, returntype, "Can not advance queue: User not specified", hchannel_get_name(hchan));
+                helpmod_reply(sender, returntype, "Can not advance queue: User not specified");
                 return;
             }
             if (argc > H_CMD_MAX_ARGS)
@@ -224,7 +237,6 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             for (i=0;i<argc;i++)
             {
                 huser *husr = huser_get(getnickbynick(argv[i]));
-                /*huser_channel *husrchan;*/
                 if (husr == NULL)
                 {
                     helpmod_reply(sender, returntype, "Can not advance queue: User %s not found", argv[i]);
@@ -232,14 +244,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
                 }
                 helpmod_channick_modes(husr, hchan, MC_DEVOICE, HLAZY);
             }
-            /*
-            if ((hchan->flags & H_QUEUE_MAINTAIN) && hchan->autoqueue)
-            {
-                int dif = hchan->autoqueue - hqueue_count_off_queue(hchan);
-                if (dif)
-                    hqueue_advance(hchan, sender, dif);
-                    }
-                    */
+
             hqueue_handle_queue(hchan, sender);
         }
         return;
@@ -250,7 +255,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             {
                 if (!sscanf(argv[0], "%d", &nnext) || nnext <= 0 || nnext > 25 /* magic number */)
                 {
-                    helpmod_reply(sender, returntype, "Can not advance queue: Integer [1, 25] expected", hchannel_get_name(hchan));
+                    helpmod_reply(sender, returntype, "Can not advance queue: Integer [1, 25] expected");
                     return;
                 }
             }
@@ -267,7 +272,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
             }
             if (!sscanf(argv[0], "%d", &tmp) || tmp < 0 || tmp > 25)
             {
-                helpmod_reply(sender, returntype, "Can not set auto queue: Integer [0, 20] expected", hchannel_get_name(hchan));
+                helpmod_reply(sender, returntype, "Can not set auto queue: Integer [0, 20] expected");
                 return;
             }
             hchan->autoqueue = tmp;
@@ -309,7 +314,7 @@ void helpmod_queue_handler (huser *sender, channel* returntype, hchannel *hchan,
                     buffer[0] = '\0';
                 }
                 if (hqueue_on_queue(hqueue))
-                    sprintf(buffer+strlen(buffer) /* :) */, "%s (%s@%s) [%s] ", hqueue->hchanuser->husr->real_user->nick, hqueue->hchanuser->husr->real_user->ident, hqueue->hchanuser->husr->real_user->host->name->content, helpmod_strtime(time(NULL) - hqueue->hchanuser->time_joined));
+                    sprintf(buffer+strlen(buffer) /* :) */, "%s (%s@%s) [%s] ", huser_get_nick(hqueue->hchanuser->husr), huser_get_ident(hqueue->hchanuser->husr), huser_get_host(hqueue->hchanuser->husr), helpmod_strtime(time(NULL) - hqueue->hchanuser->time_joined));
             }
             if  (buffer[0])
                 helpmod_reply(sender, returntype, "%s", buffer);