Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Most userhost-in-names check to after mode prefix checking

Browse source
This commit is contained in:
jesopo 2018-09-04 08:04:49 +01:00
parent 1c3c56e7f4
commit d72c15c956
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
IRCLineHandler.py
View file

@ -181,12 +181,6 @@ class LineHandler(object):
channel = event["server"].get_channel(event["args"][2]) channel = event["server"].get_channel(event["args"][2])
nicknames = event["arbitrary"].split() nicknames = event["arbitrary"].split()
for nickname in nicknames: for nickname in nicknames:
username = None
hostname = None
if "userhost-in-names" in event["server"].capabilities:
nickname, username, hostname = Utils.seperate_hostmask(
event["prefix"])
modes = set([]) modes = set([])
while nickname[0] in event["server"].mode_prefixes: while nickname[0] in event["server"].mode_prefixes:
@ -194,7 +188,9 @@ class LineHandler(object):
nickname = nickname[1:] nickname = nickname[1:]
user = event["server"].get_user(nickname) user = event["server"].get_user(nickname)
if username and hostname: if "userhost-in-names" in event["server"].capabilities:
nickname, username, hostname = Utils.seperate_hostmask(
nickname)
user.username = username user.username = username
user.hostname = hostname user.hostname = hostname
user.join_channel(channel) user.join_channel(channel)