From 591bb955f856575926f607ab85d4428d12724af2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 11 Jan 2022 12:37:07 -0800 Subject: [PATCH 1/2] Fixes active readthrough cache bug --- bookwyrm/templatetags/bookwyrm_tags.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 3c57fb27..65300213 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -139,12 +139,11 @@ def active_shelf(context, book): shelf__user=u, book__parent_work__editions=b, ).first() - ) - or {"book": book}, + ), user, book, timeout=15552000, - ) + ) or {"book": book} @register.simple_tag(takes_context=False) From 6baab5d5a934ee98d3a6a28913f9d0e5d2814b89 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 11 Jan 2022 12:58:14 -0800 Subject: [PATCH 2/2] python formatting --- bookwyrm/templatetags/bookwyrm_tags.py | 27 ++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 65300213..0f6b493e 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -132,18 +132,21 @@ def related_status(notification): def active_shelf(context, book): """check what shelf a user has a book on, if any""" user = context["request"].user - return cache.get_or_set( - f"active_shelf-{user.id}-{book.id}", - lambda u, b: ( - models.ShelfBook.objects.filter( - shelf__user=u, - book__parent_work__editions=b, - ).first() - ), - user, - book, - timeout=15552000, - ) or {"book": book} + return ( + cache.get_or_set( + f"active_shelf-{user.id}-{book.id}", + lambda u, b: ( + models.ShelfBook.objects.filter( + shelf__user=u, + book__parent_work__editions=b, + ).first() + ), + user, + book, + timeout=15552000, + ) + or {"book": book} + ) @register.simple_tag(takes_context=False)