From 3fe182b9c382e3239cc3f1ac6248dcde08de0273 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 23 Jul 2003 01:45:48 +0000 Subject: [PATCH] Must've forgotten an older commit... --- plugins/Relay.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/Relay.py b/plugins/Relay.py index ce77d9c8b..1097d4414 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -245,11 +245,11 @@ class Relay(callbacks.Privmsg): def do318(self, irc, msg): if not isinstance(irc, irclib.Irc): - realIrc = irc.getRealIrc() + irc = irc.getRealIrc() nick = msg.args[1] - if (realIrc, nick) not in self.whois: + if (irc, nick) not in self.whois: return - (replyIrc, replyMsg, d) = self.whois[(realIrc, nick)] + (replyIrc, replyMsg, d) = self.whois[(irc, nick)] hostmask = '@'.join(d['311'].args[2:]) channels = d['319'].args[-1].split() channels = ', and '.join([', '.join(channels[:-1]), channels[-1]]) @@ -261,9 +261,10 @@ class Relay(callbacks.Privmsg): def _formatPrivmsg(self, nick, abbreviation, msg): if ircmsgs.isAction(msg): - return '* %s@%s %s' % (nick, abbreviation, ircmsgs.unAction(msg)) + return '* \x02%s\x02@%s %s' % \ + (nick, abbreviation, ircmsgs.unAction(msg)) else: - return '<%s@%s> %s' % (nick, abbreviation, msg.args[1]) + return '<\x02%s\x02@%s> %s' % (nick, abbreviation, msg.args[1]) def doPrivmsg(self, irc, msg): callbacks.Privmsg.doPrivmsg(self, irc, msg)