+ {% endif %}
{% else %}
mentions)/?$",
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index eccb7f5e..15b55acc 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -7,6 +7,7 @@ from .block import Block, unblock
from .books import Book, EditBook, ConfirmEditBook, Editions
from .books import upload_cover, add_description, switch_edition, resolve_book
from .directory import Directory
+from .discover import Discover
from .edit_user import EditUser, DeleteUser
from .federation import Federation, FederatedServer
from .federation import AddFederatedServer, ImportServerBlocklist
@@ -22,7 +23,7 @@ from .interaction import Favorite, Unfavorite, Boost, Unboost
from .invite import ManageInvites, Invite, InviteRequest
from .invite import ManageInviteRequests, ignore_invite_request
from .isbn import Isbn
-from .landing import About, Home, Discover
+from .landing import About, Home, Landing
from .list import Lists, List, Curate, UserLists
from .notifications import Notifications
from .outbox import Outbox
diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py
new file mode 100644
index 00000000..059365f9
--- /dev/null
+++ b/bookwyrm/views/discover.py
@@ -0,0 +1,48 @@
+""" What's up locally """
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.db.models import Q
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import activitystreams
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+class Discover(View):
+ """preview of recently reviewed books"""
+
+ def get(self, request):
+ """tiled book activity page"""
+ activities = (
+ activitystreams.streams["local"]
+ .get_activity_stream(request.user)
+ .filter(
+ Q(comment__isnull=False)
+ | Q(review__isnull=False)
+ | Q(quotation__isnull=False)
+ | Q(mention_books__isnull=False)
+ )
+ )
+
+ large_activities = Paginator(
+ activities.filter(mention_books__isnull=True)
+ .exclude(content=None, quotation__quote=None)
+ .exclude(content=""),
+ 6,
+ )
+ small_activities = Paginator(
+ activities.filter(
+ Q(mention_books__isnull=False) | Q(content=None) | Q(content="")
+ ),
+ 4,
+ )
+
+ page = request.GET.get("page")
+ data = {
+ "large_activities": large_activities.get_page(page),
+ "small_activities": small_activities.get_page(page),
+ }
+ return TemplateResponse(request, "discover/discover.html", data)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 42aa48f0..b1e5f68c 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -2,7 +2,7 @@
import re
from requests import HTTPError
from django.core.exceptions import FieldError
-from django.db.models import Max, Q
+from django.db.models import Q
from django.http import Http404
from bookwyrm import activitypub, models
@@ -162,8 +162,9 @@ def is_blocked(viewer, user):
return False
-def get_discover_books():
- """list of books for the discover page"""
+def get_landing_books():
+ """list of books for the landing page"""
+
return list(
set(
models.Edition.objects.filter(
@@ -173,7 +174,7 @@ def get_discover_books():
review__privacy__in=["public", "unlisted"],
)
.exclude(cover__exact="")
- .annotate(Max("review__published_date"))
- .order_by("-review__published_date__max")[:6]
+ .distinct()
+ .order_by("-review__published_date")[:6]
)
)
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 3b9fd17c..005d57cf 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -170,9 +170,9 @@ class InviteRequest(View):
data = {
"request_form": form,
"request_received": received,
- "books": helpers.get_discover_books(),
+ "books": helpers.get_landing_books(),
}
- return TemplateResponse(request, "discover/discover.html", data)
+ return TemplateResponse(request, "landing/landing.html", data)
@require_POST
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 1361935e..6f480b70 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -13,22 +13,22 @@ class About(View):
def get(self, request):
"""more information about the instance"""
- return TemplateResponse(request, "discover/about.html")
+ return TemplateResponse(request, "landing/about.html")
class Home(View):
- """discover page or home feed depending on auth"""
+ """landing page or home feed depending on auth"""
def get(self, request):
"""this is the same as the feed on the home tab"""
if request.user.is_authenticated:
feed_view = Feed.as_view()
return feed_view(request, "home")
- discover_view = Discover.as_view()
- return discover_view(request)
+ landing_view = Landing.as_view()
+ return landing_view(request)
-class Discover(View):
+class Landing(View):
"""preview of recently reviewed books"""
def get(self, request):
@@ -36,6 +36,6 @@ class Discover(View):
data = {
"register_form": forms.RegisterForm(),
"request_form": forms.InviteRequestForm(),
- "books": helpers.get_discover_books(),
+ "books": helpers.get_landing_books(),
}
- return TemplateResponse(request, "discover/discover.html", data)
+ return TemplateResponse(request, "landing/landing.html", data)
diff --git a/bw-dev b/bw-dev
index e5e46e5f..a2f04bfb 100755
--- a/bw-dev
+++ b/bw-dev
@@ -121,7 +121,7 @@ case "$CMD" in
makeitblack
;;
populate_streams)
- runweb python manage.py populate_streams
+ runweb python manage.py populate_streams $@
;;
populate_suggestions)
runweb python manage.py populate_suggestions
@@ -169,7 +169,7 @@ case "$CMD" in
echo " build"
echo " clean"
echo " black"
- echo " populate_streams"
+ echo " populate_streams [--stream=]"
echo " populate_suggestions"
echo " generate_preview_images [--all]"
echo " copy_media_to_s3"
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index 3ab33862..de5e5630 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -20,6 +20,7 @@ app.config_from_object("django.conf:settings", namespace="CELERY")
# Load task modules from all registered Django app configs.
app.autodiscover_tasks()
app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity")
+app.autodiscover_tasks(["bookwyrm"], related_name="activitystreams")
app.autodiscover_tasks(["bookwyrm"], related_name="broadcast")
app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector")
app.autodiscover_tasks(["bookwyrm"], related_name="emailing")