X Tutup
Skip to content

Commit d347c0d

Browse files
graynktsnoam
authored andcommitted
User.full_name convinience property (python-telegram-bot#949)
Fixes python-telegram-bot#943
1 parent 5c8470e commit d347c0d

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

telegram/user.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,17 @@ def name(self):
8383
return '%s %s' % (self.first_name, self.last_name)
8484
return self.first_name
8585

86+
@property
87+
def full_name(self):
88+
"""
89+
:obj:`str`: The users :attr:`first_name` and if present :attr:`last_name`.
90+
91+
"""
92+
93+
if self.last_name:
94+
return '%s %s' % (self.first_name, self.last_name)
95+
return self.first_name
96+
8697
@classmethod
8798
def de_json(cls, data, bot):
8899
if not data:

tests/test_user.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ def test_name(self, user):
9090
assert user.name == 'first_name'
9191
user.username = self.username
9292
assert user.name == '@username'
93+
94+
def test_full_name(self, user):
95+
assert user.full_name == 'first_name last_name'
96+
user.last_name = None
97+
assert user.full_name == 'first_name'
9398

9499
def test_get_profile_photos(self, monkeypatch, user):
95100
def test(_, *args, **kwargs):

0 commit comments

Comments
 (0)
X Tutup