mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-13 18:59:24 +00:00
Code Issues Projects Releases Wiki Activity

remove pointless viewer_aware

Browse source
This commit is contained in:
Hugh Rundle 2023-11-06 16:01:34 +11:00
parent 2d185dfb8a
commit d34b70cb7b
No known key found for this signature in database
GPG key ID: A7E35779918253F9
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
bookwyrm/models/bookwyrm_export_job.py
View file

@ -123,33 +123,23 @@ def json_export(user): # pylint: disable=too-many-locals, too-many-statements
book["authors"] = list(edition.first().authors.all().values()) book["authors"] = list(edition.first().authors.all().values())
# readthroughs # readthroughs
book_readthroughs = ( book_readthroughs = (
ReadThrough.objects.filter(user=user, book=book["id"]) ReadThrough.objects.filter(user=user, book=book["id"]).distinct().values()
.distinct()
.values()
) )
book["readthroughs"] = list(book_readthroughs) book["readthroughs"] = list(book_readthroughs)
# shelves # shelves
shelf_books = ShelfBook.objects.filter( shelf_books = ShelfBook.objects.filter(user=user, book=book["id"]).distinct()
user=user, book=book["id"] shelves_from_books = Shelf.objects.filter(shelfbook__in=shelf_books, user=user)
).distinct()
shelves_from_books = Shelf.objects.filter(
shelfbook__in=shelf_books, user=user
)
book["shelves"] = list(shelves_from_books.values()) book["shelves"] = list(shelves_from_books.values())
book["shelf_books"] = {} book["shelf_books"] = {}
for shelf in shelves_from_books: for shelf in shelves_from_books:
shelf_contents = ShelfBook.objects.filter( shelf_contents = ShelfBook.objects.filter(user=user, shelf=shelf).distinct()
user=user, shelf=shelf
).distinct()
book["shelf_books"][shelf.identifier] = list(shelf_contents.values()) book["shelf_books"][shelf.identifier] = list(shelf_contents.values())
# book lists # book lists
book_lists = List.objects.filter( book_lists = List.objects.filter(books__in=[book["id"]], user=user).distinct()
books__in=[book["id"]], user=user
).distinct()
book["lists"] = list(book_lists.values()) book["lists"] = list(book_lists.values())
book["list_items"] = {} book["list_items"] = {}
for blist in book_lists: for blist in book_lists:
@ -180,9 +170,7 @@ def json_export(user): # pylint: disable=too-many-locals, too-many-statements
# follows # follows
follows = UserFollows.objects.filter(user_subject=user).distinct() follows = UserFollows.objects.filter(user_subject=user).distinct()
following = User.objects.filter( following = User.objects.filter(userfollows_user_object__in=follows).distinct()
userfollows_user_object__in=follows
).distinct()
follows = [f.remote_id for f in following] follows = [f.remote_id for f in following]
# blocks # blocks
@ -207,8 +195,8 @@ def get_books_for_user(user):
"""Get all the books and editions related to a user """Get all the books and editions related to a user
:returns: tuple of editions, books :returns: tuple of editions, books
""" """
all_books = Edition.viewer_aware_objects(user)
editions = all_books.filter( editions = Edition.objects.filter(
Q(shelves__user=user) Q(shelves__user=user)
| Q(readthrough__user=user) | Q(readthrough__user=user)
| Q(review__user=user) | Q(review__user=user)