Merge branch 'main' into openlibrary-author-fields

bookwyrm/models/announcement.py

@@ -2,10 +2,21 @@
 from django.db import models
 from django.db.models import Q
 from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 
 from .base_model import BookWyrmModel
 
 
+DisplayTypes = [
+    ("white-ter", _("None")),
+    ("primary-light", _("Primary")),
+    ("success-light", _("Success")),
+    ("link-light", _("Link")),
+    ("warning-light", _("Warning")),
+    ("danger-light", _("Danger")),
+]
+
+
 class Announcement(BookWyrmModel):
     """The admin has something to say"""
 
@@ -16,6 +27,13 @@ class Announcement(BookWyrmModel):
     start_date = models.DateTimeField(blank=True, null=True)
     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",
+    )
 
     @classmethod
     def active_announcements(cls):

bookwyrm/models/fields.py

@@ -1,6 +1,5 @@
 """ activitypub-aware django model fields """
 from dataclasses import MISSING
-import imghdr
 import re
 from uuid import uuid4
 from urllib.parse import urljoin
@@ -9,7 +8,6 @@ import dateutil.parser
 from dateutil.parser import ParserError
 from django.contrib.postgres.fields import ArrayField as DjangoArrayField
 from django.core.exceptions import ValidationError
-from django.core.files.base import ContentFile
 from django.db import models
 from django.forms import ClearableFileInput, ImageField as DjangoImageField
 from django.utils import timezone
@@ -443,12 +441,10 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         except ValidationError:
             return None
 
-        response = get_image(url)
-        if not response:
+        image_content, extension = get_image(url)
+        if not image_content:
             return None
 
-        image_content = ContentFile(response.content)
-        extension = imghdr.what(None, image_content.read()) or ""
         image_name = f"{uuid4()}.{extension}"
         return [image_name, image_content]
 

bookwyrm/models/list.py

@@ -142,7 +142,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
-    notes = fields.TextField(blank=True, null=True, max_length=300)
+    notes = fields.HtmlField(blank=True, null=True, max_length=300)
     approved = models.BooleanField(default=True)
     order = fields.IntegerField()
     endorsement = models.ManyToManyField("User", related_name="endorsers")