Skip to content
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

Jump to bottom

Remove discriminator from bot logs view #1424

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove discriminator from bot logs view #1424

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
4 changes: 3 additions & 1 deletion pydis_site/apps/api/models/bot/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ class User(ModelReprMixin, models.Model):

def __str__(self):
"""Returns the name and discriminator for the current user, for display purposes."""
return f"{self.name}#{self.discriminator:04d}"
if self.discriminator:
return f"{self.name}#{self.discriminator:04d}"
return self.name

@property
def top_role(self) -> Role:
Expand Down
6 changes: 6 additions & 0 deletions pydis_site/apps/api/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,3 +187,9 @@ def test_nomination_str_representation(self):
"Nomination of Hemlock's Cat#7777 (active)",
str(self.nomination)
)


class UserTests(SimpleTestCase):
def test_str_without_discriminator(self) -> None:
user = User(name="lemonfannumber1")
self.assertEqual(str(user), "lemonfannumber1")