Merge branch 'main' into production

bookwyrm/templatetags/shelf_tags.py

@@ -36,22 +36,19 @@ def get_next_shelf(current_shelf):
 def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
     user = context["request"].user
-    return (
+    return cache.get_or_set(
-        cache.get_or_set(
+        f"active_shelf-{user.id}-{book.id}",
-            f"active_shelf-{user.id}-{book.id}",
+        lambda u, b: (
-            lambda u, b: (
+            models.ShelfBook.objects.filter(
-                models.ShelfBook.objects.filter(
+                shelf__user=u,
-                    shelf__user=u,
+                book__parent_work__editions=b,
-                    book__parent_work__editions=b,
+            ).first()
-                ).first()
+            or False
-                or False
+        ),
-            ),
+        user,
-            user,
+        book,
-            book,
+        timeout=15552000,
-            timeout=15552000,
+    ) or {"book": book}
-        )
-        or {"book": book}
-    )
 
 
 @register.simple_tag(takes_context=False)

bookwyrm/tests/models/test_fields.py

@@ -430,7 +430,7 @@ class ModelFields(TestCase):
         output = instance.field_to_activity(user.avatar)
         self.assertIsNotNone(
             re.match(
-                fr"https:\/\/{DOMAIN}\/.*\.jpg",
+                rf"https:\/\/{DOMAIN}\/.*\.jpg",
                 output.url,
             )
         )

bookwyrm/urls.py

@@ -55,7 +55,7 @@ urlpatterns = [
     ),
     re_path(
         "^api/updates/stream/(?P<stream>[a-z]+)/?$",
-        views.get_unread_status_count,
+        views.get_unread_status_string,
         name="stream-updates",
     ),
     # authentication