diff options
| author |  Matteo Bertucci <[email protected]> | 2019-11-15 10:11:45 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-11-15 10:11:45 +0100 |
| commit | 0e8f623d15f043f1c8712366bdaf83153a619bca (patch) | |
| tree | 611c4f111855788c00a5e3ef6c909d9021b29c5c /pydis_site/apps/api/models/bot | |
| parent | Delete useless migration file (diff) | |
| parent | Add pipenv run start command (#308) (diff) | |
Merge branch 'master' into bot#549-show-attachments-staff
Diffstat (limited to 'pydis_site/apps/api/models/bot')
| -rw-r--r-- | pydis_site/apps/api/models/bot/infraction.py | 7 | ||||
| -rw-r--r-- | pydis_site/apps/api/models/bot/user.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pydis_site/apps/api/models/bot/infraction.py b/pydis_site/apps/api/models/bot/infraction.py index dfb32a97..108fd3a2 100644 --- a/pydis_site/apps/api/models/bot/infraction.py +++ b/pydis_site/apps/api/models/bot/infraction.py @@ -71,3 +71,10 @@ class Infraction(ModelReprMixin, models.Model): """Defines the meta options for the infraction model.""" ordering = ['-inserted_at'] + constraints = ( + models.UniqueConstraint( + fields=["user", "type"], + condition=models.Q(active=True), + name="unique_active_infraction_per_type_per_user" + ), + ) diff --git a/pydis_site/apps/api/models/bot/user.py b/pydis_site/apps/api/models/bot/user.py index 21617dc4..5140d2bf 100644 --- a/pydis_site/apps/api/models/bot/user.py +++ b/pydis_site/apps/api/models/bot/user.py @@ -50,7 +50,7 @@ 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}" + return f"{self.name}#{self.discriminator:0>4}" @property def top_role(self) -> Role: |