Merge pull request #2 from briancollins/master

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 38b9a7d64f8cb89bd45f0b3ac34a291c3afa193c..fc04773ae14ef307d1ac5adb0b53f2a18a64dd03 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -39,6 +39,7 @@
 #include "parse.h"
 #include "irc.h"
 #include "irc-write.h"
+#include "client-cap.h"
 
 #include "exp.h"
 #include "irc-info.h"
@@ -807,8 +808,16 @@ who_flags_status(const char *client_modes)
 
 
 static const char *
-who_flags_qualifier(const char *chan_user_modes)
+who_flags_qualifier(CLIENT *Client, const char *chan_user_modes)
 {
+       assert(Client != NULL);
+
+       if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX) {
+               if (strchr(chan_user_modes, 'o') &&
+                   strchr(chan_user_modes, 'v'))
+                       return "@+";
+       }
+
        if (strchr(chan_user_modes, 'o'))
                return "@";
        else if (strchr(chan_user_modes, 'v'))
@@ -839,6 +848,8 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
        assert( Client != NULL );
        assert( Chan != NULL );
 
+       IRC_SetPenalty(Client, 1);
+
        is_member = Channel_IsMemberOf(Chan, Client);
 
        /* Secret channel? */
@@ -857,15 +868,12 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
 
                is_visible = strchr(client_modes, 'i') == NULL;
                if (is_member || is_visible) {
-                       if (IRC_CheckListTooBig(Client, count, MAX_RPL_WHO, "WHO"))
-                               break;
-
                        strcpy(flags, who_flags_status(client_modes));
                        if (is_ircop)
                                strlcat(flags, "*", sizeof(flags));
 
                        chan_user_modes = Channel_UserModes(Chan, c);
-                       strlcat(flags, who_flags_qualifier(chan_user_modes),
+                       strlcat(flags, who_flags_qualifier(c, chan_user_modes),
                                sizeof(flags));
 
                        if (!write_whoreply(Client, c, Channel_Name(Chan),
@@ -874,6 +882,11 @@ IRC_WHO_Channel(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
                        count++;
                }
        }
+
+       /* If there are a lot of clients, augment penalty a bit */
+       if (count > MAX_RPL_WHO)
+               IRC_SetPenalty(Client, 1);
+
        return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client),
                                  Channel_Name(Chan));
 }
@@ -902,6 +915,7 @@ IRC_WHO_Mask(CLIENT *Client, char *Mask, bool OnlyOps)
        if (Mask)
                ngt_LowerStr(Mask);
 
+       IRC_SetPenalty(Client, 3);
        for (c = Client_First(); c != NULL; c = Client_Next(c)) {
                if (Client_Type(c) != CLIENT_USER)
                        continue;
@@ -1005,13 +1019,11 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
                chan = Channel_Search(Req->argv[0]);
                if (chan) {
                        /* Members of a channel have been requested */
-                       IRC_SetPenalty(Client, 1);
                        return IRC_WHO_Channel(Client, chan, only_ops);
                }
                if (strcmp(Req->argv[0], "0") != 0) {
                        /* A mask has been given. But please note this RFC
                         * stupidity: "0" is same as no arguments ... */
-                       IRC_SetPenalty(Client, 3);
                        return IRC_WHO_Mask(Client, Req->argv[0], only_ops);
                }
        }
@@ -1078,7 +1090,7 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                if (str[strlen(str) - 1] != ':')
                        strlcat(str, " ", sizeof(str));
 
-               strlcat(str, who_flags_qualifier(Channel_UserModes(chan, c)),
+               strlcat(str, who_flags_qualifier(c, Channel_UserModes(chan, c)),
                                                 sizeof(str));
                strlcat(str, Channel_Name(chan), sizeof(str));
 
@@ -1102,6 +1114,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                                Client_ID(from), Client_ID(c)))
                return DISCONNECTED;
 
+       /* IRC-Bot? */
+       if (Client_HasMode(c, 'B') &&
+           !IRC_WriteStrClient(from, RPL_WHOISBOT_MSG,
+                               Client_ID(from), Client_ID(c)))
+               return DISCONNECTED;
+
        /* Connected using SSL? */
        if (Conn_UsesSSL(Client_Conn(c)) &&
            !IRC_WriteStrClient(from, RPL_WHOISSSL_MSG, Client_ID(from),
@@ -1468,7 +1486,15 @@ Show_MOTD_Sendline(CLIENT *Client, const char *msg)
 static bool
 Show_MOTD_End(CLIENT *Client)
 {
-       return IRC_WriteStrClient( Client, RPL_ENDOFMOTD_MSG, Client_ID( Client ));
+       if (!IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, Client_ID(Client)))
+               return DISCONNECTED;
+
+       if (*Conf_CloakHost)
+               return IRC_WriteStrClient(Client, RPL_HOSTHIDDEN_MSG,
+                                         Client_ID(Client),
+                                         Client_Hostname(Client));
+
+       return CONNECTED;
 }
 
 #ifdef SSL_SUPPORT
@@ -1569,10 +1595,16 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
                if (is_member || is_visible) {
                        if (str[strlen(str) - 1] != ':')
                                strlcat(str, " ", sizeof(str));
-                       if (strchr(Channel_UserModes(Chan, cl), 'o'))
-                               strlcat(str, "@", sizeof(str));
-                       else if (strchr(Channel_UserModes(Chan, cl), 'v'))
-                               strlcat(str, "+", sizeof(str));
+                       if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX && 
+                                       strchr(Channel_UserModes(Chan, cl), 'o') &&
+                                       strchr(Channel_UserModes(Chan, cl), 'v')) {
+                               strlcat(str, "@+", sizeof(str));
+                       } else {
+                               if (strchr(Channel_UserModes(Chan, cl), 'o'))
+                                       strlcat(str, "@", sizeof(str));
+                               else if (strchr(Channel_UserModes(Chan, cl), 'v'))
+                                       strlcat(str, "+", sizeof(str));
+                       }
                        strlcat(str, Client_ID(cl), sizeof(str));
 
                        if (strlen(str) > (LINE_LEN - CLIENT_NICK_LEN - 4)) {