From 044b0824e68c4dacdaf26ff52a741ca1b5118c9b Mon Sep 17 00:00:00 2001 From: Rapptz Date: Sun, 9 Oct 2016 01:05:07 -0400 Subject: Begin working on the rewrite. --- discord/user.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'discord/user.py') diff --git a/discord/user.py b/discord/user.py index 37f0cc51..919d6deb 100644 --- a/discord/user.py +++ b/discord/user.py @@ -58,14 +58,15 @@ class User: Specifies if the user is a bot account. """ - __slots__ = ['name', 'id', 'discriminator', 'avatar', 'bot'] - - def __init__(self, **kwargs): - self.name = kwargs.get('username') - self.id = kwargs.get('id') - self.discriminator = kwargs.get('discriminator') - self.avatar = kwargs.get('avatar') - self.bot = kwargs.get('bot', False) + __slots__ = ['name', 'id', 'discriminator', 'avatar', 'bot', '_state'] + + def __init__(self, *, state, data): + self._state = state + self.name = data['username'] + self.id = data['id'] + self.discriminator = data['discriminator'] + self.avatar = data['avatar'] + self.bot = data.get('bot', False) def __str__(self): return '{0.name}#{0.discriminator}'.format(self) -- cgit v1.2.3