wrap up consts cleanup in user model

misago/users/forms/admin.py

@@ -10,10 +10,13 @@ from misago.core import threadstore
 from misago.core.forms import IsoDateTimeField, YesNoSwitch
 from misago.core.validators import validate_sluggable
 
-from ..models import BANS_CHOICES, Ban, Rank, User
+from ..models import BANS_CHOICES, Ban, Rank
 from ..validators import validate_email, validate_username
 
 
+UserModel = get_user_model()
+
+
 """
 Users
 """
@@ -23,7 +26,7 @@ class UserBaseForm(forms.ModelForm):
     email = forms.EmailField(label=_("E-mail address"))
 
     class Meta:
-        model = get_user_model()
+        model = UserModel
         fields = ['username', 'email', 'title']
 
     def clean_username(self):
@@ -62,7 +65,7 @@ class NewUserForm(UserBaseForm):
     )
 
     class Meta:
-        model = get_user_model()
+        model = UserModel
         fields = ['username', 'email', 'title']
 
 
@@ -161,22 +164,22 @@ class EditUserForm(UserBaseForm):
     limits_private_thread_invites_to = forms.TypedChoiceField(
         label=_("Who can add user to private threads"),
         coerce=int,
-        choices=User.PRIVATE_THREAD_INVITES_LIMITS_CHOICES
+        choices=UserModel.LIMIT_INVITES_TO_CHOICES
     )
 
     subscribe_to_started_threads = forms.TypedChoiceField(
         label=_("Started threads"),
         coerce=int,
-        choices=User.SUBSCRIBE_CHOICES
+        choices=UserModel.SUBSCRIBE_CHOICES
     )
     subscribe_to_replied_threads = forms.TypedChoiceField(
         label=_("Replid threads"),
         coerce=int,
-        choices=User.SUBSCRIBE_CHOICES
+        choices=UserModel.SUBSCRIBE_CHOICES
     )
 
     class Meta:
-        model = get_user_model()
+        model = UserModel
         fields = [
             'username',
             'email',

misago/users/forms/options.py

@@ -17,7 +17,7 @@ class ForumOptionsForm(forms.ModelForm):
     is_hiding_presence = YesNoSwitch()
 
     limits_private_thread_invites_to = forms.TypedChoiceField(
-        choices=UserModel.PRIVATE_THREAD_INVITES_LIMITS_CHOICES,
+        choices=UserModel.LIMIT_INVITES_TO_CHOICES,
         coerce=int,
     )
     subscribe_to_started_threads = forms.TypedChoiceField(

misago/users/models/user.py

@@ -151,17 +151,17 @@ class User(AbstractBaseUser, PermissionsMixin):
     SUBSCRIBE_NOTIFY = 1
     SUBSCRIBE_ALL = 2
 
-    LIMIT_INVITES_TO_NONE = 0
-    LIMIT_INVITES_TO_FOLLOWED = 1
-    LIMIT_INVITES_TO_NOBODY = 2
-
     SUBSCRIBE_CHOICES = (
         (SUBSCRIBE_NONE, _("No")),
         (SUBSCRIBE_NOTIFY, _("Notify")),
         (SUBSCRIBE_ALL, _("Notify with e-mail"))
     )
 
-    PRIVATE_THREAD_INVITES_LIMITS_CHOICES = (
+    LIMIT_INVITES_TO_NONE = 0
+    LIMIT_INVITES_TO_FOLLOWED = 1
+    LIMIT_INVITES_TO_NOBODY = 2
+
+    LIMIT_INVITES_TO_CHOICES = (
         (LIMIT_INVITES_TO_NONE, _("Everybody")),
         (LIMIT_INVITES_TO_FOLLOWED, _("Users I follow")),
         (LIMIT_INVITES_TO_NOBODY, _("Nobody")),
@@ -314,26 +314,26 @@ class User(AbstractBaseUser, PermissionsMixin):
 
     @property
     def requires_activation_by_admin(self):
-        return self.requires_activation == User.ACTIVATION_ADMIN
+        return self.requires_activation == self.ACTIVATION_ADMIN
 
     @property
     def requires_activation_by_user(self):
-        return self.requires_activation == User.ACTIVATION_USER
+        return self.requires_activation == self.ACTIVATION_USER
 
     @property
     def can_be_messaged_by_everyone(self):
         preference = self.limits_private_thread_invites_to
-        return preference == User.LIMIT_INVITES_TO_NONE
+        return preference == self.LIMIT_INVITES_TO_NONE
 
     @property
     def can_be_messaged_by_followed(self):
         preference = self.limits_private_thread_invites_to
-        return preference == User.LIMIT_INVITES_TO_FOLLOWED
+        return preference == self.LIMIT_INVITES_TO_FOLLOWED
 
     @property
     def can_be_messaged_by_nobody(self):
         preference = self.limits_private_thread_invites_to
-        return preference == User.LIMIT_INVITES_TO_NOBODY
+        return preference == self.LIMIT_INVITES_TO_NOBODY
 
     @property
     def has_valid_signature(self):