Rooba
/
pydle
mirror of https://github.com/Shizmob/pydle.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github-aureax:Shizmob/pydle

This commit is contained in:
Shiz 2014-03-21 02:45:09 +01:00
parent b2125ca89c 3c9777dd48
commit 626e1296da
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pydle/client.py
View File

@ -226,7 +226,7 @@ class BasicClient:
raise NotImplementedError() raise NotImplementedError()
def _format_user_mask(self, nickname): def _format_user_mask(self, nickname):
user = self.users.get(nickname, { "username": "*", "hostname": "*" }) user = self.users.get(nickname, { "nickname": nickname, "username": "*", "hostname": "*" })
return self._format_host_mask(user['nickname'], user['username'] or '*', user['hostname'] or '*') return self._format_host_mask(user['nickname'], user['username'] or '*', user['hostname'] or '*')
def _format_host_mask(self, nick, user, host): def _format_host_mask(self, nick, user, host):

4
pydle/features/account.py
View File

@ -7,6 +7,10 @@ class AccountSupport(rfc1459.RFC1459Support):
## Internal. ## Internal.
def _create_user(self, nickname): def _create_user(self, nickname):
# Servers aren't users here, either!
if "." in nickname:
return
super()._create_user(nickname) super()._create_user(nickname)
self.users[nickname].update({ self.users[nickname].update({
'account': None, 'account': None,

2
pydle/features/tls.py
View File

@ -96,7 +96,7 @@ class TLSSupport(rfc1459.RFC1459Support):
'secure': True 'secure': True
} }
if nickname in self._pending['whois']: if nickname in self._whois_info:
self._whois_info[nickname].update(info) self._whois_info[nickname].update(info)
def on_raw_691(self, message): def on_raw_691(self, message):