Merge branch 'main' into partially-read-shelf

bookwyrm/models/__init__.py

@@ -26,7 +26,7 @@ from .group import Group, GroupMember, GroupMemberInvitation
 
 from .import_job import ImportJob, ImportItem
 
-from .site import SiteSettings, SiteInvite
+from .site import SiteSettings, Theme, SiteInvite
 from .site import PasswordReset, InviteRequest
 from .announcement import Announcement
 from .antispam import EmailBlocklist, IPBlocklist, AutoMod, automod_task

bookwyrm/models/announcement.py

@@ -8,7 +8,6 @@ from .base_model import BookWyrmModel
 
 
 DisplayTypes = [
-    ("white-ter", _("None")),
     ("primary-light", _("Primary")),
     ("success-light", _("Success")),
     ("link-light", _("Link")),
@@ -28,11 +27,7 @@ class Announcement(BookWyrmModel):
     end_date = models.DateTimeField(blank=True, null=True)
     active = models.BooleanField(default=True)
     display_type = models.CharField(
-        max_length=20,
-        blank=False,
-        null=False,
-        choices=DisplayTypes,
-        default="white-ter",
+        max_length=20, choices=DisplayTypes, null=True, blank=True
     )
 
     @classmethod

bookwyrm/models/site.py

@@ -24,6 +24,9 @@ class SiteSettings(models.Model):
     )
     instance_description = models.TextField(default="This instance has no description.")
     instance_short_description = models.CharField(max_length=255, blank=True, null=True)
+    default_theme = models.ForeignKey(
+        "Theme", null=True, blank=True, on_delete=models.SET_NULL
+    )
 
     # admin setup options
     install_mode = models.BooleanField(default=False)
@@ -104,6 +107,18 @@ class SiteSettings(models.Model):
         super().save(*args, **kwargs)
 
 
+class Theme(models.Model):
+    """Theme files"""
+
+    created_date = models.DateTimeField(auto_now_add=True)
+    name = models.CharField(max_length=50, unique=True)
+    path = models.CharField(max_length=50, unique=True)
+
+    def __str__(self):
+        # pylint: disable=invalid-str-returned
+        return self.name
+
+
 class SiteInvite(models.Model):
     """gives someone access to create an account on the instance"""
 

bookwyrm/models/user.py

@@ -136,6 +136,8 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     updated_date = models.DateTimeField(auto_now=True)
     last_active_date = models.DateTimeField(default=timezone.now)
     manually_approves_followers = fields.BooleanField(default=False)
+    theme = models.ForeignKey("Theme", null=True, blank=True, on_delete=models.SET_NULL)
+    hide_follows = fields.BooleanField(default=False)
 
     # options to turn features on and off
     show_goal = models.BooleanField(default=True)
@@ -482,10 +484,13 @@ def set_remote_server(user_id):
         get_remote_reviews.delay(user.outbox)
 
 
-def get_or_create_remote_server(domain):
+def get_or_create_remote_server(domain, refresh=False):
     """get info on a remote server"""
+    server = FederatedServer()
     try:
-        return FederatedServer.objects.get(server_name=domain)
+        server = FederatedServer.objects.get(server_name=domain)
+        if not refresh:
+            return server
     except FederatedServer.DoesNotExist:
         pass
 
@@ -500,13 +505,15 @@ def get_or_create_remote_server(domain):
         application_type = data.get("software", {}).get("name")
         application_version = data.get("software", {}).get("version")
     except ConnectorException:
+        if server.id:
+            return server
         application_type = application_version = None
 
-    server = FederatedServer.objects.create(
-        server_name=domain,
-        application_type=application_type,
-        application_version=application_version,
-    )
+    server.server_name = domain
+    server.application_type = application_type
+    server.application_version = application_version
+
+    server.save()
     return server