Forward port of delayed-join.patch from Quakenet's "Asuka" patch set

[ircu2.10.12-pk.git] / ircd / m_whois.c

diff --git a/ircd/m_whois.c b/ircd/m_whois.c
index 319ea1dc0f7f79d3980c0521a1a0b57bdb455e36..ed0213ad2ee8d7a18d099d1e8ce45f06f8d4f6df 100644 (file)
--- a/ircd/m_whois.c
+++ b/ircd/m_whois.c
@@ -166,9 +166,11 @@ static void do_whois(struct Client* sptr, struct Client *acptr, int parc)
        }
        if (IsDeaf(acptr))
          *(buf + len++) = '-';
-       if (is_chan_op(acptr, chptr))
+       if (IsDelayedJoin(chan) && (sptr != acptr))
+         *(buf + len++) = '<';
+       else if (IsChanOp(chan))
          *(buf + len++) = '@';
-       else if (has_voice(acptr, chptr))
+       else if (HasVoice(chan))
          *(buf + len++) = '+';
        else if (IsZombie(chan))
          *(buf + len++) = '!';