diff --git a/journal/models/common.py b/journal/models/common.py index 5704f5f0..b527b878 100644 --- a/journal/models/common.py +++ b/journal/models/common.py @@ -241,7 +241,7 @@ class Content(Piece): remote_id = models.CharField(max_length=200, null=True, default=None) def __str__(self): - return f"{self.uuid}@{self.item}" + return f"{self.__class__.__name__}:{self.uuid}@{self.item}" class Meta: abstract = True diff --git a/journal/models/itemlist.py b/journal/models/itemlist.py index f06c00a7..d46d4128 100644 --- a/journal/models/itemlist.py +++ b/journal/models/itemlist.py @@ -164,4 +164,4 @@ class ListMember(Piece): abstract = True def __str__(self): - return f"{self.id}:{self.position} ({self.item})" + return f"{self.__class__.__name__}:{self.id}@{self.position}:{self.item}" diff --git a/journal/models/shelf.py b/journal/models/shelf.py index 94e5cd92..b8c796be 100644 --- a/journal/models/shelf.py +++ b/journal/models/shelf.py @@ -193,7 +193,7 @@ class ShelfLogEntry(models.Model): ] def __str__(self): - return f"{self.owner}:{self.shelf_type}:{self.item.uuid}:{self.timestamp}" + return f"LOG:{self.owner}:{self.shelf_type}:{self.item.uuid}:{self.timestamp}" @property def action_label(self): diff --git a/users/management/commands/fix_profile.py b/users/management/commands/fix_profile.py deleted file mode 100644 index d8d8203c..00000000 --- a/users/management/commands/fix_profile.py +++ /dev/null @@ -1,30 +0,0 @@ -from django.conf import settings -from django.core.management.base import BaseCommand -from loguru import logger -from tqdm import tqdm - -from takahe.utils import Takahe -from users.models import APIdentity, User - - -class Command(BaseCommand): - help = "Manage import tasks" - - def add_arguments(self, parser): - parser.add_argument( - "--reset", - action="store_true", - ) - - def handle(self, *args, **options): - count = 0 - for identity in tqdm(APIdentity.objects.filter(local=True)): - if ( - identity.is_active - and not identity.takahe_identity.profile_uri.startswith("http") - ): - identity.takahe_identity.profile_uri = identity.user.absolute_url - identity.takahe_identity.save(update_fields=["profile_uri"]) - Takahe.update_state(identity.takahe_identity, "edited") - count += 1 - self.stdout.write(self.style.SUCCESS(f"{count} user(s) fixed")) diff --git a/users/models/user.py b/users/models/user.py index 12a0be9c..aebb28f2 100644 --- a/users/models/user.py +++ b/users/models/user.py @@ -207,7 +207,7 @@ class User(AbstractUser): return settings.SITE_INFO["site_url"] + self.url def __str__(self): - return f'{self.pk}:{self.username or ""}:{self.mastodon_acct}' + return f'USER:{self.pk}:{self.username or ""}:{self.mastodon_acct or self.email}' @property def registration_complete(self):