From af9d8b6c282665e5bf6c9421c2c223409f4bd933 Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Thu, 21 Aug 2003 16:31:37 +0000
Subject: [PATCH] Fixed relaywhois problems.

---
 plugins/Relay.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/Relay.py b/plugins/Relay.py
index ada050530..a1f694fbe 100644
--- a/plugins/Relay.py
+++ b/plugins/Relay.py
@@ -253,7 +253,7 @@ class Relay(callbacks.Privmsg):
             irc.error(msg, 'I\'m not on that network.')
             return
         otherIrc = self.ircs[network]
-        otherIrc.queueMsg(ircmsgs.whois(nick))
+        otherIrc.queueMsg(ircmsgs.whois(nick, nick))
         self.whois[(otherIrc, nick)] = (irc, msg, {})
 
     def relaycolor(self, irc, msg, args):
@@ -294,6 +294,7 @@ class Relay(callbacks.Privmsg):
             return
         (replyIrc, replyMsg, d) = self.whois[(irc, nick)]
         hostmask = '@'.join(d['311'].args[2:4])
+        user = d['311'].args[-1]
         channels = d['319'].args[-1].split()
         if len(channels) == 1:
             channels = channels[0]
@@ -303,10 +304,12 @@ class Relay(callbacks.Privmsg):
             idle = utils.timeElapsed(d['317'].args[2])
             signon = time.ctime(float(d['317'].args[3]))
         else:
-            idle = signon = '<unknown>'
+            idle = '<unknown>'
+            signon = '<unknown>'
         s = '%s (%s) has been online since %s (idle for %s) and is on %s' % \
-            (nick, hostmask, signon, idle, channels)
+            (user, hostmask, signon, idle, channels)
         replyIrc.reply(replyMsg, s)
+        del self.whois[(replyIrc, nick)]
 
     def _formatPrivmsg(self, nick, network, msg):
         # colorize nicks