Skip to content

Convenience full_name method for User #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsnoam merged 1 commit into from
Dec 30, 2017
Merged

Convenience full_name method for User #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions telegram/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ def name(self):
return '%s %s' % (self.first_name, self.last_name)
return self.first_name

@property
def full_name(self):
"""
:obj:`str`: The users :attr:`first_name` and if present :attr:`last_name`.

"""

if self.last_name:
return '%s %s' % (self.first_name, self.last_name)
return self.first_name

@classmethod
def de_json(cls, data, bot):
if not data:
Expand Down
5 changes: 5 additions & 0 deletions tests/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ def test_name(self, user):
assert user.name == 'first_name'
user.username = self.username
assert user.name == '@username'

def test_full_name(self, user):
assert user.full_name == 'first_name last_name'
user.last_name = None
assert user.full_name == 'first_name'

def test_get_profile_photos(self, monkeypatch, user):
def test(_, *args, **kwargs):
Expand Down