PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-04-29 06:51:10 -05:00
Code Issues Projects Releases Wiki Activity

RelayNext: cleanup, sort 'nicks' output case-insensitively

Browse Source
This commit is contained in:
James Lu 2016-03-06 12:29:39 -08:00
parent a4a1805a6c
commit 1f78a9fb28
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
RelayNext/plugin.py
View File

@ -371,28 +371,32 @@ class RelayNext(callbacks.Plugin):
source = "%s@%s" % (channel, irc.network) source = "%s@%s" % (channel, irc.network)
source = source.lower() source = source.lower()
totalChans = 0 channel_count = 0
totalUsers = 0 user_count = 0
allUsers = [] all_users = []
# Make a set to prevent duplicates since one channel
# can be part of many relays # First, enumerate all the relays that the calling channel is it. Use a
Relays = set() # set to prevent duplicates since one channel can be part of many relays.
all_relays = set()
for relay in self.db.values(): for relay in self.db.values():
if source in relay: if source in relay:
for cn in relay: for channelpair in relay:
Relays.add(cn) # Each channel pair is a "#chan@net" string in the DB.
all_relays.add(channelpair)
for cn in Relays: for channelpair in all_relays:
totalChans += 1 channel_count += 1
channel, net = cn.split("@", 1) channel, net = channelpair.split("@", 1)
try: try:
c = world.getIrc(net).state.channels[channel] c = world.getIrc(net).state.channels[channel]
except (KeyError, AttributeError): except (KeyError, AttributeError):
# Unknown network or network disconnected. # Unknown network or network disconnected.
continue continue
totalUsers += len(c.users) user_count += len(c.users)
users = [] users = []
for s in sorted(c.users):
# Sort users before listing them, but do so case-insensitively.
for s in sorted(c.users, key=ircutils.toLower):
s = s.strip() s = s.strip()
if s in c.ops: if s in c.ops:
users.append('@%s' % s) users.append('@%s' % s)
@ -402,24 +406,30 @@ class RelayNext(callbacks.Plugin):
users.append('+%s' % s) users.append('+%s' % s)
else: else:
users.append(s) users.append(s)
allUsers += c.users
all_users += c.users
s = format('%s users in %s on %s: %L', len(c.users), s = format('%s users in %s on %s: %L', len(c.users),
channel, net, users) channel, net, users)
# Ugh, this is ugly, but https://github.com/ProgVal/Limnoria/issues/1080
# In outputting the user list, we need to make sure that the message fits,
# and if not, wrap it into multiple messages.
# XXX: This is ugly, but https://github.com/ProgVal/Limnoria/issues/1080
# means we have to chop off the (XX more messages) part too. # means we have to chop off the (XX more messages) part too.
# Unfortunately, this plugin isn't localized yet and won't work in other languages. allowed_length = 466 - len(irc.prefix) - len(irc.nick) - len(msg.nick) - \
allowedLength = 466 - len(irc.prefix) - len(irc.nick) - len(msg.nick) - \
len(_('(XX more messages)')) len(_('(XX more messages)'))
replies = textwrap.wrap(s, allowedLength) replies = textwrap.wrap(s, allowed_length)
if 'count' not in opts: if 'count' not in opts:
# Only bother doing this if we're not using --count.
irc.reply(replies[0], private=True, notice=True) irc.reply(replies[0], private=True, notice=True)
for s in replies[1:]: for s in replies[1:]:
irc.reply("... %s" % s, private=True, notice=True) irc.reply("... %s" % s, private=True, notice=True)
if 'count' in opts:
irc.reply(totalUsers) if 'count' in opts: # --count was specified; just reply with the amount of users.
irc.reply(user_count)
else: else:
irc.reply("Total users across %d channels: %d. Unique nicks: %d" % irc.reply("Total users across %d channels: %d. Unique nicks: %d" %
(totalChans, totalUsers, len(set(allUsers))), (channel_count, user_count, len(set(all_users))),
private=True) private=True)
nicks = wrap(nicks, ['Channel', getopts({'count': ''})]) nicks = wrap(nicks, ['Channel', getopts({'count': ''})])