X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c15b511c1e9ebb06050f40e98ec554ba6c26cb1b..04a361d93a6d8edb44424920fe4bd39e3fa8aebc:/src/catalogue/api/views.py

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index c98695094..89fafd0d2 100644
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -11,13 +11,14 @@ from rest_framework.response import Response
 from rest_framework import status
 from api.handlers import read_tags
 from api.utils import vary_on_auth
-from .helpers import books_after, order_books
-from . import serializers
 from catalogue.forms import BookImportForm
 from catalogue.models import Book, Collection, Tag, Fragment, BookMedia
 from catalogue.models.tag import prefetch_relations
+from club.models import Membership
 from club.permissions import IsClubMember
 from wolnelektury.utils import re_escape
+from .helpers import books_after, order_books
+from . import serializers
 
 
 book_tag_categories = ['author', 'epoch', 'kind', 'genre']
@@ -69,8 +70,12 @@ class BookList(ListAPIView):
                 books = Book.tagged.with_all(tags)
         else:
             books = Book.objects.all()
+        books = books.filter(findable=True)
         books = order_books(books, new_api)
 
+        if not Membership.is_active_for(self.request.user):
+            books = books.exclude(preview=True)
+
         if self.kwargs.get('top_level'):
             books = books.filter(parent=None)
         if self.kwargs.get('audiobooks'):
@@ -147,15 +152,15 @@ class EbookList(BookList):
     serializer_class = serializers.EbookSerializer
 
 
-@vary_on_auth  # Because of 'liked'.
+@method_decorator(never_cache, name='dispatch')
 class Preview(ListAPIView):
     #queryset = Book.objects.filter(preview=True)
     serializer_class = serializers.BookPreviewSerializer
 
     def get_queryset(self):
         qs = Book.objects.filter(preview=True)
-        # FIXME: temporary workaround for a problem with iOS app.
-        if 'Darwin' in self.request.META['HTTP_USER_AGENT']:
+        # FIXME: temporary workaround for a problem with iOS app; see #3954.
+        if 'Darwin' in self.request.META.get('HTTP_USER_AGENT', '') and 'debug' not in self.request.GET:
             qs = qs.none()
         return qs
 
@@ -176,11 +181,14 @@ class FilterBookList(ListAPIView):
         is_lektura = self.parse_bool(self.request.query_params.get('lektura'))
         is_audiobook = self.parse_bool(self.request.query_params.get('audiobook'))
         preview = self.parse_bool(self.request.query_params.get('preview'))
+        if not Membership.is_active_for(self.request.user):
+            preview = False
 
         new_api = self.request.query_params.get('new_api')
         after = self.request.query_params.get('after')
         count = int(self.request.query_params.get('count', 50))
         books = order_books(Book.objects.distinct(), new_api)
+        books = books.filter(findable=True)
         if is_lektura is not None:
             books = books.filter(has_audience=is_lektura)
         if is_audiobook is not None:
@@ -287,7 +295,7 @@ class FragmentList(ListAPIView):
             )
         except ValueError:
             raise Http404
-        return Fragment.tagged.with_all(tags).select_related('book')
+        return Fragment.tagged.with_all(tags).filter(book__findable=True).select_related('book')
 
 
 @vary_on_auth  # Because of 'liked'.