mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-27 21:19:31 +01:00
relay: fix incorrect logging in normalizeNick
This commit is contained in:
parent
1d245bf001
commit
dde9539e77
@ -34,7 +34,6 @@ utils.whois_handlers.append(relayWhoisHandlers)
|
|||||||
def normalizeNick(irc, netname, nick, separator=None, oldnick=''):
|
def normalizeNick(irc, netname, nick, separator=None, oldnick=''):
|
||||||
separator = separator or irc.serverdata.get('separator') or "/"
|
separator = separator or irc.serverdata.get('separator') or "/"
|
||||||
log.debug('(%s) normalizeNick: using %r as separator.', irc.name, separator)
|
log.debug('(%s) normalizeNick: using %r as separator.', irc.name, separator)
|
||||||
|
|
||||||
orig_nick = nick
|
orig_nick = nick
|
||||||
protoname = irc.proto.__name__
|
protoname = irc.proto.__name__
|
||||||
maxnicklen = irc.maxnicklen
|
maxnicklen = irc.maxnicklen
|
||||||
@ -68,7 +67,7 @@ def normalizeNick(irc, netname, nick, separator=None, oldnick=''):
|
|||||||
# but couldn't be created due to a nick conflict.
|
# but couldn't be created due to a nick conflict.
|
||||||
# This can happen when someone steals a relay user's nick.
|
# This can happen when someone steals a relay user's nick.
|
||||||
new_sep = separator + separator[-1]
|
new_sep = separator + separator[-1]
|
||||||
log.debug('(%s) normalizeNick: using %r as new_sep.', irc.name, separator)
|
log.debug('(%s) normalizeNick: nick %r is in use; using %r as new_sep.', irc.name, nick, new_sep)
|
||||||
nick = normalizeNick(irc, netname, orig_nick, separator=new_sep)
|
nick = normalizeNick(irc, netname, orig_nick, separator=new_sep)
|
||||||
finalLength = len(nick)
|
finalLength = len(nick)
|
||||||
assert finalLength <= maxnicklen, "Normalized nick %r went over max " \
|
assert finalLength <= maxnicklen, "Normalized nick %r went over max " \
|
||||||
|
Loading…
Reference in New Issue
Block a user