diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 7e6de106..639f8402 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -47,7 +47,7 @@ class List(OrderedCollectionMixin, BookWyrmModel): @property def collection_queryset(self): """ list of books for this shelf, overrides OrderedCollectionMixin """ - return self.books.filter(listitem__approved=True).all().order_by("listitem") + return self.books.filter(listitem__approved=True).order_by("listitem") class Meta: """ default sorting """ diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py index 5bbb84b9..d37668dd 100644 --- a/bookwyrm/models/shelf.py +++ b/bookwyrm/models/shelf.py @@ -48,7 +48,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel): @property def collection_queryset(self): """ list of books for this shelf, overrides OrderedCollectionMixin """ - return self.books.all().order_by("shelfbook") + return self.books.order_by("shelfbook") def get_remote_id(self): """ shelf identifier instead of id """ diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 775c6190..bc526ba1 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -67,8 +67,7 @@ def get_replies(status): reply_parent=status, deleted=False, ) - .select_subclasses() - .all()[:10] + .select_subclasses()[:10] ) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index cd279282..1b66b494 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -174,7 +174,7 @@ def get_suggested_books(user, max_books=5): ) shelf = user.shelf_set.get(identifier=preset) - shelf_books = shelf.shelfbook_set.order_by("-updated_date").all()[:limit] + shelf_books = shelf.shelfbook_set.order_by("-updated_date")[:limit] if not shelf_books: continue shelf_preview = { diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 7fb4979c..ff20d991 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -75,7 +75,7 @@ class UserLists(View): except ValueError: page = 1 user = get_user_from_username(request.user, username) - lists = models.List.objects.filter(user=user).all() + lists = models.List.objects.filter(user=user) lists = privacy_filter(request.user, lists) paginated = Paginator(lists, 12) diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 740439db..2ec9e69f 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -61,7 +61,7 @@ class Shelf(View): return ActivitypubResponse(shelf.to_activity(**request.GET)) paginated = Paginator( - shelf.books.order_by("-updated_date").all(), + shelf.books.order_by("-updated_date"), PAGE_LENGTH, ) diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 26117a92..e24db01e 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -64,7 +64,7 @@ class User(View): { "name": user_shelf.name, "local_path": user_shelf.local_path, - "books": user_shelf.books.all()[:3], + "books": user_shelf.books[:3], "size": user_shelf.books.count(), } )