Makes registration user/localname fields more sensible

bookwyrm/models/fields.py

@@ -26,11 +26,11 @@ def validate_remote_id(value):
         )
 
 
-def validate_username(value):
+def validate_localname(value):
     ''' make sure usernames look okay '''
     if not re.match(r'^[A-Za-z\-_\.]+$', value):
         raise ValidationError(
-            _('%(value)s is not a valid remote_id'),
+            _('%(value)s is not a valid username'),
             params={'value': value},
         )
 
@@ -156,7 +156,6 @@ class UsernameField(ActivitypubFieldMixin, models.CharField):
             _('username'),
             max_length=150,
             unique=True,
-            validators=[validate_username],
             error_messages={
                 'unique': _('A user with that username already exists.'),
             },
@@ -168,7 +167,6 @@ class UsernameField(ActivitypubFieldMixin, models.CharField):
         del kwargs['verbose_name']
         del kwargs['max_length']
         del kwargs['unique']
-        del kwargs['validators']
         del kwargs['error_messages']
         return name, path, args, kwargs
 

bookwyrm/models/user.py

@@ -48,7 +48,8 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     localname = models.CharField(
         max_length=255,
         null=True,
-        unique=True
+        unique=True,
+        validators=[fields.validate_localname],
     )
     # name is your display name, which you can change at will
     name = fields.CharField(max_length=100, null=True, blank=True)
@@ -157,10 +158,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return super().save(*args, **kwargs)
 
         # populate fields for local users
-        self.remote_id = 'https://%s/user/%s' % (DOMAIN, self.username)
-        self.localname = self.username
-        self.username = '%s@%s' % (self.username, DOMAIN)
-        self.actor = self.remote_id
+        self.remote_id = 'https://%s/user/%s' % (DOMAIN, self.localname)
         self.inbox = '%s/inbox' % self.remote_id
         self.shared_inbox = 'https://%s/inbox' % DOMAIN
         self.outbox = '%s/outbox' % self.remote_id