Merge branch 'main' into suggested_user_logic

bookwyrm/views/author.py

@@ -27,7 +27,7 @@ class Author(View):
         ).distinct()
         data = {
             "author": author,
-            "books": [b.get_default_edition() for b in books],
+            "books": [b.default_edition for b in books],
         }
         return TemplateResponse(request, "author.html", data)
 

bookwyrm/views/books.py

@@ -39,7 +39,7 @@ class Book(View):
             return ActivitypubResponse(book.to_activity())
 
         if isinstance(book, models.Work):
-            book = book.get_default_edition()
+            book = book.default_edition
         if not book or not book.parent_work:
             return HttpResponseNotFound()
 
@@ -156,7 +156,6 @@ class EditBook(View):
                         ),
                     }
                 )
-                print(data["author_matches"])
 
         # we're creating a new book
         if not book:

bookwyrm/views/helpers.py

@@ -123,7 +123,7 @@ def get_edition(book_id):
     """look up a book in the db and return an edition"""
     book = models.Book.objects.select_subclasses().get(id=book_id)
     if isinstance(book, models.Work):
-        book = book.get_default_edition()
+        book = book.default_edition
     return book
 
 

bookwyrm/views/list.py

@@ -1,5 +1,6 @@
 """ book list views"""
 from typing import Optional
+from urllib.parse import urlencode
 
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
@@ -9,6 +10,7 @@ from django.db.models.functions import Coalesce
 from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
@@ -135,7 +137,11 @@ class List(View):
 
         if query and request.user.is_authenticated:
             # search for books
-            suggestions = connector_manager.local_search(query, raw=True)
+            suggestions = connector_manager.local_search(
+                query,
+                raw=True,
+                filters=[~Q(parent_work__editions__in=book_list.books.all())],
+            )
         elif request.user.is_authenticated:
             # just suggest whatever books are nearby
             suggestions = request.user.shelfbook_set.filter(
@@ -263,7 +269,10 @@ def add_book(request):
         # if the book is already on the list, don't flip out
         pass
 
-    return redirect("list", book_list.id)
+    path = reverse("list", args=[book_list.id])
+    params = request.GET.copy()
+    params["updated"] = True
+    return redirect("{:s}?{:s}".format(path, urlencode(params)))
 
 
 @require_POST

bookwyrm/views/notifications.py

@@ -16,7 +16,7 @@ class Notifications(View):
         notifications = request.user.notification_set.all().order_by("-created_date")
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-            "notifications": notifications,
+            "notifications": notifications[:50],
             "unread": unread,
         }
         notifications.update(read=True)

bookwyrm/views/search.py

@@ -30,27 +30,30 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
+        data = {"query": query or ""}
+
         # use webfinger for mastodon style account@domain.com username
         if query and re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
         # do a user search
-        user_results = (
-            models.User.viewer_aware_objects(request.user)
-            .annotate(
-                similarity=Greatest(
-                    TrigramSimilarity("username", query),
-                    TrigramSimilarity("localname", query),
+        if request.user.is_authenticated:
+            data["user_results"] = (
+                models.User.viewer_aware_objects(request.user)
+                .annotate(
+                    similarity=Greatest(
+                        TrigramSimilarity("username", query),
+                        TrigramSimilarity("localname", query),
+                    )
                 )
+                .filter(
+                    similarity__gt=0.5,
+                )
+                .order_by("-similarity")[:10]
             )
-            .filter(
-                similarity__gt=0.5,
-            )
-            .order_by("-similarity")[:10]
-        )
 
         # any relevent lists?
-        list_results = (
+        data["list_results"] = (
             privacy_filter(
                 request.user,
                 models.List.objects,
@@ -68,11 +71,7 @@ class Search(View):
             .order_by("-similarity")[:10]
         )
 
-        book_results = connector_manager.search(query, min_confidence=min_confidence)
-        data = {
-            "book_results": book_results,
-            "user_results": user_results,
-            "list_results": list_results,
-            "query": query or "",
-        }
+        data["book_results"] = connector_manager.search(
+            query, min_confidence=min_confidence
+        )
         return TemplateResponse(request, "search_results.html", data)

bookwyrm/views/user.py

@@ -106,10 +106,11 @@ class Followers(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_followers_activity(**request.GET))
 
+        paginated = Paginator(user.followers.all(), PAGE_LENGTH)
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "followers": user.followers.all(),
+            "followers": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/followers.html", data)
 
@@ -131,10 +132,11 @@ class Following(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))
 
+        paginated = Paginator(user.followers.all(), PAGE_LENGTH)
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "following": user.following.all(),
+            "following": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/following.html", data)