3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-26 04:32:51 +01:00

admin.py: check to see if queried channels exist; sort output fields

This commit is contained in:
James Lu 2015-07-09 17:05:23 -07:00
parent 08a187aee6
commit 070bba77cb

View File

@ -126,7 +126,7 @@ def showuser(irc, source, args):
if u is None: if u is None:
utils.msg(irc, source, 'Error: unknown user %r' % target) utils.msg(irc, source, 'Error: unknown user %r' % target)
return return
s = ['\x02%s\x02: %s' % (k, v) for k, v in irc.users[u].__dict__.items()] s = ['\x02%s\x02: %s' % (k, v) for k, v in sorted(irc.users[u].__dict__.items())]
s = 'Information on user \x02%s\x02: %s' % (target, '; '.join(s)) s = 'Information on user \x02%s\x02: %s' % (target, '; '.join(s))
utils.msg(irc, source, s) utils.msg(irc, source, s)
@ -138,7 +138,10 @@ def showchan(irc, source, args):
except IndexError: except IndexError:
utils.msg(irc, source, "Error: not enough arguments. Needs 1: channel.") utils.msg(irc, source, "Error: not enough arguments. Needs 1: channel.")
return return
s = ['\x02%s\x02: %s' % (k, v) for k, v in irc.channels[channel].__dict__.items()] if channel not in irc.channels:
utils.msg(irc, source, 'Error: unknown channel %r' % channel)
return
s = ['\x02%s\x02: %s' % (k, v) for k, v in sorted(irc.channels[channel].__dict__.items())]
s = 'Information on channel \x02%s\x02: %s' % (channel, '; '.join(s)) s = 'Information on channel \x02%s\x02: %s' % (channel, '; '.join(s))
utils.msg(irc, source, s) utils.msg(irc, source, s)