From b67f2fa874b85f5265ced8439d1860fc0d827d09 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Thu, 27 Mar 2003 21:21:20 +0000 Subject: [PATCH] Fixed showing of originating server in relaynames, and showing of empty name --- plugins/Relay.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Relay.py b/plugins/Relay.py index cf23a22ba..c3af05e38 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -115,6 +115,8 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg): def relaynames(self, irc, msg, args): "[] (only if not sent in the channel itself.)" + if not isinstance(irc, irclib.Irc): + irc = irc.getRealIrc() channel = privmsgs.getChannel(msg, args) if channel not in self.channels: irc.error(msg, 'I\'m not relaying that channel.') @@ -123,7 +125,8 @@ class Relay(privmsgs.CapabilityCheckingPrivmsg): for (abbreviation, otherIrc) in self.ircs.iteritems(): if abbreviation != self.abbreviations[irc]: Channel = otherIrc.state.channels[channel] - users.append('%s: %s'%(abbreviation,', '.join(Channel.users))) + usersS = ', '.join([s for s in Channel.users if s.strip()!='']) + users.append('%s: %s' % (abbreviation, usersS)) irc.reply(msg, '; '.join(users))