GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00
Code Issues Projects Releases Wiki Activity

Irc: make sorting in joinModes() an option, and explicitly enable it in WHOIS output

Browse Source 
This prevents mode lists from being sorted when they really shouldn't be, such as when relaying mode changes ("+qo nick nick" became +oq nick nick").

(cherry picked from commit 4b27ebbee4)
This commit is contained in:
James Lu 2016-07-31 21:45:38 -07:00
parent eb2bc68c07
commit c9ce4d1507
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes.py
View File

@ -751,7 +751,7 @@ class Irc():
return set(newmodes) return set(newmodes)
@staticmethod @staticmethod
def joinModes(modes): def joinModes(modes, sort=False):
"""Takes a list of (mode, arg) tuples in parseModes() format, and """Takes a list of (mode, arg) tuples in parseModes() format, and
joins them into a string. joins them into a string.
@ -761,7 +761,8 @@ class Irc():
args = [] args = []
# Sort modes alphabetically like a conventional IRCd. # Sort modes alphabetically like a conventional IRCd.
modes = sorted(modes) if sort:
modes = sorted(modes)
for modepair in modes: for modepair in modes:
mode, arg = modepair mode, arg = modepair

2
coremods/handlers.py
View File

@ -87,7 +87,7 @@ def handle_whois(irc, source, command, args):
# Only show this to opers! # Only show this to opers!
if sourceisOper: if sourceisOper:
f(378, source, "%s :is connecting from %s@%s %s" % (nick, user.ident, user.realhost, user.ip)) f(378, source, "%s :is connecting from %s@%s %s" % (nick, user.ident, user.realhost, user.ip))
f(379, source, '%s :is using modes %s' % (nick, irc.joinModes(user.modes))) f(379, source, '%s :is using modes %s' % (nick, irc.joinModes(user.modes, sort=True)))
# 301: used to show away information if present # 301: used to show away information if present
away_text = user.away away_text = user.away