GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-24 03:29:28 +01:00
Code Issues Projects Releases Wiki Activity

Revert most of 1c0ea24acd

Browse Source 
1c0ea24acd "relay_clientbot: normalize sender names to the senders' home networks"

In the future we hope to remove nick restrictions in Clientbot entirely, and just use freeform nicks for virtual users.
This commit is contained in:
James Lu 2019-06-23 17:44:49 -07:00
parent 957697d275
commit 30f7a77d18
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/relay_clientbot.py
View File

@ -110,19 +110,8 @@ def cb_relay_core(irc, source, command, args):
except (AttributeError, KeyError): except (AttributeError, KeyError):
return return
sourcenet, realsource = origuser
log.debug('(%s) relay_cb_core: Original sender found as %s', irc.name, origuser) log.debug('(%s) relay_cb_core: Original sender found as %s', irc.name, origuser)
if 'newnick' not in args: # XXX: we can't really normalize sender names for nick changes, because we'll always see the new nick sourcenet, realsource = origuser
try:
sourcename = world.networkobjects[sourcenet].get_friendly_name(realsource)
except LookupError:
# Fallbacks for users that have just quit / servers that have just split
if args.get('serverdata'):
sourcename = args['serverdata'].name
elif args.get('userdata'):
sourcename = args['userdata'].nick
else:
log.debug('(%s) relay_cb_core: could not get original name of sender %s/%s', irc.name, realsource, sourcenet, exc_info=True)
try: # Try to get the full network name try: # Try to get the full network name
netname = conf.conf['servers'][sourcenet]['netname'] netname = conf.conf['servers'][sourcenet]['netname']
@ -154,7 +143,7 @@ def cb_relay_core(irc, source, command, args):
identhost = '' identhost = ''
if source in irc.users: if source in irc.users:
try: try:
identhost = irc.get_hostmask(source).split('!', 1)[-1] identhost = irc.get_hostmask(source).split('!')[-1]
except KeyError: # User got removed due to quit except KeyError: # User got removed due to quit
identhost = '%s@%s' % (args['userdata'].ident, args['userdata'].host) identhost = '%s@%s' % (args['userdata'].ident, args['userdata'].host)
# This is specifically spaced so that ident@host is only shown for users that have # This is specifically spaced so that ident@host is only shown for users that have