zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge branch 'main' into html-in-activitypub

Browse source
This commit is contained in:
Mouse Reeve 2022-12-05 17:46:31 -08:00 • committed by GitHub
commit bffde6703c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 4828 additions and 2907 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bookwyrm/models/site.py
View file

@ -62,6 +62,8 @@ class SiteSettings(SiteModel):
)
code_of_conduct = models.TextField(default="Add a code of conduct here.")
privacy_policy = models.TextField(default="Add a privacy policy here.")
impressum = models.TextField(default="Add a impressum here.")
show_impressum = models.BooleanField(default=False)
# registration
allow_registration = models.BooleanField(default=False)
@ -86,6 +88,9 @@ class SiteSettings(SiteModel):
admin_email = models.EmailField(max_length=255, null=True, blank=True)
footer_item = models.TextField(null=True, blank=True)
# controls
imports_enabled = models.BooleanField(default=True)
field_tracker = FieldTracker(fields=["name", "instance_tagline", "logo"])
@classmethod

7
bookwyrm/models/user.py
View file

@ -244,9 +244,10 @@ class User(OrderedCollectionPageMixin, AbstractUser):
def admins(cls):
"""Get a queryset of the admins for this instance"""
return cls.objects.filter(
models.Q(user_permissions__name__in=["moderate_user", "moderate_post"])
| models.Q(is_superuser=True)
)
models.Q(groups__name__in=["moderator", "admin"])
| models.Q(is_superuser=True),
is_active=True,
).distinct()
def update_active_date(self):
"""this user is here! they are doing things!"""