Merge branch 'main' into create-book

bookwyrm/views/__init__.py

@@ -31,3 +31,4 @@ from .site import Site
 from .status import CreateStatus, DeleteStatus
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
+from .isbn import Isbn

bookwyrm/views/books.py

@@ -90,7 +90,7 @@ class Book(View):
             'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
             'tags':  models.UserTag.objects.filter(book=book),
             'lists': privacy_filter(
-                request.user, book.list_set.all()
+                request.user, book.list_set.filter(listitem__approved=True)
             ),
             'user_tags': user_tags,
             'user_shelves': user_shelves,

bookwyrm/views/inbox.py

@@ -20,7 +20,7 @@ class Inbox(View):
     ''' requests sent by outside servers'''
     def post(self, request, username=None):
         ''' only works as POST request '''
-        # first let's do some basic checks to see if this is legible
+        # make sure the user's inbox even exists
         if username:
             try:
                 models.User.objects.get(localname=username)
@@ -33,6 +33,11 @@ class Inbox(View):
         except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest()
 
+        if not 'object' in activity_json or \
+                not 'type' in activity_json or \
+                not activity_json['type'] in activitypub.activity_objects:
+            return HttpResponseNotFound()
+
         # verify the signature
         if not has_valid_signature(request, activity_json):
             if activity_json['type'] == 'Delete':
@@ -42,12 +47,6 @@ class Inbox(View):
                 return HttpResponse()
             return HttpResponse(status=401)
 
-        # just some quick smell tests before we try to parse the json
-        if not 'object' in activity_json or \
-                not 'type' in activity_json or \
-                not activity_json['type'] in activitypub.activity_objects:
-            return HttpResponseNotFound()
-
         activity_task.delay(activity_json)
         return HttpResponse()
 
@@ -63,7 +62,11 @@ def activity_task(activity_json):
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)
-    activity.action()
+    try:
+        activity.action()
+    except activitypub.ActivitySerializerError:
+        # this is raised if the activity is discarded
+        return
 
 
 def has_valid_signature(request, activity):

bookwyrm/views/isbn.py

@@ -0,0 +1,29 @@
+''' isbn search view '''
+from django.http import HttpResponseNotFound
+from django.http import JsonResponse
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+from bookwyrm.connectors import connector_manager
+from .helpers import is_api_request
+
+# pylint: disable= no-self-use
+class Isbn(View):
+    ''' search a book by isbn '''
+    def get(self, request, isbn):
+        ''' info about a book '''
+        book_results = connector_manager.isbn_local_search(isbn)
+
+        if is_api_request(request):
+            return JsonResponse([r.json() for r in book_results], safe=False)
+
+        data = {
+            'title': 'ISBN Search Results',
+            'results': book_results,
+            'query': isbn,
+        }
+        return TemplateResponse(request, 'isbn_search_results.html', data)