Merge pull request #31 from ramiro/bugfix/better-user-model-str

avoid breakage when Use optional fields arent set.
jlmadurga · Jun 23, 2017 · 4d1c794 · 4d1c794
2 parents 5141ed0 + facd358
commit 4d1c794
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/telegrambot/models/telegram_api.py b/telegrambot/models/telegram_api.py
@@ -15,7 +15,12 @@ class Meta:
         verbose_name_plural = _('Users')
 
     def __str__(self):
-        return "%s" % self.first_name
+        if self.first_name:
+            return "%s" % self.first_name
+        elif self.username:
+            return "%s" % self.username
+        else:
+            return "%d" % self.id
 
 @python_2_unicode_compatible
 class Chat(models.Model):