From 54687b7b358bdbd957feda7bb01c96e8bd4f2db4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 28 Feb 2021 13:45:49 -0800 Subject: [PATCH 1/4] Make users editors by default --- bookwyrm/models/user.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index f137236c..21ef8dd2 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -3,7 +3,7 @@ import re from urllib.parse import urlparse from django.apps import apps -from django.contrib.auth.models import AbstractUser +from django.contrib.auth.models import AbstractUser, Group from django.core.validators import MinValueValidator from django.db import models from django.utils import timezone @@ -208,6 +208,9 @@ class User(OrderedCollectionPageMixin, AbstractUser): # an id needs to be set before we can proceed with related models super().save(*args, **kwargs) + # make users editors by default + self.groups.add(Group.objects.get(name='editor')) + # create keys and shelves for new local users self.key_pair = KeyPair.objects.create( remote_id='%s/#main-key' % self.remote_id) From 9842e63cb4fb6a2cd7afd32d80f21b75b38f41ed Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 4 Mar 2021 08:35:13 -0800 Subject: [PATCH 2/4] Ignore group not found error creating user --- bookwyrm/models/user.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 21ef8dd2..f47eb647 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -209,7 +209,11 @@ class User(OrderedCollectionPageMixin, AbstractUser): super().save(*args, **kwargs) # make users editors by default - self.groups.add(Group.objects.get(name='editor')) + try: + self.groups.add(Group.objects.get(name='editor')) + except Group.objects.DoesNotExist: + # this should never happen except in tests + pass # create keys and shelves for new local users self.key_pair = KeyPair.objects.create( From 6caf45ac4fa484533d50dbd5b7a24aaa7515d441 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 4 Mar 2021 08:45:03 -0800 Subject: [PATCH 3/4] fixes error catching --- bookwyrm/models/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index f47eb647..49474e43 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -211,7 +211,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): # make users editors by default try: self.groups.add(Group.objects.get(name='editor')) - except Group.objects.DoesNotExist: + except Group.DoesNotExist: # this should never happen except in tests pass From 2542b72f3aa42fe7d94ed4c293303ddb8f8b69ff Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 4 Mar 2021 08:51:10 -0800 Subject: [PATCH 4/4] Try to get github to re-run checks --- bookwyrm/models/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 49474e43..bbeb10cc 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -212,7 +212,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): try: self.groups.add(Group.objects.get(name='editor')) except Group.DoesNotExist: - # this should never happen except in tests + # this should only happen in tests pass # create keys and shelves for new local users