From f28bed51ec22ebe408afb8e19b489f8bca666571 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Wed, 8 Oct 2003 06:25:05 +0000 Subject: [PATCH] Fixed bug in relaywhois response. --- plugins/Relay.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/Relay.py b/plugins/Relay.py index a40c7e7b9..f1d9b03e6 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -392,16 +392,15 @@ class Relay(callbacks.Privmsg): user = d['311'].args[-1] if '319' in d: channels = d['319'].args[-1].split() - channels[0] = 'is on ' + channels[0] + for (i, channel) in enumerate(channels): + channel = channel.replace('@', 'is an op on ') + channel = channel.replace('%', 'is a halfop on ') + channel = channel.replace('+', 'is voiced on ') + channels[i] = channel else: channels = ['isn\'t on any channels'] - for (i, channel) in enumerate(channels): - if channel[0] == '@': - channels[i] = 'is an op on %s' % channel[1:] - elif channel[0] == '+': - channels[i] = 'is voiced on %s' % channel[1:] - elif channel[0] == '%': - channels[i] = 'is a half-op on %s' % channel[1:] + if not channels[0].startswith('is'): + channels[0] = 'is on ' + channels[0] channels = utils.commaAndify(channels) if '317' in d: idle = utils.timeElapsed(d['317'].args[2])